backups/4jcraft
1
0
Fork 0
mirror of https://github.com/4jcraft/4jcraft.git synced 2026-04-28 03:53:37 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
4jcraft/Minecraft.Client/Platform/Common
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
..
Audio Merge branch 'upstream-dev' into cleanup/nullptr-replacement 2026-03-30 16:28:40 +11:00
Colours refactor: expand AUTO_VAR macro 2026-03-29 23:59:05 -05:00
DLC Merge branch 'upstream-dev' into cleanup/nullptr-replacement 2026-03-30 16:28:40 +11:00
GameRules Merge branch 'upstream-dev' into cleanup/nullptr-replacement 2026-03-30 16:28:40 +11:00
Leaderboards Merge branch 'upstream-dev' into cleanup/nullptr-replacement 2026-03-30 16:28:40 +11:00
Network Merge branch 'upstream-dev' into cleanup/nullptr-replacement 2026-03-30 16:28:40 +11:00
Telemetry refactor: replace NULL with nullptr across C++ codebase 2026-03-30 16:25:52 +11:00
Trial refactor: move Common to Platform/Common 2026-03-09 00:17:42 -05:00
Tutorial Merge branch 'upstream-dev' into cleanup/nullptr-replacement 2026-03-30 16:28:40 +11:00
UI Merge branch 'upstream-dev' into cleanup/nullptr-replacement 2026-03-30 16:28:40 +11:00
XML Merge branch 'upstream-dev' into cleanup/nullptr-replacement 2026-03-30 16:28:40 +11:00
zlib refactor: move Common to Platform/Common 2026-03-09 00:17:42 -05:00
App_Defines.h cleanup: flatten dead branches in common app and ui code 2026-03-26 20:18:29 +11:00
App_enums.h cleanup: flatten dead branches in common app and ui code 2026-03-26 20:18:29 +11:00
App_structs.h refactor: replace some win32 typedefs 2026-03-30 00:16:26 -05:00
BuildVer.h update buildver to 1.6.0560 2026-03-23 01:46:21 +03:00
C4JMemoryPool.h refactor: replace NULL with nullptr across C++ codebase 2026-03-30 16:25:52 +11:00
C4JMemoryPoolAllocator.h fix: shuffle around remaining paths to get everything building again/home/tropical/Documents/GitHub/4jcraft-real/Minecraft.World/Level/../../Minecraft.Client/Textures/Packs/TexturePack.h 2026-03-09 00:34:09 -05:00
Console_Awards_enum.h cleanup: flatten dead branches in common app and ui code 2026-03-26 20:18:29 +11:00
Console_Debug_enum.h build fixes 2026-03-22 00:10:15 -05:00
Console_Utils.cpp cleanup: flatten dead branches in common app and ui code 2026-03-26 20:18:29 +11:00
ConsoleGameMode.cpp refactor: move Common to Platform/Common 2026-03-09 00:17:42 -05:00
ConsoleGameMode.h refactor: move Common to Platform/Common 2026-03-09 00:17:42 -05:00
Consoles_App.cpp Merge branch 'upstream-dev' into cleanup/nullptr-replacement 2026-03-30 16:28:40 +11:00
Consoles_App.h Merge branch 'upstream-dev' into cleanup/nullptr-replacement 2026-03-30 16:28:40 +11:00
Minecraft_Macros.h Use fixed-width casts in skin bitmask macros 2026-03-11 15:38:51 +11:00
Potion_Macros.h refactor: move Common to Platform/Common 2026-03-09 00:17:42 -05:00
ShutdownManager.h checkpoint: refresh supported-path portability baseline 2026-03-26 17:05:31 +11:00
xuiscene_base.h refactor: move Common to Platform/Common 2026-03-09 00:17:42 -05:00