backups/4jcraft
1
0
Fork 0
mirror of https://github.com/4jcraft/4jcraft.git synced 2026-04-30 15:33:36 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
4jcraft/Minecraft.World/Level
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
..
Dimensions refactor: remove calls to Vec3::newTemp and Vec3::newPermanent 2026-03-26 13:29:05 -05:00
Events refactor: remove calls to Vec3::newTemp and Vec3::newPermanent 2026-03-26 13:29:05 -05:00
Storage Merge branch 'upstream-dev' into cleanup/shared-portability-reset-v2 2026-03-30 15:21:08 +11:00
BaseMobSpawner.cpp refactor: modernize AABB class 2026-03-27 21:11:11 -05:00
BaseMobSpawner.h fix: resolve all build warnings and notes 2026-03-23 18:53:18 +11:00
BlockDestructionProgress.cpp chore: format Minecraft.World 2026-03-13 17:06:56 -05:00
BlockDestructionProgress.h chore: format Minecraft.World 2026-03-13 17:06:56 -05:00
BlockGenMethods.cpp chore: format Minecraft.World 2026-03-13 17:06:56 -05:00
BlockGenMethods.h chore: format Minecraft.World 2026-03-13 17:06:56 -05:00
BlockReplacements.cpp chore: format Minecraft.World 2026-03-13 17:06:56 -05:00
BlockReplacements.h chore: format Minecraft.World 2026-03-13 17:06:56 -05:00
Calendar.cpp TU19: merge Minecraft.World/Level 2026-03-21 17:07:51 -05:00
Calendar.h TU19: merge Minecraft.World/Level 2026-03-21 17:07:51 -05:00
ChunkPos.cpp TU19: merge Minecraft.World/Level 2026-03-21 17:07:51 -05:00
ChunkPos.h wip: removing vec3 tls 2026-03-26 01:10:27 -05:00
ChunkSource.h TU19: merge Minecraft.World/Level 2026-03-21 17:07:51 -05:00
CustomLevelSource.cpp cleanup: flatten dead branches in world io level network and stats 2026-03-26 20:53:52 +11:00
CustomLevelSource.h TU19: merge Minecraft.World/Level 2026-03-21 17:07:51 -05:00
DerivedLevelData.cpp TU19: merge Minecraft.World/Level 2026-03-21 17:07:51 -05:00
DerivedLevelData.h TU19: merge Minecraft.World/Level 2026-03-21 17:07:51 -05:00
EmptyLevelChunk.cpp TU19: merge Minecraft.World/Level 2026-03-21 17:07:51 -05:00
EmptyLevelChunk.h TU19: merge Minecraft.World/Level 2026-03-21 17:07:51 -05:00
Explosion.cpp refactor: remove heap-allocated AABBs 2026-03-28 02:58:56 -05:00
Explosion.h refactor: remove calls to Vec3::newTemp and Vec3::newPermanent 2026-03-26 13:29:05 -05:00
GameRules.cpp TU19: merge Minecraft.World/Level 2026-03-21 17:07:51 -05:00
GameRules.h TU19: merge Minecraft.World/Level 2026-03-21 17:07:51 -05:00
Level.cpp Merge branch 'upstream-dev' into cleanup/shared-portability-reset-v2 2026-03-30 15:21:08 +11:00
Level.h Merge branch 'upstream-dev' into cleanup/shared-portability-reset-v2 2026-03-30 15:21:08 +11:00
LevelChunk.cpp Merge branch 'upstream-dev' into cleanup/shared-portability-reset-v2 2026-03-30 15:21:08 +11:00
LevelChunk.h cleanup: flatten dead branches in world io level network and stats 2026-03-26 20:53:52 +11:00
LevelConflictException.cpp chore: format Minecraft.World 2026-03-13 17:06:56 -05:00
LevelConflictException.h chore: format Minecraft.World 2026-03-13 17:06:56 -05:00
LevelData.cpp TU19: merge Minecraft.World/Level 2026-03-21 17:07:51 -05:00
LevelData.h TU19: merge Minecraft.World/Level 2026-03-21 17:07:51 -05:00
RandomLevelSource.cpp Merge branch 'upstream-dev' into cleanup/shared-portability-reset-v2 2026-03-30 15:21:08 +11:00
RandomLevelSource.h TU19: merge Minecraft.World/Level 2026-03-21 17:07:51 -05:00
Redstone.cpp TU19: merge Minecraft.World/Level 2026-03-21 17:07:51 -05:00
Redstone.h TU19: merge Minecraft.World/Level 2026-03-21 17:07:51 -05:00
TickNextTickData.cpp fix: clean up sanitizer startup issues 2026-03-23 19:34:58 +11:00
TickNextTickData.h TU19: merge Minecraft.World/Level 2026-03-21 17:07:51 -05:00
TileEventData.cpp chore: format Minecraft.World 2026-03-13 17:06:56 -05:00
TileEventData.h chore: format Minecraft.World 2026-03-13 17:06:56 -05:00
TilePos.cpp chore: format Minecraft.World 2026-03-13 17:06:56 -05:00
TilePos.h chore: format Minecraft.World 2026-03-13 17:06:56 -05:00
WaterLevelChunk.cpp TU19: merge Minecraft.World/Level 2026-03-21 17:07:51 -05:00
WaterLevelChunk.h TU19: merge Minecraft.World/Level 2026-03-21 17:07:51 -05:00