Commit Graph

261 Commits

Author SHA1 Message Date
Tropical
547a3f3962 bad std::string replacement 2026-03-22 14:01:52 -05:00
Tropical
2005b23133 Merge branch 'tu19-take-2' of https://github.com/4jcraft/4jcraft into tu19-take-2 2026-03-22 14:00:52 -05:00
Tropical
855597d1bc exclude UIScene_InGameSaveManagementMenu, include fixes 2026-03-22 14:00:25 -05:00
Sally Knight
82d9fdffaf fix: correct even more minecraft.h includes 2026-03-22 21:59:49 +03:00
Tropical
b0feb8ae57 Merge branch 'tu19-take-2' of https://github.com/4jcraft/4jcraft into tu19-take-2 2026-03-22 13:51:03 -05:00
Tropical
c17408b34d fix includes, broken UIScene_TradingMenu method 2026-03-22 13:50:42 -05:00
Sally Knight
1c7b4c0add fix: correct Minecraft and (Multiplayer)LocalPlayer includes 2026-03-22 21:48:07 +03:00
Tropical
b9059a7607 fix remaining orbis telemetry includes on linux 2026-03-22 13:41:38 -05:00
Tropical
638e5f72e2 fix UIControl_Base, exclude sony leaderboard shit 2026-03-22 13:28:20 -05:00
Tropical
429a085daf fix UITTFFont constructor 2026-03-22 13:15:41 -05:00
Tropical
3640c97575 more strings, UIScene fixes 2026-03-22 13:14:16 -05:00
Tropical
852d3aa1b8 fix UIScene_CreateWorldMenu 2026-03-22 13:07:33 -05:00
Tropical
09f91426b3 fix UIScene_JoinMenu 2026-03-22 13:02:27 -05:00
Tropical
fb8aff30aa fix UIScene_InGameInfoMenu 2026-03-22 12:58:32 -05:00
Tropical
8ecc837cfa merge Platform/Common/DLC 2026-03-22 12:56:07 -05:00
Tropical
be76c9cdb3 fix UIScene_HUD, UIScene_InGameInfoMenu 2026-03-22 12:52:44 -05:00
Tropical
3b77d6d806 update NetworkPlayerXbox, SimpleContainer fixes 2026-03-22 12:50:01 -05:00
Tropical
4b2f614326 format XUI 2026-03-22 12:40:22 -05:00
Tropical
a403bf5a4a various iggy UI build fixes, format DLC folder 2026-03-22 12:36:33 -05:00
Tropical
cf54e2bd0b add some missing UIScenes 2026-03-22 12:19:34 -05:00
Tropical
fbd9449a31 wrong base64.cpp but whatever 2026-03-22 12:16:29 -05:00
Tropical
4eda6e89fd fix UIStructsmerge Platform/Common/Leaderboards 2026-03-22 12:13:53 -05:00
Tropical
b9d18bf641 TU19: merge Minecraft.Client/Platform/Common/UI 2026-03-22 11:44:26 -05:00
Tropical
4dd9b683bf format Platform/Common/UI 2026-03-22 04:25:54 -05:00
Tropical
90bdcd47d4 TU19: Merge Minecraft.Client/Platform/Common/Network 2026-03-22 04:21:50 -05:00
Tropical
5f22cd8093 format Platform/Common/Network 2026-03-22 04:16:54 -05:00
Tropical
58cdba39f3 TU19: merge Minecraft.Client/Platform/Common/Tutorial 2026-03-22 03:51:48 -05:00
Tropical
86c3e12e7b TU19: merge UIController and friends 2026-03-22 03:40:11 -05:00
Tropical
4486fc7ab4 format UIController 2026-03-22 03:15:07 -05:00
Tropical
d6bdbb39ae TU19: merge Minecraft.Client/Platform/Common/Audio 2026-03-22 02:31:05 -05:00
Tropical
da3d403b29 format common sound engine folder 2026-03-22 02:29:12 -05:00
Tropical
a30330f1d0 exclude unused GameMode implementations, format Platform/Common/Tutorial 2026-03-22 02:11:47 -05:00
Tropical
3fa28df4da TU19: merge Minecraft.Client/Platform/Common/GameRules 2026-03-22 01:27:23 -05:00
Tropical
87b4af678b format .Client/Common/GameRules 2026-03-22 01:15:44 -05:00
Tropical
195d82340a merge Consoles_App.h 2026-03-22 01:03:39 -05:00
Tropical
fb2faecf33 format Consoles_app 2026-03-22 00:12:31 -05:00
Tropical
330ce54cda build fixes 2026-03-22 00:10:15 -05:00
Tropical
ab2efa87e4 merge App_enums.h 2026-03-22 00:00:40 -05:00
Tropical
e444bef081 implement DebugArtToolsOn, fix strings and includes 2026-03-21 23:50:56 -05:00
Sally Knight
009b17ef1b fix(gui): working pauses on iggy 2026-03-19 18:49:14 +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
ViniciusCruzMoura
580b947c6e UIScene_MainMenu: Enable the Exit Game Button Behaviour
i noticed that the exit game button on the menu screen wasn't working,
so i went ahead and enabled it and added the behavior to close the game.
i added a Close method in the 4J_Render class and made a tweak to the _xbox check.
the catch is that it uses the xbox text for the confirmation button,
so i’m not sure if it’s the best approach, but it does work fine for me

Signed-off-by: ViniciusCruzMoura <contato.cruz.moura@gmail.com>
2026-03-17 02:08:16 -04:00
swedishsplidney
59c6cfa514 changed how the tutorial detects mouse input for the first task 2026-03-16 19:21:57 -06: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
4937b92b1e fix: still skip intro scene in java gui
so that the cursor isn't grabbed
2026-03-16 18:34:06 +03:00
Sally Knight
b947bc5c6c fix: incorrect conditionals 2026-03-16 18:16:21 +03:00
Sally Knight
c1955fd208 chore: also add Java GUI conditionals against the intro autoskip
unnecessary code that isn't used in any UI-ful case
2026-03-16 17:55:35 +03:00
Sally Knight
4c01f7b317 refactor: combine iggy and Java GUI conditionals for trial auto-start 2026-03-16 17:41:22 +03:00
Sally Knight
97172039dd Merge branch 'dev' into feat/restore-java-gui 2026-03-16 16:04:30 +03:00
notmatthewbeshay
a560826bad Fix the remaining C++26 build warnings 2026-03-16 22:17:17 +11:00