backups/4jcraft
1
0
Fork 0
mirror of https://github.com/4jcraft/4jcraft.git synced 2026-04-26 08:13:37 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
4jcraft/Minecraft.Client/UI/Screens
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
..
AbstractContainerScreen.cpp Merge branch 'upstream-dev' into cleanup/nullptr-replacement 2026-03-30 16:28:40 +11:00
AbstractContainerScreen.h fix(jui): make creative screen correctly override menu clicked() 2026-03-29 15:52:38 -05:00
AchievementPopup.cpp refactor: replace NULL with nullptr across C++ codebase 2026-03-30 16:25:52 +11:00
AchievementPopup.h refactor: replace double-underscore MSVC integer types with stdint 2026-03-30 00:08:25 -05:00
AchievementScreen.cpp refactor: replace NULL with nullptr across C++ codebase 2026-03-30 16:25:52 +11:00
AchievementScreen.h refactor(jui): specify overrides, resourcelocations, and localization 2026-03-29 15:51:23 -05:00
BeaconScreen.cpp feat(jui): add beacon screen 2026-03-29 15:52:35 -05:00
BeaconScreen.h feat(jui): add beacon screen 2026-03-29 15:52:35 -05:00
BrewingStandScreen.cpp feat(jui): add brewing stand screen (+ fix enchantment screen not being used) 2026-03-29 15:52:18 -05:00
BrewingStandScreen.h feat(jui): add brewing stand screen (+ fix enchantment screen not being used) 2026-03-29 15:52:18 -05:00
ChatScreen.cpp refactor: replace NULL with nullptr across C++ codebase 2026-03-30 16:25:52 +11:00
ChatScreen.h refactor(jui): specify overrides, resourcelocations, and localization 2026-03-29 15:51:23 -05:00
ConfirmScreen.cpp fix(jui): remove debug autoconfirm from ConfirmScreen 2026-03-29 15:50:34 -05:00
ConfirmScreen.h refactor(jui): specify overrides, resourcelocations, and localization 2026-03-29 15:51:23 -05:00
ConnectScreen.cpp refactor: replace NULL with nullptr across C++ codebase 2026-03-30 16:25:52 +11:00
ConnectScreen.h refactor(jui): specify overrides, resourcelocations, and localization 2026-03-29 15:51:23 -05:00
ContainerScreen.cpp chore(jui): remove inaccurate "unused" comments 2026-03-29 15:52:18 -05:00
ContainerScreen.h refactor(jui): specify overrides, resourcelocations, and localization 2026-03-29 15:51:23 -05:00
ControlsScreen.cpp chore: format Minecraft.Client 2026-03-13 17:10:10 -05:00
ControlsScreen.h refactor(jui): specify overrides, resourcelocations, and localization 2026-03-29 15:51:23 -05:00
CraftingScreen.cpp chore(jui): remove inaccurate "unused" comments 2026-03-29 15:52:18 -05:00
CraftingScreen.h refactor(jui): specify overrides, resourcelocations, and localization 2026-03-29 15:51:23 -05:00
CreateWorldScreen.cpp Merge branch 'upstream-dev' into cleanup/nullptr-replacement 2026-03-30 16:28:40 +11:00
CreateWorldScreen.h refactor(jui): specify overrides, resourcelocations, and localization 2026-03-29 15:51:23 -05:00
CreativeInventoryScreen.cpp refactor: replace NULL with nullptr across C++ codebase 2026-03-30 16:25:52 +11:00
CreativeInventoryScreen.h fix: rebase issue with CreativeInventoryScreen 2026-03-29 16:12:30 -05:00
DeathScreen.cpp refactor: replace NULL with nullptr across C++ codebase 2026-03-30 16:25:52 +11:00
DeathScreen.h refactor(jui): specify overrides, resourcelocations, and localization 2026-03-29 15:51:23 -05:00
DisconnectedScreen.cpp refactor: replace NULL with nullptr across C++ codebase 2026-03-30 16:25:52 +11:00
DisconnectedScreen.h refactor(jui): specify overrides, resourcelocations, and localization 2026-03-29 15:51:23 -05:00
EnchantmentScreen.cpp chore(jui): remove inaccurate "unused" comments 2026-03-29 15:52:18 -05:00
EnchantmentScreen.h refactor(jui): specify overrides, resourcelocations, and localization 2026-03-29 15:51:23 -05:00
ErrorScreen.cpp chore: format Minecraft.Client 2026-03-13 17:10:10 -05:00
ErrorScreen.h refactor(jui): specify overrides, resourcelocations, and localization 2026-03-29 15:51:23 -05:00
FurnaceScreen.cpp chore(jui): remove inaccurate "unused" comments 2026-03-29 15:52:18 -05:00
FurnaceScreen.h refactor(jui): specify overrides, resourcelocations, and localization 2026-03-29 15:51:23 -05:00
HopperScreen.cpp chore(jui): remove inaccurate "unused" comments 2026-03-29 15:52:18 -05:00
HopperScreen.h refactor(jui): specify overrides, resourcelocations, and localization 2026-03-29 15:51:23 -05:00
HorseInventoryScreen.cpp chore(jui): remove inaccurate "unused" comments 2026-03-29 15:52:18 -05:00
HorseInventoryScreen.h feat(jui): add horse inventory screen 2026-03-29 15:50:34 -05:00
InBedChatScreen.cpp chore: format Minecraft.Client 2026-03-13 17:10:10 -05:00
InBedChatScreen.h refactor(jui): specify overrides, resourcelocations, and localization 2026-03-29 15:51:23 -05:00
InventoryScreen.cpp chore(jui): remove inaccurate "unused" comments 2026-03-29 15:52:18 -05:00
InventoryScreen.h refactor(jui): specify overrides, resourcelocations, and localization 2026-03-29 15:51:23 -05:00
JoinMultiplayerScreen.cpp refactor: replace NULL with nullptr across C++ codebase 2026-03-30 16:25:52 +11:00
JoinMultiplayerScreen.h refactor(jui): specify overrides, resourcelocations, and localization 2026-03-29 15:51:23 -05:00
MerchantScreen.cpp fix(jui): accidental ! in deprecated recipe check 2026-03-29 15:52:19 -05:00
MerchantScreen.h feat(jui): add merchant screen 2026-03-29 15:52:19 -05:00
MessageScreen.cpp feat(jui): (re-)add transitional screens 2026-03-19 03:37:39 +03:00
MessageScreen.h refactor(jui): specify overrides, resourcelocations, and localization 2026-03-29 15:51:23 -05:00
NameEntryScreen.cpp refactor: replace NULL with nullptr across C++ codebase 2026-03-30 16:25:52 +11:00
NameEntryScreen.h refactor(jui): specify overrides, resourcelocations, and localization 2026-03-29 15:51:23 -05:00
OptionsScreen.cpp refactor: replace NULL with nullptr across C++ codebase 2026-03-30 16:25:52 +11:00
OptionsScreen.h refactor(jui): specify overrides, resourcelocations, and localization 2026-03-29 15:51:23 -05:00
PauseScreen.cpp refactor: replace NULL with nullptr across C++ codebase 2026-03-30 16:25:52 +11:00
PauseScreen.h refactor(jui): specify overrides, resourcelocations, and localization 2026-03-29 15:51:23 -05:00
ReceivingLevelScreen.cpp refactor: replace NULL with nullptr across C++ codebase 2026-03-30 16:25:52 +11:00
ReceivingLevelScreen.h refactor(jui): specify overrides, resourcelocations, and localization 2026-03-29 15:51:23 -05:00
RenameWorldScreen.cpp refactor: replace NULL with nullptr across C++ codebase 2026-03-30 16:25:52 +11:00
RenameWorldScreen.h refactor(jui): specify overrides, resourcelocations, and localization 2026-03-29 15:51:23 -05:00
RepairScreen.cpp refactor: replace NULL with nullptr across C++ codebase 2026-03-30 16:25:52 +11:00
RepairScreen.h feat(jui): add anvil screen 2026-03-29 15:50:35 -05:00
SelectWorldScreen.cpp Merge branch 'upstream-dev' into cleanup/nullptr-replacement 2026-03-30 16:28:40 +11:00
SelectWorldScreen.h chore: fmt 2026-03-29 15:52:18 -05:00
StatsScreen.cpp refactor: replace NULL with nullptr across C++ codebase 2026-03-30 16:25:52 +11:00
StatsScreen.h refactor(jui): specify overrides, resourcelocations, and localization 2026-03-29 15:51:23 -05:00
TextEditScreen.cpp refactor: replace NULL with nullptr across C++ codebase 2026-03-30 16:25:52 +11:00
TextEditScreen.h refactor(jui): specify overrides, resourcelocations, and localization 2026-03-29 15:51:23 -05:00
TitleScreen.cpp refactor: replace NULL with nullptr across C++ codebase 2026-03-30 16:25:52 +11:00
TitleScreen.h refactor(jui): specify overrides, resourcelocations, and localization 2026-03-29 15:51:23 -05:00
TrapScreen.cpp Merge branch 'upstream-dev' into cleanup/shared-portability-reset-v2 2026-03-30 15:21:08 +11:00
TrapScreen.h feat(jui): re-enable and update TrapScreen 2026-03-29 15:50:36 -05:00
VideoSettingsScreen.cpp refactor: replace NULL with nullptr across C++ codebase 2026-03-30 16:25:52 +11:00
VideoSettingsScreen.h refactor(jui): specify overrides, resourcelocations, and localization 2026-03-29 15:51:23 -05:00