backups/4jcraft
2
0
Fork 0
mirror of https://github.com/4jcraft/4jcraft.git synced 2026-05-16 03:02:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
4jcraft/Minecraft.World/Entities
History
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
..
Mobs Merge branch 'upstream-dev' into cleanup/shared-portability-reset-v2 2026-03-30 15:21:08 +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 TU19: merge Minecraft.World/Entities 2026-03-21 16:29:02 -05:00
Enemy.h TU19: merge Minecraft.World/Entities 2026-03-21 16:29:02 -05:00
Entity.cpp chore: fmt 2026-03-28 21:38:26 -05:00
Entity.h refactor: remove heap-allocated AABBs 2026-03-28 02:58:56 -05:00
EntityDamageSource.cpp TU19: merge Minecraft.World/Entities 2026-03-21 16:29:02 -05: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 chore: format Minecraft.World 2026-03-13 17:06:56 -05:00
EntityPos.h chore: format Minecraft.World 2026-03-13 17:06:56 -05:00
EntitySelector.cpp TU19: merge Minecraft.World/Entities 2026-03-21 16:29:02 -05:00
EntitySelector.h fix: resolve all build warnings and notes 2026-03-23 18:53:18 +11:00
FireworksRocketEntity.cpp TU19: merge Minecraft.World/Entities 2026-03-21 16:29:02 -05: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 refactor: remove heap-allocated AABBs 2026-03-28 02:58:56 -05: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 TU19: merge Minecraft.World/Entities 2026-03-21 16:29:02 -05: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 refactor: remove heap-allocated AABBs 2026-03-28 02:58:56 -05:00
ItemEntity.h TU19: merge Minecraft.World/Entities 2026-03-21 16:29:02 -05:00
LargeFireball.cpp refactor: modernize AABB class 2026-03-27 21:11:11 -05:00
LargeFireball.h TU19: merge Minecraft.World/Entities 2026-03-21 16:29:02 -05:00
LeashFenceKnotEntity.cpp refactor: remove AABB::newTemp when not returned 2026-03-27 21:56:57 -05:00
LeashFenceKnotEntity.h TU19: merge Minecraft.World/Entities 2026-03-21 16:29:02 -05:00
LivingEntity.cpp Merge branch 'upstream-dev' into cleanup/shared-portability-reset-v2 2026-03-30 15:21:08 +11:00
LivingEntity.h refactor: remove calls to Vec3::newTemp and Vec3::newPermanent 2026-03-26 13:29:05 -05: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 wip: removing vec3 tls 2026-03-26 01:10:27 -05:00
MinecartContainer.h TU19: merge Minecraft.World/Entities 2026-03-21 16:29:02 -05:00
MinecartFurnace.cpp TU19: merge Minecraft.World/Entities 2026-03-21 16:29:02 -05: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 TU19: merge Minecraft.World/Entities 2026-03-21 16:29:02 -05: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 refactor: remove heap-allocated AABBs 2026-03-28 02:58:56 -05:00
Mob.h TU19: merge Minecraft.World/Entities 2026-03-21 16:29:02 -05:00
MobCategory.cpp TU19: merge Minecraft.World/Entities 2026-03-21 16:29:02 -05:00
MobCategory.h TU19: merge Minecraft.World/Entities 2026-03-21 16:29:02 -05:00
MobEffect.cpp feat(jui): add beacon screen 2026-03-29 15:52:35 -05: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: remove heap-allocated AABBs 2026-03-28 02:58:56 -05:00
Monster.h TU19: merge Minecraft.World/Entities 2026-03-21 16:29:02 -05:00
OwnableEntity.h TU19: merge Minecraft.World/Entities 2026-03-21 16:29:02 -05:00
PathfinderMob.cpp refactor: remove heap-allocated AABBs 2026-03-28 02:58:56 -05: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 cleanup: flatten dead branches in world io level network and stats 2026-03-26 20:53:52 +11:00
SyncedEntityData.h TU19: merge Minecraft.World/Entities 2026-03-21 16:29:02 -05:00
TamableAnimal.cpp cleanup: flatten dead branches in world io level network and stats 2026-03-26 20:53:52 +11:00
TamableAnimal.h TU19: merge Minecraft.World/Entities 2026-03-21 16:29:02 -05:00
Throwable.cpp refactor: remove heap-allocated AABBs 2026-03-28 02:58:56 -05: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: modernize AABB class 2026-03-27 21:11:11 -05:00
WitherSkull.h TU19: merge Minecraft.World/Entities 2026-03-21 16:29:02 -05:00