backups/4jcraft
1
0
Fork 0
mirror of https://github.com/4jcraft/4jcraft.git synced 2026-04-27 18:13:43 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
4jcraft/Minecraft.Client/Platform/Common/GameRules
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
..
AddEnchantmentRuleDefinition.cpp format .Client/Common/GameRules 2026-03-22 01:15:44 -05:00
AddEnchantmentRuleDefinition.h format .Client/Common/GameRules 2026-03-22 01:15:44 -05:00
AddItemRuleDefinition.cpp format .Client/Common/GameRules 2026-03-22 01:15:44 -05:00
AddItemRuleDefinition.h format .Client/Common/GameRules 2026-03-22 01:15:44 -05:00
ApplySchematicRuleDefinition.cpp refactor: remove heap-allocated AABBs 2026-03-28 02:58:56 -05:00
ApplySchematicRuleDefinition.h refactor: remove heap-allocated AABBs 2026-03-28 02:58:56 -05:00
BiomeOverride.cpp format .Client/Common/GameRules 2026-03-22 01:15:44 -05:00
BiomeOverride.h format .Client/Common/GameRules 2026-03-22 01:15:44 -05:00
CollectItemRuleDefinition.cpp format .Client/Common/GameRules 2026-03-22 01:15:44 -05:00
CollectItemRuleDefinition.h format .Client/Common/GameRules 2026-03-22 01:15:44 -05:00
CompleteAllRuleDefinition.cpp format .Client/Common/GameRules 2026-03-22 01:15:44 -05:00
CompleteAllRuleDefinition.h format .Client/Common/GameRules 2026-03-22 01:15:44 -05:00
CompoundGameRuleDefinition.cpp format .Client/Common/GameRules 2026-03-22 01:15:44 -05:00
CompoundGameRuleDefinition.h format .Client/Common/GameRules 2026-03-22 01:15:44 -05:00
ConsoleGameRules.h refactor: move Common to Platform/Common 2026-03-09 00:17:42 -05:00
ConsoleGameRulesConstants.h format .Client/Common/GameRules 2026-03-22 01:15:44 -05:00
ConsoleGenerateStructure.cpp format .Client/Common/GameRules 2026-03-22 01:15:44 -05:00
ConsoleGenerateStructure.h TU19: merge Minecraft.Client/Platform/Common/GameRules 2026-03-22 01:27:23 -05:00
ConsoleGenerateStructureAction.h format .Client/Common/GameRules 2026-03-22 01:15:44 -05:00
ConsoleSchematicFile.cpp refactor: remove AABB::newTemp when not returned 2026-03-27 21:56:57 -05:00
ConsoleSchematicFile.h refactor: remove new Vec3 2026-03-26 14:01:14 -05:00
GameRule.cpp format .Client/Common/GameRules 2026-03-22 01:15:44 -05:00
GameRule.h format .Client/Common/GameRules 2026-03-22 01:15:44 -05:00
GameRuleDefinition.cpp format .Client/Common/GameRules 2026-03-22 01:15:44 -05:00
GameRuleDefinition.h format .Client/Common/GameRules 2026-03-22 01:15:44 -05:00
GameRuleManager.cpp cleanup: flatten dead branches in common app and ui code 2026-03-26 20:18:29 +11:00
GameRuleManager.h fix a bunch of undefined refs 2026-03-22 15:27:46 -05:00
GameRulesInstance.h format .Client/Common/GameRules 2026-03-22 01:15:44 -05:00
LevelGenerationOptions.cpp Merge branch 'upstream-dev' into cleanup/shared-portability-reset-v2 2026-03-30 15:21:08 +11:00
LevelGenerationOptions.h TU19: merge Minecraft.Client/Platform/Common/GameRules 2026-03-22 01:27:23 -05:00
LevelGenerators.cpp format .Client/Common/GameRules 2026-03-22 01:15:44 -05:00
LevelGenerators.h format .Client/Common/GameRules 2026-03-22 01:15:44 -05:00
LevelRules.cpp format .Client/Common/GameRules 2026-03-22 01:15:44 -05:00
LevelRules.h format .Client/Common/GameRules 2026-03-22 01:15:44 -05:00
LevelRuleset.cpp format .Client/Common/GameRules 2026-03-22 01:15:44 -05:00
LevelRuleset.h format .Client/Common/GameRules 2026-03-22 01:15:44 -05:00
NamedAreaRuleDefinition.cpp refactor: remove heap-allocated AABBs 2026-03-28 02:58:56 -05:00
NamedAreaRuleDefinition.h refactor: remove heap-allocated AABBs 2026-03-28 02:58:56 -05:00
StartFeature.cpp TU19: merge Minecraft.Client/Platform/Common/GameRules 2026-03-22 01:27:23 -05:00
StartFeature.h TU19: merge Minecraft.Client/Platform/Common/GameRules 2026-03-22 01:27:23 -05:00
UpdatePlayerRuleDefinition.cpp format .Client/Common/GameRules 2026-03-22 01:15:44 -05:00
UpdatePlayerRuleDefinition.h format .Client/Common/GameRules 2026-03-22 01:15:44 -05:00
UseTileRuleDefinition.cpp format .Client/Common/GameRules 2026-03-22 01:15:44 -05:00
UseTileRuleDefinition.h format .Client/Common/GameRules 2026-03-22 01:15:44 -05:00
XboxStructureActionGenerateBox.cpp format .Client/Common/GameRules 2026-03-22 01:15:44 -05:00
XboxStructureActionGenerateBox.h format .Client/Common/GameRules 2026-03-22 01:15:44 -05:00
XboxStructureActionPlaceBlock.cpp format .Client/Common/GameRules 2026-03-22 01:15:44 -05:00
XboxStructureActionPlaceBlock.h format .Client/Common/GameRules 2026-03-22 01:15:44 -05:00
XboxStructureActionPlaceContainer.cpp TU19: merge Minecraft.Client/Platform/Common/GameRules 2026-03-22 01:27:23 -05:00
XboxStructureActionPlaceContainer.h TU19: merge Minecraft.Client/Platform/Common/GameRules 2026-03-22 01:27:23 -05:00
XboxStructureActionPlaceSpawner.cpp TU19: merge Minecraft.Client/Platform/Common/GameRules 2026-03-22 01:27:23 -05:00
XboxStructureActionPlaceSpawner.h format .Client/Common/GameRules 2026-03-22 01:15:44 -05:00