backups/4jcraft
1
0
Fork 0
mirror of https://github.com/4jcraft/4jcraft.git synced 2026-04-25 03:23:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
4jcraft/Minecraft.Client/UI
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
..
Screens Merge branch 'upstream-dev' into cleanup/shared-portability-reset-v2 2026-03-30 15:21:08 +11:00
AbstractBeaconButton.cpp chore: fmt 2026-03-29 15:52:38 -05:00
AbstractBeaconButton.h feat(jui): add beacon screen 2026-03-29 15:52:35 -05:00
BeaconCancelButton.cpp feat(jui): add beacon screen 2026-03-29 15:52:35 -05:00
BeaconCancelButton.h feat(jui): add beacon screen 2026-03-29 15:52:35 -05:00
BeaconConfirmButton.cpp feat(jui): add beacon screen 2026-03-29 15:52:35 -05:00
BeaconConfirmButton.h feat(jui): add beacon screen 2026-03-29 15:52:35 -05:00
BeaconPowerButton.cpp feat(jui): add beacon screen 2026-03-29 15:52:35 -05:00
BeaconPowerButton.h feat(jui): add beacon screen 2026-03-29 15:52:35 -05:00
BossMobGuiInfo.cpp add BossMobGuiInfo to UI 2026-03-21 22:58:00 -05:00
BossMobGuiInfo.h add BossMobGuiInfo to UI 2026-03-21 22:58:00 -05:00
Button.cpp fix(jui): put button render method behind ifdef 2026-03-29 15:52:18 -05:00
Button.h chore: format Minecraft.Client 2026-03-13 17:10:10 -05:00
EditBox.cpp fix(jui): always use white if background is disabled in EditBox 2026-03-29 15:50:35 -05:00
EditBox.h feat(jui): make edit box background be able to get disabled 2026-03-29 15:50:34 -05:00
Font.cpp cleanup: flatten dead branches in client render texture and runtime code 2026-03-26 20:29:59 +11:00
Font.h cleanup: flatten dead branches in client render texture and runtime code 2026-03-26 20:29:59 +11:00
Gui.cpp Merge branch 'upstream-dev' into cleanup/shared-portability-reset-v2 2026-03-30 15:21:08 +11:00
Gui.h fix: rebase issue with CreativeInventoryScreen 2026-03-29 16:12:30 -05:00
GuiComponent.cpp chore: format Minecraft.Client 2026-03-13 17:10:10 -05:00
GuiComponent.h chore: format Minecraft.Client 2026-03-13 17:10:10 -05:00
GuiMessage.cpp chore: format Minecraft.Client 2026-03-13 17:10:10 -05:00
GuiMessage.h chore: format Minecraft.Client 2026-03-13 17:10:10 -05:00
Rect2i.cpp chore: format Minecraft.Client 2026-03-13 17:10:10 -05:00
Rect2i.h chore: format Minecraft.Client 2026-03-13 17:10:10 -05:00
Screen.cpp chore(jui): remove inaccurate "unused" comments 2026-03-29 15:52:18 -05:00
Screen.h Merge branch 'dev' into feat/restore-java-gui 2026-03-16 16:04:30 +03:00
ScreenSizeCalculator.cpp chore: format Minecraft.Client 2026-03-13 17:10:10 -05:00
ScreenSizeCalculator.h chore: format Minecraft.Client 2026-03-13 17:10:10 -05:00
ScrolledSelectionList.cpp cleanup: flatten dead branches in client render texture and runtime code 2026-03-26 20:29:59 +11:00
ScrolledSelectionList.h chore: format Minecraft.Client 2026-03-13 17:10:10 -05:00
SimpleIcon.cpp fix a bunch of undefined refs 2026-03-22 15:27:46 -05:00
SimpleIcon.h fix a bunch of undefined refs 2026-03-22 15:27:46 -05:00
SlideButton.cpp chore: format Minecraft.Client 2026-03-13 17:10:10 -05:00
SlideButton.h refactor(jui): specify overrides, resourcelocations, and localization 2026-03-29 15:51:23 -05:00
SmallButton.cpp chore: format Minecraft.Client 2026-03-13 17:10:10 -05:00
SmallButton.h chore: format Minecraft.Client 2026-03-13 17:10:10 -05:00
TradeSwitchButton.cpp feat(jui): add merchant screen 2026-03-29 15:52:19 -05:00
TradeSwitchButton.h feat(jui): add merchant screen 2026-03-29 15:52:19 -05:00