Commit graph

18 commits

Author SHA1 Message Date
Tropical c9b90cae2c chore: format everything 2026-03-30 02:17:54 -05:00
MatthewBeshay dfb0e3b03e refactor: replace NULL with nullptr across C++ codebase
Excludes vendored C libs (zlib, Miles, DirectXMath, boost, Iggy).
2026-03-30 16:25:52 +11:00
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
StevenSYS d18733b14c Ported over the Java Edition's title screen panorama. 2026-03-29 15:50:35 -05:00
MatthewBeshay 12ff12a263 cleanup: flatten dead branches in client render texture and runtime code 2026-03-26 20:29:59 +11:00
MatthewBeshay 1fecbf297a cleanup: remove console branches from render texture and world helpers 2026-03-26 19:24:04 +11:00
JuiceyDev 587d685c5b faster texture loading 2026-03-23 22:31:03 +01:00
Sally Knight 0cd062833c fix: UB bit shift in Texture.cpp 2026-03-23 02:10:29 +03:00
Tropical 362a43ddee TU19: merge Minecraft.Client/Textures 2026-03-21 22:46:45 -05:00
Tropical e8424f2000 chore: format Minecraft.Client 2026-03-13 17:10:10 -05:00
notmatthewbeshay bcc765f3e7 Merge remote-tracking branch 'upstream/dev' into issue/51-phase-1-portable-win32-cleanup
# Conflicts:
#	Minecraft.Client/Platform/Common/DLC/DLCManager.cpp
#	Minecraft.Client/Rendering/Tesselator.cpp
2026-03-13 15:16:43 +11:00
notmatthewbeshay e5504399ca Use fixed-width texture channel casts 2026-03-11 15:38:51 +11:00
Nikita Edel 56955ad935 shift of negative values, added casts 2026-03-11 03:59:41 +01:00
Tropical 5a36950239 fix: shuffle around remaining paths to get everything building again/home/tropical/Documents/GitHub/4jcraft-real/Minecraft.World/Level/../../Minecraft.Client/Textures/Packs/TexturePack.h 2026-03-09 00:34:09 -05:00
Tropical cdc08700e4 refactor: unglob std::wstring 2026-03-06 11:50:22 -06:00
Tropical 15af35eef2 fix: remove byte type alias 2026-03-06 05:03:37 -06:00
JuiceyDev 5583e04e0f Fix runtime issues, 2026-03-05 10:52:11 +01:00
ella love 2383fcee6e feat: move script & folder refactor 2026-03-05 03:29:23 -05:00
Renamed from Minecraft.Client/Texture.cpp (Browse further)