Commit graph

40 commits

Author SHA1 Message Date
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 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
Tropical 9748827f72
Merge pull request #257 from TheComputerGuy96/fix/iggy-check
Some checks are pending
Publish Documentation / build (push) Waiting to run
Publish Documentation / deploy (push) Blocked by required conditions
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
Minecraft::run_middle: Don't use non-Iggy codepath on Iggy
2026-03-15 23:50:14 -05:00
Echo J. 32affed49d Minecraft::run_middle: Don't use non-Iggy codepath on Iggy 2026-03-16 04:18:16 +00:00
lotaviods 6ad898877d fix: add dynamic window resize support 2026-03-16 01:11:29 -03:00
Tropical ec87b5c424 chore: add back emergencySave 2026-03-15 16:35:57 -05:00
Tropical 61a3afcca3 fix: re-enable automatic LoadTrial when iggy is disabled, fmt 2026-03-15 16:32:33 -05:00
notmatthewbeshay 6a49f3a83e Fix broken renderDebug block in run_middle 2026-03-15 00:55:48 +11: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
Tropical e8424f2000 chore: format Minecraft.Client 2026-03-13 17:10:10 -05:00
Tropical f4d8815285
Merge pull request #209 from Acemany/fix-file-delimeter
fix File class' delimeter and homepath detection
2026-03-13 13:36:17 -05:00
notmatthewbeshay 0249bfd2bf Fix Linux build warnings 2026-03-14 04:37:55 +11: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
lotaviods 66fb0f1a96 feat: Implement creative inventory 2026-03-13 03:22:42 -03:00
Acemany 3cbd496186
Fix File class' delimeter and homepath detection
meow :3
deleted Minecraft::OS enum because we have #ifdef
mrrrp
changed save directory name to not mess with minecraft java
2026-03-13 06:10:44 +03:00
notmatthewbeshay a503336887 Merge upstream/dev into issue/51-phase-1-portable-win32-cleanup 2026-03-11 16:02:48 +11:00
notmatthewbeshay 4460bca43f Use standard types in minecraft state 2026-03-11 15:38:51 +11:00
Tropical cf3defee35 Merge branch 'dev' into feat/restore-java-gui 2026-03-10 21:02:58 -05:00
Tropical ca9ac8e7f7 fix: hotbarSlot is zero-indexed, move max hotbar slots into a constant
Some checks are pending
Build (Linux, x86_64) / build-linux (push) Waiting to run
Build (Linux, x86_64) / build-linux-debug (push) Waiting to run
2026-03-10 20:18:03 -05:00
Tropical 28018e5022 refactor: die FPS flamegraph 2026-03-10 20:11:35 -05:00
Tropical 304c591512 fix: hotbarSlot bounds check 2026-03-10 20:08:54 -05:00
Tropical 9752dec5e7 fix: remove juicey's visionary offhand implementation 2026-03-10 20:08:01 -05:00
JuiceyDev c2728cd2d9 SDL scroll wheel w/ hotbar & numbr support !!!!!! 2026-03-11 01:52:27 +01:00
Sally Knight 716fa4fc21 fix: pass ESC keypress to screen (#161) 2026-03-10 16:49:50 +03:00
Tropical fc2a548f3e refactor: get rid of the FPS flamegraph 2026-03-09 23:57:48 -05: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 5a36950239 fix: shuffle around remaining paths to get everything building again/home/tropical/Documents/GitHub/4jcraft-real/Minecraft.World/Level/../../Minecraft.Client/Textures/Packs/TexturePack.h 2026-03-09 00:34:09 -05:00
Tropical ad1e8369bc refactor: move Common to Platform/Common 2026-03-09 00:17:42 -05:00
Tropical 54dab7708d refactor: rename Build -> Platform in Minecraft.World 2026-03-08 21:33:18 -05:00
Tropical 66248339e5 refactor: unglob std::dynamic_pointer_cast 2026-03-08 22:44:00 +01:00
Tropical cff2fc5f44 refactor: unglob std::wstring 2026-03-08 22:43:43 +01:00
Tropical 8812c3967b refactor: unglob std::shared_ptr 2026-03-08 22:43:43 +01:00
lotaviods 6d16d53114 chore: Perf graph looks cool i guess 2026-03-07 12:54:22 -03:00
JuiceyDev 417ea73050 painful update 2026-03-06 18:31:46 +01:00
JuiceyDev e7dfce35d4 feat: enhance Linux rendering support and clean up unused UI code 2026-03-05 13:31:12 +01:00
ella love 2383fcee6e feat: move script & folder refactor 2026-03-05 03:29:23 -05:00
Tropical 5fe4d56b98 refactor: all backslash includes must die 2026-03-02 16:36:59 -06:00
ThePixelMoon 1a0dd4bd06 Initial dump 2026-03-01 15:49:25 +02:00