Commit Graph

1102 Commits

Author SHA1 Message Date
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
ffqq
48b7d2f3a4 Merge pull request #280 from MatthewBeshay/chore/improve-gitignore
Update .gitignore
2026-03-19 00:48:52 +03:00
MatthewBeshay
a9e0906cbe Update .gitignore to include subprojects/.wraplock
Add exception for subprojects/.wraplock in .gitignore
2026-03-19 07:07:50 +11:00
Tropical
a222e7d886 Merge pull request #266 from Project516/patch-1
fix doxygen workflow
2026-03-18 15:01:35 -05:00
ffqq
01fabdf2a3 Merge pull request #277 from ViniciusCruzMoura/exit_btn_behaviour
UIScene_MainMenu: Enable the Exit Game Button Behaviour
2026-03-18 22:59:50 +03:00
Tropical
f7d8b057f2 Merge pull request #285 from realffqq/dev
fix: re-enable death screen on java gui
2026-03-18 14:46:06 -05:00
Sally Knight
221c6ccad1 fix: re-enable death screen on java gui
was removed accidentally
2026-03-18 22:24:12 +03:00
DecalOverdose
d60344f9a2 Merge pull request #284 from silverhadch/shiggy-input
Fix Nix Package by adding shiggy as an Input.
2026-03-18 20:12:48 +04:00
Hadi Chokr
c8efdf6a6b Fix Nix Package by adding shiggy as an Input. 2026-03-18 16:02:43 +01:00
MatthewBeshay
cb6bea3f36 Update .gitignore 2026-03-18 11:24:10 +11:00
Tropical
ee96c204de Merge pull request #279 from urzuline/dev
move Discord invite below Scope & platform in the README.md
2026-03-17 19:05:12 -05:00
Emily
ed5fc93852 move Discord invite below Scope & platform in the README.md 2026-03-17 19:59:27 -04:00
ViniciusCruzMoura
4f252c8615 languages: replace 'Return to Xbox Dashboard' to 'Return to Desktop'
I just did a grep and replace, to update #277 pull request
git grep -rn "Return to Xbox Dashboard"

Signed-off-by: ViniciusCruzMoura <contato.cruz.moura@gmail.com>
2026-03-17 07:05:50 -04: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
Tropical
20a5835e48 Merge pull request #276 from WildBirdDog27/dev
4jcraft placeholder title image
2026-03-16 22:30:07 -05:00
Tropical
22d814ccaf Merge pull request #275 from swedishsplidney/tutorial-look-softlock-fix
Fix how ControllerTask checks for camera input
2026-03-16 22:29:42 -05:00
WildBirdDog27
22d2f306e3 console title image 2026-03-16 23:01:52 -04:00
WildBirdDog27
9671208e66 4jcraft title image 2026-03-16 22:11:44 -04:00
swedishsplidney
59c6cfa514 changed how the tutorial detects mouse input for the first task 2026-03-16 19:21:57 -06:00
Tropical
a904a8ebf4 Merge pull request #272 from Arcanecaster/patch-1
Update README.md
2026-03-16 19:11:59 -05:00
Arcanecaster
e29ef4bc98 Update README.md
yes
2026-03-16 23:33:01 +01:00
Tropical
f88a211c08 Merge pull request #271 from nikita-edel/fix/clang-format-workflow
fix: clang-format workflow
2026-03-16 17:05:21 -05:00
Nikita Edel
173d445104 fix clang-format workflow 2026-03-16 22:28:48 +01:00
ffqq
c76f0e4e52 Merge pull request #270 from nikita-edel/meow/asan
fix: alloc dealloc missmatch
2026-03-17 00:08:33 +03:00
Tropical
3b256041f3 Merge pull request #269 from realffqq/dev
fix(i18n): convert and correct format specifiers
2026-03-16 15:50:45 -05:00
Sally Knight
70931170fa fix(i18n): convert and correct format specifiers
Removes positional specifiers of the original Java Edition .lang and also corrects some specifiers (such as the one for key.mouseButton)
2026-03-16 23:47:52 +03:00
Nikita Edel
b43f31d3b6 alloc dealloc missmatch 2026-03-16 21:46:19 +01:00
Tropical
ef734f1ffd Merge pull request #268 from MatthewBeshay/chore/cpp26
Use C++23 as the project default
2026-03-16 14:05:18 -05:00
notmatthewbeshay
b71fd037b1 Use C++23 as the project default 2026-03-17 05:51:54 +11:00
Tropical
36f99f56ef Merge pull request #265 from realffqq/dev
fix(lighting): use gamma value from java UI options for brightness
2026-03-16 11:54:16 -05:00
project516
439a240448 update actions/checkout@v3 to v6 2026-03-16 11:46:25 -05:00
project516
5c9285d4b3 Update build-doxygen.yml
change deployment to github pages to use peaceiris/actions-gh-pages@v4 - this will create a gh-pages branch that can be deployed to pages.
2026-03-16 11:40:35 -05:00
Sally Knight
938999b707 fix(lighting): use gamma value from java UI options for brightness 2026-03-16 19:37: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
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
2e1d4bbaca build: prevent enabling both iggy and java GUIs at the same time 2026-03-16 17:46:30 +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
ecc6f0d549 fix(achievements): restore achievement popup display
Was removed by the dev merge
2026-03-16 17:25:06 +03:00
Sally Knight
6d0d4b2ed1 fix(textures): remove ENABLE_JAVA_GUIS conditionals
Fixes entities not using the correct textures when java GUI is enabled
2026-03-16 17:24:11 +03:00
Leah Anderson
5cc4a41c30 Merge pull request #262 from 4jcraft/tropicaaal-patch-1
Remove GCC version requirement from README
2026-03-16 08:08:36 -06:00
Tropical
dcf6189246 Remove GCC version requirement from README
Removed note about GCC version requirement for building.
2026-03-16 09:06:22 -05:00
Tropical
d5bdd6a608 Merge pull request #261 from Project516/patch-1
fix docker build failing
2026-03-16 09:05:45 -05:00
project516
72adc97cae Update Dockerfile
fix docker build failing
2026-03-16 08:39:28 -05:00
Sally Knight
d6ee57f3e6 fix: disable java GUI by default
as to not conflict with the iggy UI
2026-03-16 16:28:44 +03:00
MatthewBeshay
7a9565feef Merge pull request #260 from MatthewBeshay/chore/cpp26
Upgrade the project default to C++26
2026-03-17 00:13:28 +11:00
MatthewBeshay
66961260b4 Merge branch '4jcraft:dev' into chore/cpp26 2026-03-17 00:12:06 +11:00
Sally Knight
97172039dd Merge branch 'dev' into feat/restore-java-gui 2026-03-16 16:04:30 +03:00
ffqq
7ddacfb850 Merge pull request #259 from TheComputerGuy96/fix/biomesource-override
FixedBiomeSource: Make sure BiomeSource functions get overriden
2026-03-16 14:45:33 +03:00