Commit Graph

1149 Commits

Author SHA1 Message Date
Liriosha
a73bdbdd13 Fix conflicts 2026-03-20 12:22:53 -04:00
Liriosha
bd463d7a7e Increase audio quality by pulling audio from Java Edition 1.13 2026-03-20 12:20:10 -04:00
Liriosha
d54e365d1a Add suggested changes 2026-03-20 11:59:37 -04:00
ffqq
2ed79e298a Merge pull request #294 from MatthewBeshay/cleanup/delete-in-tree-4jlibs
Delete in-tree 4J libraries after extraction
2026-03-20 17:31:51 +03:00
JuiceyDev
d11c70a37a Merge pull request #295 from Project516/patch-2
build-doxygen.yml needs write permissions
2026-03-20 15:26:50 +01:00
project516
d8c846ba58 build-doxygen.yml needs write permissions 2026-03-20 08:46:33 -05:00
MatthewBeshay
e0f4194bfb Delete in-tree 4J libraries after extraction 2026-03-21 00:38:32 +11:00
ffqq
d901d24982 Merge pull request #293 from MatthewBeshay/feat/extract-4jlibs
Feat/extract 4jlibs
2026-03-20 16:26:41 +03:00
MatthewBeshay
fab917db19 Drop redundant 4jlibs smoke include path 2026-03-21 00:11:19 +11:00
MatthewBeshay
6c4306258b Consume 4jlibs via wrap fallback 2026-03-20 11:32:15 +11:00
MatthewBeshay
1845c64ad4 Decouple 4J libs for extraction to 4jlibs 2026-03-20 11:08:45 +11:00
Liriosha
eb66f5a705 please 2026-03-19 16:43:49 -04:00
Liriosha
bb0694af2b therewasanattempttwice 2026-03-19 16:34:27 -04:00
Liriosha
860853505e therewasanattempt 2026-03-19 16:31:46 -04:00
Liriosha
be37a40a1a Fix meson version 2026-03-19 16:24:49 -04:00
Liriosha
901f7f9cb1 Add miniaudio and stb as dependencies 2026-03-19 16:15:20 -04:00
Liriosha
c63491ab81 Merge branch '4jcraft:dev' into dev 2026-03-19 17:14:46 +00:00
Tropical
f0b898b75d Merge pull request #291 from realffqq/dev
Java GUI tune-up (+ pause fix for iggy)
2026-03-19 11:41:31 -05:00
Liriosha
5007466c80 Format Minecraft.Client/MinecraftServer.cpp (to make clang-format actually run correctly 2026-03-19 12:19:56 -04:00
Sally Knight
405202dad2 fix(gitignore): only include .wrap files in /subprojects 2026-03-19 19:16:02 +03:00
Liriosha
49799e8cca Delete shiggy subproject folder 2026-03-19 12:12:36 -04:00
Liriosha
c4897f46e1 clang-format 2026-03-19 12:08:12 -04: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
Liriosha
339f8e898f Add minecraft icon :3 2026-03-19 09:55:42 -04:00
Liriosha
4b4cda41f4 Make 'assigning field to itself' shut up 2026-03-19 09:55:10 -04: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
Liriosha
9c0c4f5c81 fmt manually 2026-03-19 03:37:43 -04:00
Liriosha
bc8b98223b clang-format 2026-03-19 03:31:12 -04:00
Liriosha
ba75b39c3f Rewrite, format, fix shiggy bug 2026-03-19 03:21:19 -04:00
Liriosha
191634264f Shrink miniaudio.h and stb_vorbis.h 2026-03-18 22:31:24 -04:00
Sally Knight
28ea3ab8cc feat(achievements): replace placeholder icons with actual game items 2026-03-19 04:17:31 +03:00
Sally Knight
b60c6e779d i18n: add localization for console-specific achievements 2026-03-19 04:07:46 +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
Liriosha
efdc5deb88 Merge branch 'feat/unbinka' into dev
Merge new audio features from unbinka
2026-03-18 19:56:02 -04:00
Liriosha
898375b51e Merge branch '4jcraft:dev' into dev 2026-03-18 23:50:06 +00:00
Liriosha
456ddff37e Add basic sound support 2026-03-18 19:47:05 -04: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
Liriosha
f39aa2af90 chore : fmt 2026-03-18 12:12:44 -04:00
Hadi Chokr
c8efdf6a6b Fix Nix Package by adding shiggy as an Input. 2026-03-18 16:02:43 +01:00