backups/4jcraft
2
0
Fork 0
mirror of https://github.com/4jcraft/4jcraft.git synced 2026-06-06 18:13:02 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
1216 commits 11 branches 1 tag 1.7 GiB
Commit graph

392 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 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 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
notmatthewbeshay 380471d0bf Stop Linux SAL macros from breaking C++26 CI 2026-03-16 22:26:27 +11:00
notmatthewbeshay a560826bad Fix the remaining C++26 build warnings 2026-03-16 22:17:17 +11:00
notmatthewbeshay 591dd48cf6 Upgrade the project default to C++26 2026-03-16 18:18:52 +11:00
lotaviods 6ad898877d fix: add dynamic window resize support 2026-03-16 01:11:29 -03:00
Sally Knight f03fb262bf fix: always run postInit() 
Resolves the segfault when iggy is disabled
 2026-03-16 01:37:51 +03:00
Tropical 61a3afcca3 fix: re-enable automatic LoadTrial when iggy is disabled, fmt 2026-03-15 16:32:33 -05:00
Tropical e076d76684 fix: provide fallback implementations of iggy GDraw functions 2026-03-15 16:19:27 -05:00
Tropical 731e7e05c9 fix: use Linux iggy headers in iggy_stubs 2026-03-15 16:16:46 -05:00
Tropical d1ac89c6ca fix: use iggy_stubs. if iggy is disbaled 2026-03-15 16:15:16 -05:00
Tropical 1bad0a3048 Merge branch 'dev' into feat/iggy-dev 2026-03-15 15:30:59 -05:00
notmatthewbeshay 4866a895dc Rename misleading DWORD-style count parameters 2026-03-16 05:30:42 +11:00
notmatthewbeshay 506964f2b4 Remove WinAPI byte allocation in common app 2026-03-16 04:52:17 +11:00
notmatthewbeshay 3a98ff640c Remove WinAPI primitives from common app helpers 2026-03-16 04:49:34 +11:00
notmatthewbeshay a0202d55c9 Remove WinAPI control types from DLC storage APIs 2026-03-16 04:46:00 +11:00
notmatthewbeshay 0605748543 Remove WinAPI primitive types from storage helpers 2026-03-16 04:40:39 +11:00
notmatthewbeshay 719b89c7b5 Remove WinAPI byte types from 4J.Storage 2026-03-16 04:34:28 +11:00
notmatthewbeshay 73a8cf8f8e Remove WinAPI primitive types from 4J.Profile 2026-03-16 04:27:49 +11:00
Tropical 97caf8ec9d
Merge pull request #247 from MatthewBeshay/fix/linux-dlc-install-callback 
Fix Linux DLC install callback flow on feat/iggy-dev
 2026-03-15 12:15:19 -05:00
notmatthewbeshay fc2db1b1fe Fix Linux DLC install callback flow on feat/iggy-dev 2026-03-16 04:07:34 +11:00
Tropical 649bc00fe4 feat: allow disabling iggy from meson.options 2026-03-15 00:59:21 -05:00
Tropical 7bef36fb2e Merge branch 'dev' into feat/iggy-dev 2026-03-15 00:49:59 -05:00
Tropical 7dacd17e62 refactor: use uint8_t for m_rotateTick in XUI skin preview 2026-03-15 00:44:43 -05:00
Tropical 1928c8b662 chore: fmt, remove subprojects 2026-03-14 22:46:47 -05:00
Tropical ab0ad12521 feat: use shiggy 2026-03-14 22:40:31 -05:00
Sally Knight d6f5d2e28d fix(gui): resolve transparency, lighting, and culling issues in item rendering 
tile lighting is only really fully fixed in the hotbar at the moment, still looks weird everywhere else
 2026-03-15 04:59:55 +03:00
Tropical e45d3cb587
Merge pull request #236 from MatthewBeshay/fix/linux-iggy-ui-gl-state
Some checks are pending
Build (Linux, x86_64) / build-linux (push) Waiting to run
Details
Build (Linux, x86_64) / build-linux-debug (push) Waiting to run
Details
Clang Format / clang-format (push) Waiting to run
Details 
Restore Linux fixed-function GL state after Iggy UI
 2026-03-14 15:05:12 -05:00
notmatthewbeshay be3d53f101 Trim Linux Iggy GL reset from tropicaaal and ffqq feedback 2026-03-15 06:52:46 +11:00
notmatthewbeshay 307212f4cd Restore Linux fixed-function GL state after Iggy UI 2026-03-15 05:42:14 +11:00
Tropical 89e87d874b
Merge pull request #234 from MatthewBeshay/fix/linux-iggy-customdraw-matrix 
Fix Linux Iggy custom draw matrix layout
 2026-03-14 11:44:19 -05:00
notmatthewbeshay 646fb2ef30 Fix Linux Iggy custom draw matrix layout 2026-03-15 03:36:32 +11:00
notmatthewbeshay d2a14a4957 Drop ComboBox primitive cleanup from XUI ABI surface 2026-03-15 01:48:08 +11:00
notmatthewbeshay b0a39d7a3a Clear GDraw ID buffer before Linux intro UI 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
notmatthewbeshay 16ae05769d Merge upstream/dev into issue/64-remove-winapi-primitives 2026-03-14 19:20:09 +11: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 b8759847a6 move LinuxGL.h to Platform/Linux 2026-03-13 17:15:44 -05:00
Tropical e8424f2000 chore: format Minecraft.Client 2026-03-13 17:10:10 -05:00
notmatthewbeshay 60790a86af Remove WinAPI types from console utility helpers 2026-03-14 07:32:45 +11:00
notmatthewbeshay ce4cb8ea70 Remove WinAPI locals from XUI scenes 2026-03-14 07:30:04 +11:00
notmatthewbeshay b6d3c0c6ee Use integer locator sizes in XUI scenes 2026-03-14 07:27:39 +11:00
notmatthewbeshay eb524ae9b8 Remove WinAPI object pointers from XUI scenes 2026-03-14 07:25:18 +11:00
notmatthewbeshay a76d416473 Remove WinAPI booleans from XUI scene helpers 2026-03-14 07:23:16 +11:00
notmatthewbeshay 20cd01a66d Remove WinAPI timer types from XUI scene base 2026-03-14 07:19:32 +11:00
notmatthewbeshay 4cc0bd5e25 Remove WinAPI helper types from XUI controls 2026-03-14 07:17:22 +11:00
notmatthewbeshay 7b39869e38 Remove WinAPI counts from XUI menu locals 2026-03-14 07:08:46 +11:00
notmatthewbeshay e45dfbeee6 Remove WinAPI booleans from XUI scene locals 2026-03-14 07:06:48 +11:00
notmatthewbeshay ad82b86701 Remove WinAPI state types from XUI controls 2026-03-14 07:04:09 +11:00
notmatthewbeshay 99d63ce7ec Remove WinAPI small-id types from XUI player flows 2026-03-14 07:02:16 +11:00
notmatthewbeshay 1e789f55a5 Remove WinAPI index types from XUI skin select 2026-03-14 07:00:17 +11:00
notmatthewbeshay 3e25aa58e5 Remove WinAPI types from XUI teleport 2026-03-14 06:58:33 +11:00
notmatthewbeshay 3e7a72c9d3 Remove remaining primitive locals from system helpers 2026-03-14 06:54:39 +11:00
notmatthewbeshay a2ddb7c2f0 Remove WinAPI ints from network and save helpers 2026-03-14 06:52:03 +11:00
notmatthewbeshay 9abfbb0c67 Remove WinAPI types from common telemetry helpers 2026-03-14 06:46:51 +11:00
notmatthewbeshay ff592ca6a1 Remove WinAPI types from tutorial helpers 2026-03-14 06:44:08 +11:00
notmatthewbeshay 6e2f40f581 Remove LPVOID from Sony commerce callbacks 2026-03-14 06:41:42 +11:00
notmatthewbeshay d3ce6b3334 Remove LPVOID from Sony remote storage callbacks 2026-03-14 06:38:11 +11: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
Echo J. 3ffb6413e2 UIStructs: Explicitly initialize all members of LaunchMoreOptions struct
Some checks are pending
Build (Linux, x86_64) / build-linux (push) Waiting to run
Details
Build (Linux, x86_64) / build-linux-debug (push) Waiting to run
Details 
Fixes a "Texture Pack Not Present" message when trying to create a world
 2026-03-13 12:36:29 -05:00
Tropical b5882df411 refactor: less hacky hack 2026-03-13 12:34:51 -05: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 253fce563f fix: accidentally declared static in the implementation 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 49721095f6 fix: const-correctness, remove manual UTF16 conversion 2026-03-13 12:34:28 -05:00
Tropical 996c731d77 fix: type alias IggyUTF16 to char16_t to fix cast issues 2026-03-13 12:34:28 -05:00
niansa db5cb0afc0 Remove explicit casts when passing strings to Iggy 2026-03-13 12:34:28 -05:00
niansa b11da90cbb Added string conversion for Iggy everywhere where needed 2026-03-13 12:34:28 -05:00
niansa 2b88d096d6 Fixed more inconsistencies around win64 macro and iggy 2026-03-13 12:34:28 -05:00
Tropical 00a5fba311 fix: comment IggyGDrawMallocAnnotated 
prevents a symbol redefinition linker error
 2026-03-13 12:34:28 -05:00
Tropical 6a88c43d94 fix: comment out duplicated symbols for the time-being 2026-03-13 12:34:28 -05:00
JuiceyDev 6fd48242ae GDraw_glfw trans ition to GDraw_sdl :) (#188) 
Co-authored-by: Tropical <42101043+tropicaaal@users.noreply.github.com>
 2026-03-13 12:34:28 -05:00
niansa/tuxifan 5c5f533cdd Add Linux version of Iggy [Please Squash into feat branch] (#182) 
* Added Linux version of Iggy

* Expose audio functionality

* Reimplemented IggyAudioOutParamExtendedInformation more carefully

* Link to .o files directly

* Allow required SWF files to be loaded on Linux

* Some other misc ifdef WINDOWS64 fixes

* Another ifdef windows64 fix
 2026-03-13 12:34:27 -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 00d65b8487 Address remaining review feedback on buffer reads 2026-03-13 20:11:00 +11:00
lotaviods 66fb0f1a96 feat: Implement creative inventory 2026-03-13 03:22:42 -03:00
Tropical 8f10806f70 Merge branch 'dev' into feat/restore-java-gui
Some checks are pending
Build (Linux, x86_64) / build-linux (push) Waiting to run
Details
Build (Linux, x86_64) / build-linux-debug (push) Waiting to run
Details
2026-03-13 01:02:17 -05:00
notmatthewbeshay bcc765f3e7 Merge remote-tracking branch 'upstream/dev' into issue/51-phase-1-portable-win32-cleanup 
# Conflicts:
#	Minecraft.Client/Platform/Common/DLC/DLCManager.cpp
#	Minecraft.Client/Rendering/Tesselator.cpp
 2026-03-13 15:16:43 +11:00
notmatthewbeshay e3d910c6a1 Merge remote-tracking branch 'origin/issue/51-phase-1-portable-win32-cleanup' into issue/51-phase-1-portable-win32-cleanup 2026-03-13 15:12:53 +11:00
notmatthewbeshay 85208b12b7 Keep network player limit as an int constant 2026-03-13 15:12:25 +11:00
Nikita Edel 99c763e68a typo 2026-03-12 17:34:17 +01:00
Nikita Edel ee33f0663f Merge branch '4jcraft:dev' into fix-with-ubsan 2026-03-12 17:17:38 +01:00
Nikita Edel 6d952e24f5 revising everything 2026-03-12 16:42:36 +01:00
Tropical ae84186d3a chore: remove #pragma warning directives 
These are only recognized by MSVC and will throw *additional* warnings on other compilers.
 2026-03-11 16:49:12 -05:00
Tropical 0577d994f3 Merge branch 'dev' into feat/restore-java-gui
Some checks are pending
Build (Linux, x86_64) / build-linux (push) Waiting to run
Details
Build (Linux, x86_64) / build-linux-debug (push) Waiting to run
Details
2026-03-11 15:21:48 -05:00
Nikita Edel faa4a989ce new blob 2026-03-11 18:49:36 +01:00
Nikita Edel 69a8ce84b9 giant batch BOOOOM 2026-03-11 17:28:13 +01:00
Nikita Edel a24f9f5a5e better rounding and s int overflow 2026-03-11 14:21:04 +01:00
Nikita Edel 5aef20e37e fixed rounding, mb 2026-03-11 14:13:32 +01:00
Nikita Edel 8395277c0c shift of signed int, s int overflow 2026-03-11 13:36:44 +01:00
Nikita Edel 63e4b9b18a next little patch of ub, unallocated variable, s int overflow 2026-03-11 13:36:44 +01:00
Nikita Edel 11aa08aece
Merge branch '4jcraft:dev' into fix-with-ubsan 2026-03-11 11:57:46 +01:00
MatthewBeshay 42508c8399
Merge branch '4jcraft:dev' into issue/51-phase-1-portable-win32-cleanup 2026-03-11 18:27:03 +11:00