4jcraft/Minecraft.World/Util
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
..
AABB.cpp fix: regression in tile bounding box clip 2026-03-29 14:55:36 -05:00
AABB.h fix: regression in tile bounding box clip 2026-03-29 14:55:36 -05:00
Arrays.h chore: format Minecraft.World 2026-03-13 17:06:56 -05:00
ArrayWithLength.h refactor: remove PolygonArray 2026-03-28 13:34:20 -05:00
BinaryHeap.cpp refactor: remove basic type containers 2026-03-25 17:51:27 -05:00
BinaryHeap.h refactor: remove basic type containers 2026-03-25 17:51:27 -05:00
BoundingBox.cpp TU19: merge Minecraft.World/Util 2026-03-21 17:37:16 -05:00
BoundingBox.h TU19: merge Minecraft.World/Util 2026-03-21 17:37:16 -05:00
C4JThread.cpp checkpoint: refresh supported-path portability baseline 2026-03-26 17:05:31 +11:00
C4JThread.h checkpoint: refresh supported-path portability baseline 2026-03-26 17:05:31 +11:00
Class.cpp chore: format Minecraft.World 2026-03-13 17:06:56 -05:00
Class.h TU19: merge Minecraft.World/Util 2026-03-21 17:37:16 -05:00
Color.cpp chore: format Minecraft.World 2026-03-13 17:06:56 -05:00
Color.h chore: format Minecraft.World 2026-03-13 17:06:56 -05:00
CombatEntry.cpp refactor: remove basic type containers 2026-03-25 17:51:27 -05:00
CombatEntry.h TU19: merge Minecraft.World/Util 2026-03-21 17:37:16 -05:00
CombatTracker.cpp refactor: remove heap-allocated AABBs 2026-03-28 02:58:56 -05:00
CombatTracker.h TU19: merge Minecraft.World/Util 2026-03-21 17:37:16 -05:00
Coord.h chore: format Minecraft.World 2026-03-13 17:06:56 -05:00
DamageSource.cpp TU19: merge Minecraft.World/Util 2026-03-21 17:37:16 -05:00
DamageSource.h TU19: merge Minecraft.World/Util 2026-03-21 17:37:16 -05:00
Definitions.h Merge branch 'upstream-dev' into cleanup/shared-portability-reset-v2 2026-03-30 15:21:08 +11:00
DelayedRelease.cpp TU19: merge Minecraft.World/Util 2026-03-21 17:37:16 -05:00
DelayedRelease.h TU19: merge Minecraft.World/Util 2026-03-21 17:37:16 -05:00
DescFormatter.h fix: clean up sanitizer startup issues 2026-03-23 19:34:58 +11:00
Difficulty.h chore: format Minecraft.World 2026-03-13 17:06:56 -05:00
Direction.cpp TU19: merge Minecraft.World/Util 2026-03-21 17:37:16 -05:00
Direction.h TU19: merge Minecraft.World/Util 2026-03-21 17:37:16 -05:00
Distort.cpp chore: format Minecraft.World 2026-03-13 17:06:56 -05:00
Distort.h chore: format Minecraft.World 2026-03-13 17:06:56 -05:00
Emboss.cpp chore: format Minecraft.World 2026-03-13 17:06:56 -05:00
Emboss.h chore: format Minecraft.World 2026-03-13 17:06:56 -05:00
Exceptions.h chore: format Minecraft.World 2026-03-13 17:06:56 -05:00
Facing.cpp TU19: merge Minecraft.World/Util 2026-03-21 17:37:16 -05:00
Facing.h TU19: merge Minecraft.World/Util 2026-03-21 17:37:16 -05:00
FlippedIcon.cpp chore: format Minecraft.World 2026-03-13 17:06:56 -05:00
FlippedIcon.h chore: format Minecraft.World 2026-03-13 17:06:56 -05:00
FoliageColor.cpp chore: format Minecraft.World 2026-03-13 17:06:56 -05:00
FoliageColor.h chore: format Minecraft.World 2026-03-13 17:06:56 -05:00
FoodConstants.cpp TU19: merge Minecraft.World/Util 2026-03-21 17:37:16 -05:00
FoodConstants.h TU19: merge Minecraft.World/Util 2026-03-21 17:37:16 -05:00
GrassColor.cpp chore: format Minecraft.World 2026-03-13 17:06:56 -05:00
GrassColor.h chore: format Minecraft.World 2026-03-13 17:06:56 -05:00
Hasher.cpp chore: format Minecraft.World 2026-03-13 17:06:56 -05:00
Hasher.h chore: format Minecraft.World 2026-03-13 17:06:56 -05:00
HashExtension.h cleanup: flatten dead branches in world io level network and stats 2026-03-26 20:53:52 +11:00
HitResult.cpp wip: removing vec3 tls 2026-03-26 01:10:27 -05:00
HitResult.h wip: removing vec3 tls 2026-03-26 01:10:27 -05:00
HtmlString.cpp TU19: merge Minecraft.World/Util 2026-03-21 17:37:16 -05:00
HtmlString.h TU19: merge Minecraft.World/Util 2026-03-21 17:37:16 -05:00
I18n.cpp cleanup: flatten dead branches in world io level network and stats 2026-03-26 20:53:52 +11:00
I18n.h chore: format Minecraft.World 2026-03-13 17:06:56 -05:00
Icon.h cleanup: flatten dead branches in world io level network and stats 2026-03-26 20:53:52 +11:00
IconRegister.h chore: format Minecraft.World 2026-03-13 17:06:56 -05:00
JavaIntHash.h refactor: nuke __int64/__uint64 in Minecraft.World 2026-03-21 17:10:36 -05:00
JavaMath.cpp TU19: merge Minecraft.World/Util 2026-03-21 17:37:16 -05:00
JavaMath.h refactor: nuke __int64/__uint64 in Minecraft.World 2026-03-21 17:10:36 -05:00
Language.cpp cleanup: flatten dead branches in world io level network and stats 2026-03-26 20:53:52 +11:00
Language.h more build fixes 2026-03-22 01:14:52 -05:00
libdivide.h cleanup: remove console platform code from shared includes and build paths 2026-03-26 17:53:37 +11:00
LightLayer.h chore: format Minecraft.World 2026-03-13 17:06:56 -05:00
Mth.cpp TU19: merge Minecraft.World/Util 2026-03-21 17:37:16 -05:00
Mth.h TU19: merge Minecraft.World/Util 2026-03-21 17:37:16 -05:00
NumberFormatters.h chore: format Minecraft.World 2026-03-13 17:06:56 -05:00
ParticleTypes.h TU19: merge Minecraft.World/Util 2026-03-21 17:37:16 -05:00
PerformanceTimer.cpp chore: format Minecraft.World 2026-03-13 17:06:56 -05:00
PerformanceTimer.h chore: format Minecraft.World 2026-03-13 17:06:56 -05:00
PortableFileIO.h refactor: nuke __int64/__uint64 in Minecraft.World 2026-03-21 17:10:36 -05:00
Pos.cpp TU19: merge Minecraft.World/Util 2026-03-21 17:37:16 -05:00
Pos.h TU19: merge Minecraft.World/Util 2026-03-21 17:37:16 -05:00
ProgressListener.h chore: format Minecraft.World 2026-03-13 17:06:56 -05:00
Random.cpp refactor: nuke __int64/__uint64 in Minecraft.World 2026-03-21 17:10:36 -05:00
Random.h refactor: nuke __int64/__uint64 in Minecraft.World 2026-03-21 17:10:36 -05:00
Rarity.cpp chore: format Minecraft.World 2026-03-13 17:06:56 -05:00
Rarity.h chore: format Minecraft.World 2026-03-13 17:06:56 -05:00
Reference.h chore: format Minecraft.World 2026-03-13 17:06:56 -05:00
Rotate.cpp chore: format Minecraft.World 2026-03-13 17:06:56 -05:00
Rotate.h chore: format Minecraft.World 2026-03-13 17:06:56 -05:00
Scale.cpp chore: format Minecraft.World 2026-03-13 17:06:56 -05:00
Scale.h chore: format Minecraft.World 2026-03-13 17:06:56 -05:00
SharedConstants.cpp cleanup: flatten dead branches in world io level network and stats 2026-03-26 20:53:52 +11:00
SharedConstants.h TU19: merge Minecraft.World/Util 2026-03-21 17:37:16 -05:00
SmoothFloat.cpp chore: format Minecraft.World 2026-03-13 17:06:56 -05:00
SmoothFloat.h chore: format Minecraft.World 2026-03-13 17:06:56 -05:00
SoundTypes.h cleanup: flatten dead branches in world io level network and stats 2026-03-26 20:53:52 +11:00
StringHelpers.cpp cleanup: flatten dead branches in world io level network and stats 2026-03-26 20:53:52 +11:00
StringHelpers.h fix messed up function declaration for u16string_to_wstring 2026-03-22 23:04:06 -05:00
ThreadName.cpp cleanup: flatten dead branches in world io level network and stats 2026-03-26 20:53:52 +11:00
ThreadName.h Merge upstream/dev into issue/64-remove-winapi-primitives 2026-03-14 19:20:09 +11:00
UseAnim.h chore: format Minecraft.World 2026-03-13 17:06:56 -05:00
Vec3.cpp fix: Vec3 construct wasn't constexpr 2026-03-29 18:34:00 -05:00
Vec3.h fix: Vec3 construct wasn't constexpr 2026-03-29 18:34:00 -05:00
WaterColor.cpp chore: format Minecraft.World 2026-03-13 17:06:56 -05:00
WaterColor.h chore: format Minecraft.World 2026-03-13 17:06:56 -05:00
WeighedRandom.cpp chore: format Minecraft.World 2026-03-13 17:06:56 -05:00
WeighedRandom.h chore: format Minecraft.World 2026-03-13 17:06:56 -05:00
WeighedTreasure.cpp TU19: merge Minecraft.World/Util 2026-03-21 17:37:16 -05:00
WeighedTreasure.h TU19: merge Minecraft.World/Util 2026-03-21 17:37:16 -05:00