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 |
|
|
MatthewBeshay
|
8d3c504ee6
|
cleanup: flatten dead branches in world io level network and stats
|
2026-03-26 20:53:52 +11:00 |
|
|
orng
|
bee10e55a8
|
refactor: remove calls to Vec3::newTemp when not returned
|
2026-03-26 04:19:04 -05:00 |
|
|
MatthewBeshay
|
1fecbf297a
|
cleanup: remove console branches from render texture and world helpers
|
2026-03-26 19:24:04 +11:00 |
|
|
MatthewBeshay
|
ad5da38321
|
cleanup: remove console platform code from shared includes and build paths
|
2026-03-26 17:53:37 +11:00 |
|
|
orng
|
7b021bc99d
|
wip: removing vec3 tls
|
2026-03-26 01:10:27 -05:00 |
|
|
MatthewBeshay
|
fed9cf2d95
|
fix: resolve all build warnings and notes
|
2026-03-23 18:53:18 +11:00 |
|
|
Tropical
|
357fca24aa
|
refactor: nuke __int64/__uint64 in Minecraft.World
|
2026-03-21 17:10:36 -05:00 |
|
|
Tropical
|
86e08af338
|
TU19: merge Minecraft.World/Level
|
2026-03-21 17:07:51 -05:00 |
|
|
Tropical
|
33d0737d1d
|
chore: format Minecraft.World
|
2026-03-13 17:06:56 -05:00 |
|
|
notmatthewbeshay
|
0249bfd2bf
|
Fix Linux build warnings
|
2026-03-14 04:37:55 +11:00 |
|
|
Nikita Edel
|
ed13020cf3
|
s integer overflow, unsafe cast
|
2026-03-11 16:10:48 +01:00 |
|
|
Nikita Edel
|
8395277c0c
|
shift of signed int, s int overflow
|
2026-03-11 13:36:44 +01:00 |
|
|
Tropical
|
54dab7708d
|
refactor: rename Build -> Platform in Minecraft.World
|
2026-03-08 21:33:18 -05:00 |
|
|
Tropical
|
7c95bfc0bd
|
refactor: begin unglobbing std::vector
|
2026-03-06 11:58:11 -06: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 |
|
|
ella love
|
2383fcee6e
|
feat: move script & folder refactor
|
2026-03-05 03:29:23 -05:00 |
|