backups/4jcraft
1
0
Fork 0
mirror of https://github.com/4jcraft/4jcraft.git synced 2026-04-24 06:13:41 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
4jcraft/Minecraft.Client/UI
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
..
Screens Merge branch 'upstream-dev' into cleanup/nullptr-replacement 2026-03-30 16:28:40 +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 Merge branch 'upstream-dev' into cleanup/nullptr-replacement 2026-03-30 16:28:40 +11:00
Font.h refactor: replace NULL with nullptr across C++ codebase 2026-03-30 16:25:52 +11:00
Gui.cpp Merge branch 'upstream-dev' into cleanup/nullptr-replacement 2026-03-30 16:28:40 +11:00
Gui.h refactor: replace double-underscore MSVC integer types with stdint 2026-03-30 00:08:25 -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 Merge branch 'upstream-dev' into cleanup/nullptr-replacement 2026-03-30 16:28:40 +11: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 refactor: replace double-underscore MSVC integer types with stdint 2026-03-30 00:08:25 -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 refactor: replace NULL with nullptr across C++ codebase 2026-03-30 16:25:52 +11: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