backups/4jcraft
1
0
Fork 0
mirror of https://github.com/4jcraft/4jcraft.git synced 2026-05-08 01:47:13 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
4jcraft/Minecraft.Client/UI/Screens
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
..
AbstractContainerScreen.cpp fix(jui): make creative screen correctly override menu clicked() 2026-03-29 15:52:38 -05:00
AbstractContainerScreen.h fix(jui): make creative screen correctly override menu clicked() 2026-03-29 15:52:38 -05:00
AchievementPopup.cpp chore(jui): remove inaccurate "unused" comments 2026-03-29 15:52:18 -05:00
AchievementPopup.h chore: format Minecraft.Client 2026-03-13 17:10:10 -05:00
AchievementScreen.cpp chore(jui): remove inaccurate "unused" comments 2026-03-29 15:52:18 -05: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 more fixes 2026-03-22 03:13:45 -05: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 cleanup: flatten dead branches in client render texture and runtime code 2026-03-26 20:29:59 +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/shared-portability-reset-v2 2026-03-30 15:21:08 +11:00
CreateWorldScreen.h refactor(jui): specify overrides, resourcelocations, and localization 2026-03-29 15:51:23 -05:00
CreativeInventoryScreen.cpp fix: rebase issue with CreativeInventoryScreen 2026-03-29 16:12:30 -05:00
CreativeInventoryScreen.h fix: rebase issue with CreativeInventoryScreen 2026-03-29 16:12:30 -05:00
DeathScreen.cpp feat(jui): add world leaving 2026-03-19 15:05:32 +03:00
DeathScreen.h refactor(jui): specify overrides, resourcelocations, and localization 2026-03-29 15:51:23 -05:00
DisconnectedScreen.cpp chore: format Minecraft.Client 2026-03-13 17:10:10 -05: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 chore: format Minecraft.Client 2026-03-13 17:10:10 -05: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 chore: format Minecraft.Client 2026-03-13 17:10:10 -05:00
NameEntryScreen.h refactor(jui): specify overrides, resourcelocations, and localization 2026-03-29 15:51:23 -05:00
OptionsScreen.cpp chore: format Minecraft.Client 2026-03-13 17:10:10 -05:00
OptionsScreen.h refactor(jui): specify overrides, resourcelocations, and localization 2026-03-29 15:51:23 -05:00
PauseScreen.cpp fix(jui): ensure serverside unpausing in all scenarios 2026-03-21 03:05:42 +03:00
PauseScreen.h refactor(jui): specify overrides, resourcelocations, and localization 2026-03-29 15:51:23 -05:00
ReceivingLevelScreen.cpp chore: format Minecraft.Client 2026-03-13 17:10:10 -05:00
ReceivingLevelScreen.h refactor(jui): specify overrides, resourcelocations, and localization 2026-03-29 15:51:23 -05:00
RenameWorldScreen.cpp cleanup: flatten dead branches in client render texture and runtime code 2026-03-26 20:29:59 +11:00
RenameWorldScreen.h refactor(jui): specify overrides, resourcelocations, and localization 2026-03-29 15:51:23 -05:00
RepairScreen.cpp feat(jui): add anvil screen 2026-03-29 15:50:35 -05:00
RepairScreen.h feat(jui): add anvil screen 2026-03-29 15:50:35 -05:00
SelectWorldScreen.cpp Merge branch 'upstream-dev' into cleanup/shared-portability-reset-v2 2026-03-30 15:21:08 +11:00
SelectWorldScreen.h chore: fmt 2026-03-29 15:52:18 -05:00
StatsScreen.cpp cleanup: flatten dead branches in client render texture and runtime code 2026-03-26 20:29:59 +11:00
StatsScreen.h refactor(jui): specify overrides, resourcelocations, and localization 2026-03-29 15:51:23 -05:00
TextEditScreen.cpp fixes to java UI and Minecraft.cpp 2026-03-22 04:14:58 -05:00
TextEditScreen.h refactor(jui): specify overrides, resourcelocations, and localization 2026-03-29 15:51:23 -05:00
TitleScreen.cpp refactor: configure classic panorama at compile-time 2026-03-29 15:53:10 -05: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 fix: readjust VideoSettingsScreen ITEM_COUNT 2026-03-29 15:53:10 -05:00
VideoSettingsScreen.h refactor(jui): specify overrides, resourcelocations, and localization 2026-03-29 15:51:23 -05:00