4jcraft/Minecraft.Client/Rendering/Models
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
..
BatModel.cpp TU19: merge Minecraft.Client/Rendering 2026-03-21 22:28:58 -05:00
BatModel.h TU19: merge Minecraft.Client/Rendering 2026-03-21 22:28:58 -05:00
BlazeModel.cpp TU19: merge Minecraft.Client/Rendering 2026-03-21 22:28:58 -05:00
BlazeModel.h TU19: merge Minecraft.Client/Rendering 2026-03-21 22:28:58 -05:00
BoatModel.cpp chore: format Minecraft.Client 2026-03-13 17:10:10 -05:00
BoatModel.h chore: format Minecraft.Client 2026-03-13 17:10:10 -05:00
BookModel.cpp TU19: merge Minecraft.Client/Rendering 2026-03-21 22:28:58 -05:00
BookModel.h TU19: merge Minecraft.Client/Rendering 2026-03-21 22:28:58 -05:00
ChestModel.cpp chore: format Minecraft.Client 2026-03-13 17:10:10 -05:00
ChestModel.h chore: format Minecraft.Client 2026-03-13 17:10:10 -05:00
ChickenModel.cpp TU19: merge Minecraft.Client/Rendering 2026-03-21 22:28:58 -05:00
ChickenModel.h TU19: merge Minecraft.Client/Rendering 2026-03-21 22:28:58 -05:00
CowModel.cpp chore: format Minecraft.Client 2026-03-13 17:10:10 -05:00
CowModel.h chore: format Minecraft.Client 2026-03-13 17:10:10 -05:00
CreeperModel.cpp TU19: merge Minecraft.Client/Rendering 2026-03-21 22:28:58 -05:00
CreeperModel.h TU19: merge Minecraft.Client/Rendering 2026-03-21 22:28:58 -05:00
DragonModel.cpp TU19: merge Minecraft.Client/Rendering 2026-03-21 22:28:58 -05:00
DragonModel.h TU19: merge Minecraft.Client/Rendering 2026-03-21 22:28:58 -05:00
EnderCrystalModel.cpp chore: format Minecraft.Client 2026-03-13 17:10:10 -05:00
EnderCrystalModel.h chore: format Minecraft.Client 2026-03-13 17:10:10 -05:00
EnderManModel.cpp TU19: merge Minecraft.Client/Rendering 2026-03-21 22:28:58 -05:00
EnderManModel.h TU19: merge Minecraft.Client/Rendering 2026-03-21 22:28:58 -05:00
GhastModel.cpp TU19: merge Minecraft.Client/Rendering 2026-03-21 22:28:58 -05:00
GhastModel.h TU19: merge Minecraft.Client/Rendering 2026-03-21 22:28:58 -05:00
HumanoidModel.cpp refactor: replace NULL with nullptr across C++ codebase 2026-03-30 16:25:52 +11:00
HumanoidModel.h TU19: merge Minecraft.Client/Rendering 2026-03-21 22:28:58 -05:00
LargeChestModel.cpp chore: format Minecraft.Client 2026-03-13 17:10:10 -05:00
LargeChestModel.h chore: format Minecraft.Client 2026-03-13 17:10:10 -05:00
LavaSlimeModel.cpp TU19: merge Minecraft.Client/Rendering 2026-03-21 22:28:58 -05:00
LavaSlimeModel.h TU19: merge Minecraft.Client/Rendering 2026-03-21 22:28:58 -05:00
LeashKnotModel.cpp fix: resolve all build warnings and notes 2026-03-23 18:53:18 +11:00
LeashKnotModel.h TU19: merge Minecraft.Client/Rendering 2026-03-21 22:28:58 -05:00
MinecartModel.cpp chore: format Minecraft.Client 2026-03-13 17:10:10 -05:00
MinecartModel.h chore: format Minecraft.Client 2026-03-13 17:10:10 -05:00
Model.cpp chore: format Minecraft.Client 2026-03-13 17:10:10 -05:00
Model.h refactor: replace NULL with nullptr across C++ codebase 2026-03-30 16:25:52 +11:00
ModelHorse.cpp refactor: replace NULL with nullptr across C++ codebase 2026-03-30 16:25:52 +11:00
ModelHorse.h TU19: merge Minecraft.Client/Rendering 2026-03-21 22:28:58 -05:00
ModelPart.cpp Merge branch 'upstream-dev' into cleanup/nullptr-replacement 2026-03-30 16:28:40 +11:00
ModelPart.h fix strings, includes, the usual 2026-03-22 02:28:46 -05:00
OcelotModel.cpp TU19: merge Minecraft.Client/Rendering 2026-03-21 22:28:58 -05:00
OcelotModel.h TU19: merge Minecraft.Client/Rendering 2026-03-21 22:28:58 -05:00
PigModel.cpp chore: format Minecraft.Client 2026-03-13 17:10:10 -05:00
PigModel.h chore: format Minecraft.Client 2026-03-13 17:10:10 -05:00
QuadrupedModel.cpp TU19: merge Minecraft.Client/Rendering 2026-03-21 22:28:58 -05:00
QuadrupedModel.h TU19: merge Minecraft.Client/Rendering 2026-03-21 22:28:58 -05:00
SheepFurModel.cpp TU19: merge Minecraft.Client/Rendering 2026-03-21 22:28:58 -05:00
SheepFurModel.h TU19: merge Minecraft.Client/Rendering 2026-03-21 22:28:58 -05:00
SheepModel.cpp TU19: merge Minecraft.Client/Rendering 2026-03-21 22:28:58 -05:00
SheepModel.h TU19: merge Minecraft.Client/Rendering 2026-03-21 22:28:58 -05:00
SignModel.cpp chore: format Minecraft.Client 2026-03-13 17:10:10 -05:00
SignModel.h chore: format Minecraft.Client 2026-03-13 17:10:10 -05:00
SilverfishModel.cpp TU19: merge Minecraft.Client/Rendering 2026-03-21 22:28:58 -05:00
SilverfishModel.h TU19: merge Minecraft.Client/Rendering 2026-03-21 22:28:58 -05:00
SkeletonHeadModel.cpp TU19: merge Minecraft.Client/Rendering 2026-03-21 22:28:58 -05:00
SkeletonHeadModel.h TU19: merge Minecraft.Client/Rendering 2026-03-21 22:28:58 -05:00
SkeletonModel.cpp TU19: merge Minecraft.Client/Rendering 2026-03-21 22:28:58 -05:00
SkeletonModel.h TU19: merge Minecraft.Client/Rendering 2026-03-21 22:28:58 -05:00
SkiModel.cpp TU19: merge Minecraft.Client/Rendering 2026-03-21 22:28:58 -05:00
SkiModel.h TU19: merge Minecraft.Client/Rendering 2026-03-21 22:28:58 -05:00
SkinBox.h chore: format Minecraft.Client 2026-03-13 17:10:10 -05:00
SlimeModel.cpp refactor: replace NULL with nullptr across C++ codebase 2026-03-30 16:25:52 +11:00
SlimeModel.h chore: format Minecraft.Client 2026-03-13 17:10:10 -05:00
SnowManModel.cpp TU19: merge Minecraft.Client/Rendering 2026-03-21 22:28:58 -05:00
SnowManModel.h TU19: merge Minecraft.Client/Rendering 2026-03-21 22:28:58 -05:00
SpiderModel.cpp TU19: merge Minecraft.Client/Rendering 2026-03-21 22:28:58 -05:00
SpiderModel.h TU19: merge Minecraft.Client/Rendering 2026-03-21 22:28:58 -05:00
SquidModel.cpp TU19: merge Minecraft.Client/Rendering 2026-03-21 22:28:58 -05:00
SquidModel.h TU19: merge Minecraft.Client/Rendering 2026-03-21 22:28:58 -05:00
VillagerGolemModel.cpp TU19: merge Minecraft.Client/Rendering 2026-03-21 22:28:58 -05:00
VillagerGolemModel.h TU19: merge Minecraft.Client/Rendering 2026-03-21 22:28:58 -05:00
VillagerModel.cpp TU19: merge Minecraft.Client/Rendering 2026-03-21 22:28:58 -05:00
VillagerModel.h TU19: merge Minecraft.Client/Rendering 2026-03-21 22:28:58 -05:00
VillagerZombieModel.cpp TU19: merge Minecraft.Client/Rendering 2026-03-21 22:28:58 -05:00
VillagerZombieModel.h TU19: merge Minecraft.Client/Rendering 2026-03-21 22:28:58 -05:00
WitchModel.cpp TU19: merge Minecraft.Client/Rendering 2026-03-21 22:28:58 -05:00
WitchModel.h TU19: merge Minecraft.Client/Rendering 2026-03-21 22:28:58 -05:00
WitherBossModel.cpp TU19: merge Minecraft.Client/Rendering 2026-03-21 22:28:58 -05:00
WitherBossModel.h TU19: merge Minecraft.Client/Rendering 2026-03-21 22:28:58 -05:00
WolfModel.cpp TU19: merge Minecraft.Client/Rendering 2026-03-21 22:28:58 -05:00
WolfModel.h TU19: merge Minecraft.Client/Rendering 2026-03-21 22:28:58 -05:00
ZombieModel.cpp TU19: merge Minecraft.Client/Rendering 2026-03-21 22:28:58 -05:00
ZombieModel.h TU19: merge Minecraft.Client/Rendering 2026-03-21 22:28:58 -05:00