Commit graph

1826 commits

Author SHA1 Message Date
Tropical a1e4726296 TU19: merge Minecraft.World/Stats 2026-03-21 17:30:42 -05:00
ffqq 37dff30878
Merge pull request #300 from ViniciusCruzMoura/java_exit_btn_behaviour
Some checks failed
Publish Documentation / build (push) Has been cancelled
Build (Linux, x86_64) / build-linux (push) Has been cancelled
Build (Linux, x86_64) / build-linux-debug (push) Has been cancelled
Clang Format / clang-format (push) Has been cancelled
TitleScreen: Fix main menu quit button for JAVA_GUIS, (same issue as #277)
2026-03-22 01:29:07 +03:00
Tropical 3b52fd1369 TU19: add Minecraft.World/Scores 2026-03-21 17:28:02 -05:00
Tropical 75a4897381 TU19: merge Minecraft.World/Recipes 2026-03-21 17:27:44 -05:00
Tropical 19026c057b TU19: merge Minecraft.World/Player 2026-03-21 17:26:42 -05:00
Tropical fdf5b8f8b9 merge Minecraft.World.cpp 2026-03-21 17:14:48 -05:00
Tropical e7bafb17d0 missed some 2026-03-21 17:12:22 -05:00
Tropical 357fca24aa refactor: nuke __int64/__uint64 in Minecraft.World 2026-03-21 17:10:36 -05:00
Tropical 8036565022 missed these two 2026-03-21 17:08:54 -05:00
Tropical 86e08af338 TU19: merge Minecraft.World/Level 2026-03-21 17:07:51 -05:00
Tropical 29522d1ac9 TU19: merge Minecraft.World/Items 2026-03-21 16:39:12 -05:00
Tropical 3d3fa566c7 TU19: merge Minecraft.World/Entities 2026-03-21 16:29:02 -05:00
Tropical 405a87e078 TU19: merge Minecraft.World/Enchantments 2026-03-21 15:55:35 -05:00
Tropical 7d05b36f85 TU19: add Minecraft.World/Core 2026-03-21 15:54:53 -05:00
Tropical 9b6046cb83 TU19: merge Minecraft.World/Blocks 2026-03-21 15:52:50 -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
Tropical f25cd66f4d TU19: merge Minecraft.World/Containers
keeping virtual destructors where possible
2026-03-21 15:18:52 -05:00
Tropical db0a6b2e6a TU19: merge Minecraft.World/Commands 2026-03-21 15:14:17 -05:00
Tropical 36ca1d912e TU19: merge Minecraft.World/Headers 2026-03-21 15:13:02 -05:00
Tropical 7973172ae8 TU19: merge Minecraft.World/AI 2026-03-21 15:10:07 -05:00
Tropical 4cdea50a5a
Merge pull request #290 from Liriosha/dev
Miniaudio Integration
2026-03-21 15:03:31 -05:00
Tropical 4c30ef1e62
Merge pull request #297 from realffqq/dev
Some checks are pending
Publish Documentation / build (push) Waiting to run
Build (Linux, x86_64) / build-linux (push) Waiting to run
Build (Linux, x86_64) / build-linux-debug (push) Waiting to run
Clang Format / clang-format (push) Waiting to run
(java ui) remap creative inventory to C and ensure serverside unpausing in all scenarios
2026-03-20 19:19:47 -05:00
ffqq 9e38b20366
Merge pull request #296 from Project516/patch-3
Add link to the online documentation in README.md
2026-03-21 03:10:22 +03:00
Sally Knight 7f39d575a4 fix(jui): ensure serverside unpausing in all scenarios 2026-03-21 03:05:42 +03:00
Sally Knight 24512f44ad feat(jui): remap creative inventory to C
This will allow players to open their survival inventory in Creative mode on the java UI
2026-03-21 03:02:11 +03:00
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
project516 9e09a1da48
Add link to the online documentation in README.md
You must deploy the gh-pages branch to GitHub pages for it to be deployed
2026-03-20 10:23:04 -05:00
ffqq 2ed79e298a
Merge pull request #294 from MatthewBeshay/cleanup/delete-in-tree-4jlibs
Some checks are pending
Publish Documentation / build (push) Waiting to run
Build (Linux, x86_64) / build-linux (push) Waiting to run
Build (Linux, x86_64) / build-linux-debug (push) Waiting to run
Clang Format / clang-format (push) Waiting to run
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
Some checks are pending
Publish Documentation / build (push) Waiting to run
Build (Linux, x86_64) / build-linux (push) Waiting to run
Build (Linux, x86_64) / build-linux-debug (push) Waiting to run
Clang Format / clang-format (push) Waiting to run
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