backups/4jcraft
1
0
Fork 0
mirror of https://github.com/4jcraft/4jcraft.git synced 2026-04-24 19:33:37 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
4jcraft/Minecraft.Client/Platform/Common/GameRules
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
..
AddEnchantmentRuleDefinition.cpp refactor: replace NULL with nullptr across C++ codebase 2026-03-30 16:25:52 +11:00
AddEnchantmentRuleDefinition.h format .Client/Common/GameRules 2026-03-22 01:15:44 -05:00
AddItemRuleDefinition.cpp Merge branch 'upstream-dev' into cleanup/nullptr-replacement 2026-03-30 16:28:40 +11:00
AddItemRuleDefinition.h format .Client/Common/GameRules 2026-03-22 01:15:44 -05:00
ApplySchematicRuleDefinition.cpp refactor: replace NULL with nullptr across C++ codebase 2026-03-30 16:25:52 +11:00
ApplySchematicRuleDefinition.h refactor: replace double-underscore MSVC integer types with stdint 2026-03-30 00:08:25 -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 refactor: replace NULL with nullptr across C++ codebase 2026-03-30 16:25:52 +11:00
CollectItemRuleDefinition.h format .Client/Common/GameRules 2026-03-22 01:15:44 -05:00
CompleteAllRuleDefinition.cpp Merge branch 'upstream-dev' into cleanup/nullptr-replacement 2026-03-30 16:28:40 +11:00
CompleteAllRuleDefinition.h format .Client/Common/GameRules 2026-03-22 01:15:44 -05:00
CompoundGameRuleDefinition.cpp Merge branch 'upstream-dev' into cleanup/nullptr-replacement 2026-03-30 16:28:40 +11: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 Merge branch 'upstream-dev' into cleanup/nullptr-replacement 2026-03-30 16:28:40 +11: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 Merge branch 'upstream-dev' into cleanup/nullptr-replacement 2026-03-30 16:28:40 +11:00
ConsoleSchematicFile.h refactor: replace double-underscore MSVC integer types with stdint 2026-03-30 00:08:25 -05:00
GameRule.cpp refactor: expand AUTO_VAR macro 2026-03-29 23:59:05 -05:00
GameRule.h Merge branch 'upstream-dev' into cleanup/nullptr-replacement 2026-03-30 16:28:40 +11:00
GameRuleDefinition.cpp Merge branch 'upstream-dev' into cleanup/nullptr-replacement 2026-03-30 16:28:40 +11:00
GameRuleDefinition.h refactor: replace NULL with nullptr across C++ codebase 2026-03-30 16:25:52 +11:00
GameRuleManager.cpp Merge branch 'upstream-dev' into cleanup/nullptr-replacement 2026-03-30 16:28:40 +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/nullptr-replacement 2026-03-30 16:28:40 +11:00
LevelGenerationOptions.h Merge branch 'upstream-dev' into cleanup/nullptr-replacement 2026-03-30 16:28:40 +11: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 Merge branch 'upstream-dev' into cleanup/nullptr-replacement 2026-03-30 16:28:40 +11: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 refactor: replace NULL with nullptr across C++ codebase 2026-03-30 16:25:52 +11:00
StartFeature.h TU19: merge Minecraft.Client/Platform/Common/GameRules 2026-03-22 01:27:23 -05:00
UpdatePlayerRuleDefinition.cpp Merge branch 'upstream-dev' into cleanup/nullptr-replacement 2026-03-30 16:28:40 +11: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 Merge branch 'upstream-dev' into cleanup/nullptr-replacement 2026-03-30 16:28:40 +11:00
XboxStructureActionPlaceContainer.h TU19: merge Minecraft.Client/Platform/Common/GameRules 2026-03-22 01:27:23 -05:00
XboxStructureActionPlaceSpawner.cpp refactor: replace NULL with nullptr across C++ codebase 2026-03-30 16:25:52 +11:00
XboxStructureActionPlaceSpawner.h format .Client/Common/GameRules 2026-03-22 01:15:44 -05:00