Merge remote-tracking branch 'Revelations/main' into upstream-merge
# Conflicts: # .github/workflows/nightly.yml # CMakeLists.txt # Minecraft.Client/CMakeLists.txt # Minecraft.Client/StringTable.cpp # Minecraft.Server/FourKitNatives.cpp # Minecraft.Server/Windows64/ServerMain.cpp # Minecraft.World/BiomeDecorator.cpp # Minecraft.World/BiomeSource.cpp # Minecraft.World/cmake/sources/Common.cmake # README.md # cmake/ServerTarget.cmake
This commit is contained in:
@@ -2219,7 +2219,7 @@ void GameRenderer::setupFog(int i, float alpha)
|
||||
|
||||
if (i == 999)
|
||||
{
|
||||
__debugbreak();
|
||||
DEBUG_BREAK();
|
||||
// 4J TODO
|
||||
/*
|
||||
glFog(GL_FOG_COLOR, getBuffer(0, 0, 0, 1));
|
||||
|
||||
Reference in New Issue
Block a user