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
|
e45151ae64
|
refactor: expand AUTO_VAR macro
|
2026-03-29 23:59:05 -05:00 |
|
|
MatthewBeshay
|
b6efb6265d
|
fix(textures): guard StitchedTexture frame cleanup for SimpleIcon instances
|
2026-03-23 09:27:28 +11: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 |
|
|
Nikita Edel
|
2ae8ac3b80
|
fix typos in comment
|
2026-03-09 23:15:34 +01:00 |
|
|
Nikita Edel
|
5265eef759
|
first patch of UB
|
2026-03-09 21:54:43 +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
|
e506b8fe7a
|
refactor: unglob std::pair
|
2026-03-06 20:37:41 -06: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 |
|
|
ThePixelMoon
|
a0c92dacc6
|
4J.Render: use stb_image
|
2026-03-06 14:54:55 +02:00 |
|
|
ella love
|
2383fcee6e
|
feat: move script & folder refactor
|
2026-03-05 03:29:23 -05:00 |
|