MatthewBeshay
|
a0fdc643d1
|
Merge branch 'upstream-dev' into cleanup/nullptr-replacement
# Conflicts:
# Minecraft.Client/Network/PlayerChunkMap.cpp
# Minecraft.Client/Network/PlayerList.cpp
# Minecraft.Client/Network/ServerChunkCache.cpp
# Minecraft.Client/Platform/Common/Consoles_App.cpp
# Minecraft.Client/Platform/Common/DLC/DLCManager.cpp
# Minecraft.Client/Platform/Common/GameRules/LevelGenerationOptions.cpp
# Minecraft.Client/Platform/Common/GameRules/LevelRuleset.cpp
# Minecraft.Client/Platform/Common/Tutorial/Tutorial.cpp
# Minecraft.Client/Platform/Common/Tutorial/TutorialTask.cpp
# Minecraft.Client/Platform/Common/UI/IUIScene_CreativeMenu.cpp
# Minecraft.Client/Platform/Common/UI/UIComponent_Panorama.cpp
# Minecraft.Client/Platform/Common/UI/UIController.cpp
# Minecraft.Client/Platform/Common/UI/UIController.h
# Minecraft.Client/Platform/Extrax64Stubs.cpp
# Minecraft.Client/Platform/Windows64/4JLibs/inc/4J_Input.h
# Minecraft.Client/Platform/Windows64/4JLibs/inc/4J_Storage.h
# Minecraft.Client/Player/EntityTracker.cpp
# Minecraft.Client/Player/ServerPlayer.cpp
# Minecraft.Client/Rendering/EntityRenderers/PlayerRenderer.cpp
# Minecraft.Client/Textures/Packs/DLCTexturePack.cpp
# Minecraft.Client/Textures/Stitching/StitchedTexture.cpp
# Minecraft.Client/Textures/Stitching/TextureMap.cpp
# Minecraft.Client/Textures/Textures.cpp
# Minecraft.World/Blocks/NotGateTile.cpp
# Minecraft.World/Blocks/PressurePlateTile.cpp
# Minecraft.World/Blocks/TileEntities/PotionBrewing.cpp
# Minecraft.World/Enchantments/EnchantmentHelper.cpp
# Minecraft.World/Entities/HangingEntity.cpp
# Minecraft.World/Entities/LeashFenceKnotEntity.cpp
# Minecraft.World/Entities/LivingEntity.cpp
# Minecraft.World/Entities/Mobs/Boat.cpp
# Minecraft.World/Entities/Mobs/Minecart.cpp
# Minecraft.World/Entities/Mobs/Witch.cpp
# Minecraft.World/Entities/SyncedEntityData.cpp
# Minecraft.World/Items/LeashItem.cpp
# Minecraft.World/Items/PotionItem.cpp
# Minecraft.World/Level/BaseMobSpawner.cpp
# Minecraft.World/Level/CustomLevelSource.cpp
# Minecraft.World/Level/Level.cpp
# Minecraft.World/Level/Storage/DirectoryLevelStorage.cpp
# Minecraft.World/Level/Storage/McRegionLevelStorage.cpp
# Minecraft.World/Level/Storage/RegionFileCache.cpp
# Minecraft.World/Player/Player.cpp
# Minecraft.World/WorldGen/Biomes/BiomeCache.cpp
# Minecraft.World/WorldGen/Features/RandomScatteredLargeFeature.cpp
# Minecraft.World/WorldGen/Layers/BiomeOverrideLayer.cpp
|
2026-03-30 16:28:40 +11: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 |
|
|
Tropical
|
51e61a12b4
|
refactor: replace some win32 typedefs
|
2026-03-30 00:16:26 -05:00 |
|
|
MatthewBeshay
|
f19563bbd7
|
cleanup: flatten dead branches in common app and ui code
|
2026-03-26 20:18:29 +11:00 |
|
|
MatthewBeshay
|
6ef7d05f7e
|
cleanup: collapse common app and ui console branches
|
2026-03-26 18:49:24 +11:00 |
|
|
MatthewBeshay
|
fed9cf2d95
|
fix: resolve all build warnings and notes
|
2026-03-23 18:53:18 +11:00 |
|
|
Tropical
|
f820e73cf8
|
fix: a bunch of iggy string encoding UB and use simdutf
|
2026-03-22 22:56:08 -05:00 |
|
|
Tropical
|
855597d1bc
|
exclude UIScene_InGameSaveManagementMenu, include fixes
|
2026-03-22 14:00:25 -05:00 |
|
|
Tropical
|
c17408b34d
|
fix includes, broken UIScene_TradingMenu method
|
2026-03-22 13:50:42 -05:00 |
|
|
Tropical
|
b9d18bf641
|
TU19: merge Minecraft.Client/Platform/Common/UI
|
2026-03-22 11:44:26 -05:00 |
|
|
Tropical
|
4dd9b683bf
|
format Platform/Common/UI
|
2026-03-22 04:25:54 -05:00 |
|
|
Tropical
|
3a44eab5c0
|
fix: UB due to assuming wchar_t is utf16
|
2026-03-13 12:34:28 -05:00 |
|
|
niansa
|
db5cb0afc0
|
Remove explicit casts when passing strings to Iggy
|
2026-03-13 12:34:28 -05:00 |
|
|
niansa
|
b11da90cbb
|
Added string conversion for Iggy everywhere where needed
|
2026-03-13 12:34:28 -05:00 |
|
|
Tropical
|
ad1e8369bc
|
refactor: move Common to Platform/Common
|
2026-03-09 00:17:42 -05:00 |
|