Commit Graph

71 Commits

Author SHA1 Message Date
Tropical
d4af59cf77 Merge branch 'dev' into tu19-take-2 2026-03-24 19:12:19 -05:00
Sally Knight
a604a5e803 fix: lock Gui.cpp HUD back behind java gui 2026-03-24 17:52:14 +03:00
Sally Knight
5806fea864 TU19: merge UI/Gui 2026-03-24 17:33:13 +03:00
Sally Knight
ba406c7e97 fix(jui): add null check for items to renderSlot() 2026-03-24 07:08:37 +03:00
Sally Knight
e972d8095d fix(jui): use ResourceLocation for TN_GUI_GUI and TN_GUI_ICONS 2026-03-24 06:48:07 +03:00
Tropical
4d1e34dab0 Merge branch 'dev' into tu19-take-2 2026-03-23 03:45:22 -05:00
ViniciusCruzMoura
94cabbe01b fix(SelectWorldScreen): open Select World instead of Create New World
i restored the Select World scene so it no longer immediately opens
"Create New World"

i wrapped the not used code in if (0) so its ignored at runtime
but still compiled to catch build breaks. fixing the Select World scene
also fixed the Cancel button so you can go back to the previous scene
(before it was stuck on Create New World)

i didnt remove the weird code because i dont know why its there
left it disabled for now

Signed-off-by: ViniciusCruzMoura <contato.cruz.moura@gmail.com>
2026-03-23 02:03:38 -04:00
Tropical
59243889ad fix a bunch of undefined refs 2026-03-22 15:27:46 -05:00
Tropical
3b77d6d806 update NetworkPlayerXbox, SimpleContainer fixes 2026-03-22 12:50:01 -05:00
Tropical
b9d18bf641 TU19: merge Minecraft.Client/Platform/Common/UI 2026-03-22 11:44:26 -05:00
Tropical
1c5311f058 fixes to java UI and Minecraft.cpp 2026-03-22 04:14:58 -05:00
Tropical
03355211ca more fixes 2026-03-22 03:13:45 -05:00
Tropical
ad5e8dd012 getting further 2026-03-22 02:52:30 -05:00
Tropical
6e09aa7600 add BossMobGuiInfo to UI 2026-03-21 22:58:00 -05:00
Vinícius Moura
7775c59e3c Merge branch '4jcraft:dev' into java_exit_btn_behaviour 2026-03-21 16:25:07 -04:00
ViniciusCruzMoura
cbfdef7ba5 fix(TitleScreen): handle Exit Game properly with ENABLE_JAVA_GUIS
i noticed the main menu had the same problem as #277 and applied
the same fix
tested with java gui and shiggy, both close correctly now

Signed-off-by: ViniciusCruzMoura <contato.cruz.moura@gmail.com>
2026-03-21 16:23:48 -04:00
Sally Knight
7f39d575a4 fix(jui): ensure serverside unpausing in all scenarios 2026-03-21 03:05:42 +03:00
Sally Knight
d968855cc4 fix(jui): correctly check if host or not for disconnect text 2026-03-19 18:57:19 +03:00
Sally Knight
e6585a6732 i18n(jui): localize disconnect button text 2026-03-19 18:56:24 +03:00
Sally Knight
009b17ef1b fix(gui): working pauses on iggy 2026-03-19 18:49:14 +03:00
Sally Knight
32fee4334d fix(jui): call eXuiServerAction_PauseServer to pause server-side too 2026-03-19 15:41:55 +03:00
Sally Knight
0fbbac1cde feat(jui): add world leaving
You will now be able to leave the world from all places where you'd usually be able to (Pause screen, death screen)
Should be identical to the way it's done on Iggy/XUI
2026-03-19 15:05:32 +03:00
Sally Knight
6d50ac4771 feat(jui): add dirt background rendering to selectworldscreen 2026-03-19 14:57:06 +03:00
Sally Knight
55bc1e17b7 fix(jui): remove tick method from MessageScreen 2026-03-19 14:52:56 +03:00
Sally Knight
7c3ba79f83 feat(jui): (re-)add transitional screens
Adds a new MessageScreen class to display custom messages and restores areas where ReceivingLevelScreen was used
2026-03-19 03:37:39 +03:00
Sally Knight
221c6ccad1 fix: re-enable death screen on java gui
was removed accidentally
2026-03-18 22:24:12 +03:00
ffqq
f46e8b3941 Merge pull request #155 from 4jcraft/feat/restore-java-gui
feat: restore unused java GUI
2026-03-16 18:36:17 +03:00
Sally Knight
97172039dd Merge branch 'dev' into feat/restore-java-gui 2026-03-16 16:04:30 +03:00
notmatthewbeshay
591dd48cf6 Upgrade the project default to C++26 2026-03-16 18:18:52 +11:00
Tropical
0835dcb768 Merge pull request #244 from jerryjhird/staging
added brightness and FOV sliders to graphics settings
2026-03-15 15:30:14 -05:00
jerryjhird
0c5a300b1c added brightness and FOV sliders to grahpic settings as well as changed weird text in PauseScreen
(also adds sliding logic to sliders so you can drag them with your mouse)
2026-03-15 19:54:35 +00:00
Sally Knight
fae7ebe7fa feat(jui): new multiline container item tooltips
Backported from Java Edition 1.3.x
This replaces the old non-functional tooltips
2026-03-15 18:29:09 +03:00
Tropical
1928c8b662 chore: fmt, remove subprojects 2026-03-14 22:46:47 -05:00
Tropical
f66b293e33 Merge branch 'dev' into feat/iggy-dev 2026-03-14 03:25:09 -05:00
Tropical
e8424f2000 chore: format Minecraft.Client 2026-03-13 17:10:10 -05:00
Sally Knight
04b76893ca feat: re-enable boss health bar 2026-03-13 20:53:41 +03:00
Tropical
b63f4171d7 chore: set RENDER_HUD to 0 for now 2026-03-13 12:34:27 -05:00
Tropical
177ed6d176 Merge pull request #215 from 4jcraft/dev
just merging all of the dev branch stuff into the java gui branch
2026-03-13 12:11:37 -05:00
Leah Anderson
2fd1a136df Merge pull request #210 from lotaviods/creative_java_gui
(java gui) Implement Creative Inventory screen and container
2026-03-13 09:23:28 -06:00
Sally Knight
e4428a983a feat: backport more advanced world creation screen from 1.3.2
Main reference used was MCP 7.1
This allows players to toggle:
Gamemodes
Structure generation
Flat/normal world generation
Cheats (needs chat fully implemented to work however)
2026-03-13 16:52:34 +03:00
lotaviods
66fb0f1a96 feat: Implement creative inventory 2026-03-13 03:22:42 -03:00
Tropical
8f10806f70 Merge branch 'dev' into feat/restore-java-gui 2026-03-13 01:02:17 -05:00
notmatthewbeshay
bcc765f3e7 Merge remote-tracking branch 'upstream/dev' into issue/51-phase-1-portable-win32-cleanup
# Conflicts:
#	Minecraft.Client/Platform/Common/DLC/DLCManager.cpp
#	Minecraft.Client/Rendering/Tesselator.cpp
2026-03-13 15:16:43 +11:00
Sally Knight
8e26b471ea fix: remove unused GLFW include
was causing CI failure
2026-03-12 22:13:08 +03:00
Sally Knight
5525aac9d5 fix: reorder and correct lighting for blocks in container screens 2026-03-12 16:07:16 +03:00
Sally Knight
10a1095ab2 fix: add proper head movement to player inventory preview 2026-03-12 02:07:36 +03:00
Nikita Edel
faa4a989ce new blob 2026-03-11 18:49:36 +01:00
Tropical
9acefd2cc6 fix: hotbar selection indicator being chopped off at the bottom 2026-03-11 01:27:02 -05:00
Tropical
8ae9e62be3 feat: reimplement absolute mouse input on SDL 2026-03-10 21:14:19 -05:00
Sally Knight
716fa4fc21 fix: pass ESC keypress to screen (#161) 2026-03-10 16:49:50 +03:00