backups/4jcraft
1
0
Fork 0
mirror of https://github.com/4jcraft/4jcraft.git synced 2026-04-27 18:54:21 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
4jcraft/Minecraft.World/Entities
History
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
..
Mobs Merge branch 'upstream-dev' into cleanup/nullptr-replacement 2026-03-30 16:28:40 +11:00
AbsoptionMobEffect.cpp TU19: merge Minecraft.World/Entities 2026-03-21 16:29:02 -05:00
AbsoptionMobEffect.h TU19: merge Minecraft.World/Entities 2026-03-21 16:29:02 -05:00
AttackDamageMobEffect.cpp TU19: merge Minecraft.World/Entities 2026-03-21 16:29:02 -05:00
AttackDamageMobEffect.h TU19: merge Minecraft.World/Entities 2026-03-21 16:29:02 -05:00
DoorInfo.cpp chore: format Minecraft.World 2026-03-13 17:06:56 -05:00
DoorInfo.h chore: format Minecraft.World 2026-03-13 17:06:56 -05:00
Enemy.cpp refactor: replace NULL with nullptr across C++ codebase 2026-03-30 16:25:52 +11:00
Enemy.h TU19: merge Minecraft.World/Entities 2026-03-21 16:29:02 -05:00
Entity.cpp Merge branch 'upstream-dev' into cleanup/nullptr-replacement 2026-03-30 16:28:40 +11:00
Entity.h refactor: remove heap-allocated AABBs 2026-03-28 02:58:56 -05:00
EntityDamageSource.cpp refactor: replace NULL with nullptr across C++ codebase 2026-03-30 16:25:52 +11:00
EntityDamageSource.h TU19: merge Minecraft.World/Entities 2026-03-21 16:29:02 -05:00
EntityEvent.h chore: format Minecraft.World 2026-03-13 17:06:56 -05:00
EntityPos.cpp refactor: replace NULL with nullptr across C++ codebase 2026-03-30 16:25:52 +11:00
EntityPos.h chore: format Minecraft.World 2026-03-13 17:06:56 -05:00
EntitySelector.cpp refactor: replace NULL with nullptr across C++ codebase 2026-03-30 16:25:52 +11:00
EntitySelector.h fix: resolve all build warnings and notes 2026-03-23 18:53:18 +11:00
FireworksRocketEntity.cpp refactor: replace NULL with nullptr across C++ codebase 2026-03-30 16:25:52 +11:00
FireworksRocketEntity.h TU19: merge Minecraft.World/Entities 2026-03-21 16:29:02 -05:00
FlyingMob.cpp refactor: remove heap-allocated AABBs 2026-03-28 02:58:56 -05:00
FlyingMob.h TU19: merge Minecraft.World/Entities 2026-03-21 16:29:02 -05:00
GlobalEntity.cpp chore: format Minecraft.World 2026-03-13 17:06:56 -05:00
GlobalEntity.h chore: format Minecraft.World 2026-03-13 17:06:56 -05:00
HangingEntity.cpp Merge branch 'upstream-dev' into cleanup/nullptr-replacement 2026-03-30 16:28:40 +11:00
HangingEntity.h TU19: merge Minecraft.World/Entities 2026-03-21 16:29:02 -05:00
HealthBoostMobEffect.cpp TU19: merge Minecraft.World/Entities 2026-03-21 16:29:02 -05:00
HealthBoostMobEffect.h TU19: merge Minecraft.World/Entities 2026-03-21 16:29:02 -05:00
IndirectEntityDamageSource.cpp refactor: replace NULL with nullptr across C++ codebase 2026-03-30 16:25:52 +11:00
IndirectEntityDamageSource.h TU19: merge Minecraft.World/Entities 2026-03-21 16:29:02 -05:00
InstantaneousMobEffect.cpp chore: format Minecraft.World 2026-03-13 17:06:56 -05:00
InstantaneousMobEffect.h chore: format Minecraft.World 2026-03-13 17:06:56 -05:00
ItemEntity.cpp Merge branch 'upstream-dev' into cleanup/nullptr-replacement 2026-03-30 16:28:40 +11:00
ItemEntity.h TU19: merge Minecraft.World/Entities 2026-03-21 16:29:02 -05:00
LargeFireball.cpp refactor: replace NULL with nullptr across C++ codebase 2026-03-30 16:25:52 +11:00
LargeFireball.h TU19: merge Minecraft.World/Entities 2026-03-21 16:29:02 -05:00
LeashFenceKnotEntity.cpp Merge branch 'upstream-dev' into cleanup/nullptr-replacement 2026-03-30 16:28:40 +11:00
LeashFenceKnotEntity.h TU19: merge Minecraft.World/Entities 2026-03-21 16:29:02 -05:00
LivingEntity.cpp Merge branch 'upstream-dev' into cleanup/nullptr-replacement 2026-03-30 16:28:40 +11:00
LivingEntity.h refactor: replace NULL with nullptr across C++ codebase 2026-03-30 16:25:52 +11:00
MinecartChest.cpp TU19: merge Minecraft.World/Entities 2026-03-21 16:29:02 -05:00
MinecartChest.h TU19: merge Minecraft.World/Entities 2026-03-21 16:29:02 -05:00
MinecartContainer.cpp refactor: replace NULL with nullptr across C++ codebase 2026-03-30 16:25:52 +11:00
MinecartContainer.h TU19: merge Minecraft.World/Entities 2026-03-21 16:29:02 -05:00
MinecartFurnace.cpp refactor: replace NULL with nullptr across C++ codebase 2026-03-30 16:25:52 +11:00
MinecartFurnace.h TU19: merge Minecraft.World/Entities 2026-03-21 16:29:02 -05:00
MinecartHopper.cpp refactor: remove heap-allocated AABBs 2026-03-28 02:58:56 -05:00
MinecartHopper.h TU19: merge Minecraft.World/Entities 2026-03-21 16:29:02 -05:00
MinecartRideable.cpp refactor: replace NULL with nullptr across C++ codebase 2026-03-30 16:25:52 +11:00
MinecartRideable.h TU19: merge Minecraft.World/Entities 2026-03-21 16:29:02 -05:00
MinecartSpawner.cpp TU19: merge Minecraft.World/Entities 2026-03-21 16:29:02 -05:00
MinecartSpawner.h TU19: merge Minecraft.World/Entities 2026-03-21 16:29:02 -05:00
MinecartTNT.cpp TU19: merge Minecraft.World/Entities 2026-03-21 16:29:02 -05:00
MinecartTNT.h TU19: merge Minecraft.World/Entities 2026-03-21 16:29:02 -05:00
Mob.cpp Merge branch 'upstream-dev' into cleanup/nullptr-replacement 2026-03-30 16:28:40 +11:00
Mob.h refactor: replace NULL with nullptr across C++ codebase 2026-03-30 16:25:52 +11:00
MobCategory.cpp refactor: replace NULL with nullptr across C++ codebase 2026-03-30 16:25:52 +11:00
MobCategory.h TU19: merge Minecraft.World/Entities 2026-03-21 16:29:02 -05:00
MobEffect.cpp Merge branch 'upstream-dev' into cleanup/nullptr-replacement 2026-03-30 16:28:40 +11:00
MobEffect.h feat(jui): add beacon screen 2026-03-29 15:52:35 -05:00
MobEffectInstance.cpp TU19: merge Minecraft.World/Entities 2026-03-21 16:29:02 -05:00
MobEffectInstance.h TU19: merge Minecraft.World/Entities 2026-03-21 16:29:02 -05:00
MobType.h chore: format Minecraft.World 2026-03-13 17:06:56 -05:00
Monster.cpp refactor: replace NULL with nullptr across C++ codebase 2026-03-30 16:25:52 +11:00
Monster.h refactor: replace NULL with nullptr across C++ codebase 2026-03-30 16:25:52 +11:00
OwnableEntity.h TU19: merge Minecraft.World/Entities 2026-03-21 16:29:02 -05:00
PathfinderMob.cpp refactor: replace NULL with nullptr across C++ codebase 2026-03-30 16:25:52 +11:00
PathfinderMob.h TU19: merge Minecraft.World/Entities 2026-03-21 16:29:02 -05:00
Projectile.h TU19: merge Minecraft.World/Entities 2026-03-21 16:29:02 -05:00
SyncedEntityData.cpp Merge branch 'upstream-dev' into cleanup/nullptr-replacement 2026-03-30 16:28:40 +11:00
SyncedEntityData.h TU19: merge Minecraft.World/Entities 2026-03-21 16:29:02 -05:00
TamableAnimal.cpp refactor: replace NULL with nullptr across C++ codebase 2026-03-30 16:25:52 +11:00
TamableAnimal.h TU19: merge Minecraft.World/Entities 2026-03-21 16:29:02 -05:00
Throwable.cpp refactor: replace NULL with nullptr across C++ codebase 2026-03-30 16:25:52 +11:00
Throwable.h TU19: merge Minecraft.World/Entities 2026-03-21 16:29:02 -05:00
WaterAnimal.cpp refactor: remove heap-allocated AABBs 2026-03-28 02:58:56 -05:00
WaterAnimal.h TU19: merge Minecraft.World/Entities 2026-03-21 16:29:02 -05:00
WitherSkull.cpp refactor: replace NULL with nullptr across C++ codebase 2026-03-30 16:25:52 +11:00
WitherSkull.h TU19: merge Minecraft.World/Entities 2026-03-21 16:29:02 -05:00