Commit graph

18 commits

Author SHA1 Message Date
Sally Knight b947bc5c6c fix: incorrect conditionals 2026-03-16 18:16:21 +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
Tropical 61a3afcca3 fix: re-enable automatic LoadTrial when iggy is disabled, fmt 2026-03-15 16:32:33 -05:00
Tropical 7bef36fb2e Merge branch 'dev' into feat/iggy-dev 2026-03-15 00:49:59 -05:00
Tropical f66b293e33 Merge branch 'dev' into feat/iggy-dev 2026-03-14 03:25:09 -05:00
Tropical 2d0450e578 fix: remove all linux-specific hacks for iggy
breaks title sequence, some menu rendering. need to do root-cause analysis to find out why
2026-03-14 02:47:00 -05:00
notmatthewbeshay 8a66847c65 Remove UINT from common resource ID arrays 2026-03-14 06:33:33 +11:00
notmatthewbeshay 0249bfd2bf Fix Linux build warnings 2026-03-14 04:37:55 +11:00
Tropical 669e75701b fix: hack around DLC loading to get ingame 2026-03-13 12:34:51 -05:00
Tropical f4445fd709 Revert "refactor: get rid of tutorial level autoload"
This reverts commit 3c066dcff8.
2026-03-13 12:34:29 -05:00
Tropical e3ce583f11 refactor: get rid of tutorial level autoload 2026-03-13 12:34:28 -05:00
Tropical 3a44eab5c0 fix: UB due to assuming wchar_t is utf16 2026-03-13 12:34:28 -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
notmatthewbeshay bd5b092357 Remove Win32 local state from common UI helpers 2026-03-11 15:38:46 +11:00
notmatthewbeshay 9daa8f9c1a Remove Win32 callback types from common UI scenes 2026-03-11 15:38:44 +11:00
Tropical db7a5f9519 feat: restore unused java GUI
Co-Authored-By: ffqq <36998498+realffqq@users.noreply.github.com>
2026-03-09 22:29:32 -05:00
Tropical ad1e8369bc refactor: move Common to Platform/Common 2026-03-09 00:17:42 -05:00
Renamed from Common/UI/UIScene_MainMenu.cpp (Browse further)