backups/4jcraft
1
0
Fork 0
mirror of https://github.com/4jcraft/4jcraft.git synced 2026-05-01 14:03:39 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
4jcraft/Minecraft.Client/Rendering
History
MatthewBeshay 6000900285 Merge branch 'upstream-dev' into cleanup/shared-portability-reset-v2 
# Conflicts:
#	Minecraft.Client/Level/ServerLevel.cpp
#	Minecraft.Client/Minecraft.cpp
#	Minecraft.Client/MinecraftServer.cpp
#	Minecraft.Client/Network/ClientConnection.cpp
#	Minecraft.Client/Network/ServerChunkCache.cpp
#	Minecraft.Client/Platform/Common/Audio/SoundEngine.cpp
#	Minecraft.Client/Platform/Common/Consoles_App.cpp
#	Minecraft.Client/Platform/Common/Network/GameNetworkManager.cpp
#	Minecraft.Client/Platform/Common/Network/Sony/SonyCommerce.cpp
#	Minecraft.Client/Platform/Common/Network/Sony/SonyRemoteStorage.cpp
#	Minecraft.Client/Platform/Common/UI/UIController.cpp
#	Minecraft.Client/Platform/Common/UI/UIScene_CreateWorldMenu.cpp
#	Minecraft.Client/Platform/Common/UI/UIScene_EnchantingMenu.cpp
#	Minecraft.Client/Platform/Common/UI/UIScene_LaunchMoreOptionsMenu.cpp
#	Minecraft.Client/Platform/Common/UI/UIScene_LoadOrJoinMenu.cpp
#	Minecraft.Client/Platform/Common/UI/UIScene_MainMenu.cpp
#	Minecraft.Client/Platform/Common/XUI/XUI_Death.cpp
#	Minecraft.Client/Platform/Common/XUI/XUI_Leaderboards.cpp
#	Minecraft.Client/Platform/Common/XUI/XUI_MultiGameJoinLoad.cpp
#	Minecraft.Client/Platform/Common/XUI/XUI_PauseMenu.cpp
#	Minecraft.Client/Platform/Common/XUI/XUI_TransferToXboxOne.cpp
#	Minecraft.Client/Platform/Durango/Durango_Minecraft.cpp
#	Minecraft.Client/Platform/Linux/Linux_Minecraft.cpp
#	Minecraft.Client/Platform/Orbis/Orbis_Minecraft.cpp
#	Minecraft.Client/Platform/PS3/PS3Extras/boost_1_53_0/boost/spirit/home/lex/lexer/lexertl/lexer.hpp
#	Minecraft.Client/Platform/PS3/PS3_Minecraft.cpp
#	Minecraft.Client/Platform/PS3/SPU_Tasks/ChunkUpdate/TileRenderer_SPU.cpp
#	Minecraft.Client/Platform/PS3/SPU_Tasks/ChunkUpdate/Tile_SPU.cpp
#	Minecraft.Client/Platform/PS3/Xbox_Minecraft.cpp
#	Minecraft.Client/Platform/PSVita/PSVita_Minecraft.cpp
#	Minecraft.Client/Platform/Xbox/Xbox_Minecraft.cpp
#	Minecraft.Client/Platform/stdafx.h
#	Minecraft.Client/Player/LocalPlayer.cpp
#	Minecraft.Client/Rendering/Chunk.cpp
#	Minecraft.Client/Rendering/EntityRenderers/ItemRenderer.cpp
#	Minecraft.Client/Rendering/GameRenderer.cpp
#	Minecraft.Client/Rendering/LevelRenderer.cpp
#	Minecraft.Client/Textures/BufferedImage.cpp
#	Minecraft.Client/UI/Screens/AchievementScreen.cpp
#	Minecraft.Client/UI/Screens/ContainerScreen.cpp
#	Minecraft.Client/UI/Screens/TrapScreen.cpp
#	Minecraft.World/IO/Files/ConsoleSaveFileOriginal.cpp
#	Minecraft.World/IO/Files/File.cpp
#	Minecraft.World/Player/Player.cpp
#	Minecraft.World/Util/C4JThread.cpp
2026-03-30 15:21:08 +11:00
..
Culling wip: removing vec3 tls 2026-03-26 01:10:27 -05:00
EntityRenderers Merge branch 'upstream-dev' into cleanup/shared-portability-reset-v2 2026-03-30 15:21:08 +11:00
Models fix: resolve all build warnings and notes 2026-03-23 18:53:18 +11:00
Particles Merge branch 'upstream-dev' into cleanup/shared-portability-reset-v2 2026-03-30 15:21:08 +11:00
Camera.cpp Merge branch 'upstream-dev' into cleanup/shared-portability-reset-v2 2026-03-30 15:21:08 +11:00
Camera.h chore: format files touched by refactor/remove-vec3-tls 2026-03-26 14:13:45 -05:00
Chunk.cpp Merge branch 'upstream-dev' into cleanup/shared-portability-reset-v2 2026-03-30 15:21:08 +11:00
Chunk.h Merge branch 'upstream-dev' into cleanup/shared-portability-reset-v2 2026-03-30 15:21:08 +11:00
Cube.cpp chore: fmt 2026-03-29 18:40:55 -05:00
Cube.h fix: OOB when iterating over all cube faces 2026-03-28 13:50:35 -05:00
Frustum.cpp batch 2: fixing chunk rendering & frustum culling; rewrote most of it, but now it works. next step is to fix the "highlight" effect & add the optimizations i wrote on optifromhell.txt 2026-03-29 20:55:56 -05:00
Frustum.h chore: format Minecraft.Client 2026-03-13 17:10:10 -05:00
FrustumCuller.cpp chore: format Minecraft.Client 2026-03-13 17:10:10 -05:00
FrustumCuller.h chore: format Minecraft.Client 2026-03-13 17:10:10 -05:00
FrustumData.cpp fix(linux): restore UI GL state handoff for core renderer 2026-03-29 20:55:57 -05:00
FrustumData.h chore: format Minecraft.Client 2026-03-13 17:10:10 -05:00
GameRenderer.cpp Merge branch 'upstream-dev' into cleanup/shared-portability-reset-v2 2026-03-30 15:21:08 +11:00
GameRenderer.h refactor: remove new Vec3 2026-03-26 14:01:14 -05:00
glWrapper.cpp cleanup: flatten dead branches in client render texture and runtime code 2026-03-26 20:29:59 +11:00
LevelRenderer.cpp Merge branch 'upstream-dev' into cleanup/shared-portability-reset-v2 2026-03-30 15:21:08 +11:00
LevelRenderer.h Merge branch 'upstream-dev' into cleanup/shared-portability-reset-v2 2026-03-30 15:21:08 +11:00
Lighting.cpp revert unintentional turnOnGui 2026-03-29 20:55:57 -05:00
Lighting.h chore: format Minecraft.Client 2026-03-13 17:10:10 -05:00
Minimap.cpp cleanup: flatten dead branches in client render texture and runtime code 2026-03-26 20:29:59 +11:00
Minimap.h cleanup: flatten dead branches in client render texture and runtime code 2026-03-26 20:29:59 +11:00
OffsettedRenderList.cpp chore: format Minecraft.Client 2026-03-13 17:10:10 -05:00
OffsettedRenderList.h chore: format Minecraft.Client 2026-03-13 17:10:10 -05:00
Polygon.cpp chore: fmt 2026-03-29 18:40:55 -05:00
Polygon.h chore: fmt 2026-03-29 18:40:55 -05:00
Tesselator.cpp Merge branch 'upstream-dev' into cleanup/shared-portability-reset-v2 2026-03-30 15:21:08 +11:00
Tesselator.h cleanup: flatten dead branches in client render texture and runtime code 2026-03-26 20:29:59 +11:00
TexOffs.cpp chore: format Minecraft.Client 2026-03-13 17:10:10 -05:00
TexOffs.h chore: format Minecraft.Client 2026-03-13 17:10:10 -05:00
Vertex.cpp refactor: remove VertexArray 2026-03-28 12:53:07 -05:00
Vertex.h chore: fmt 2026-03-29 18:40:55 -05:00