Commit Graph

581 Commits

Author SHA1 Message Date
Tropical
cf3defee35 Merge branch 'dev' into feat/restore-java-gui 2026-03-10 21:02:58 -05:00
Leah Anderson
d9dbb5c39c Merge pull request #157 from 4jcraft/feat/sdl-support
Added SDL support & Remade 4j_Input
2026-03-10 19:42:49 -06:00
Tropical
ca9ac8e7f7 fix: hotbarSlot is zero-indexed, move max hotbar slots into a constant 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
Tropical
f90d9a2b0d docs: don't list meson as a build dep 2026-03-10 18:13:57 -05:00
Tropical
6c67565a0b fix: dont invoke apt-get with sudo in dockerfile 2026-03-10 18:10:45 -05:00
Tropical
c606302808 fix: dl dep is gone 2026-03-10 18:09:03 -05:00
Tropical
47db746861 no png go away shoo 2026-03-10 17:59:43 -05:00
Tropical
52ee114f24 refactor: dont depend on libpng and libdl, update docs 2026-03-10 17:57:56 -05:00
Tropical
bce996a2ef refactor: simplify and update CI pipeline 2026-03-10 17:49:34 -05:00
Tropical
197bf0033f Merge branch 'dev' into feat/sdl-support 2026-03-10 17:38:52 -05:00
Tropical
fe631bcff8 chore: undo unintentional meson changes, update README 2026-03-10 17:32:53 -05:00
Leah Anderson
4e39635f20 Merge pull request #167 from 4jcraft/fix/missing-asset-error
fix: remove unused console-only asset archive imports
2026-03-10 14:31:36 -06:00
Tropical
687d4e66a3 Merge pull request #147 from nikita-edel/dev
enhancement: make LCE runnable with ASan
2026-03-10 15:27:22 -05:00
Tropical
12ede0691a fix: remove unused console-only asset archive imports 2026-03-10 15:22:37 -05:00
Nikita Edel
cc305944e5 Merge branch '4jcraft:dev' into dev 2026-03-10 20:59:25 +01:00
Tropical
fd785ad3f2 Merge pull request #132 from TheComputerGuy96/ci-debug-job
Debug build split (and other minor CI fixups)
2026-03-10 14:58:13 -05:00
Nikita Edel
c86bfe35f3 Merge branch '4jcraft:dev' into dev 2026-03-10 20:51:42 +01:00
Nikita Edel
0ff6f767e5 formailize comments 2026-03-10 20:30:31 +01:00
Nikita Edel
da3d69b5bd final commit, removed scripts and reset meson.build 2026-03-10 20:27:11 +01:00
Nikita Edel
af16088015 improved a change 2026-03-10 20:13:01 +01:00
Tropical
750436d815 Merge pull request #165 from 4jcraft/fix/fatal-load-error
fix: implement `CConsoleMinecraftApp::FatalLoadError` on linux
2026-03-10 13:57:00 -05:00
Nikita Edel
f9fc430c43 Merge branch '4jcraft:dev' into dev 2026-03-10 19:34:42 +01:00
Tropical
d495ebf841 Merge pull request #166 from TheComputerGuy96/non-infinity
GameNetworkManager: Fix incorrect infinity value redefinition
2026-03-10 13:32:24 -05:00
Echo J.
8a8280b242 GameNetworkManager: Fix incorrect infinity value redefinition
WaitForSingleObject() uses the maximum 32-bit value for specifying infinite timeout (while INFINITY might overflow that sized value back to 0) which caused the server wait event to not actually wait when compiled with Clang (and the game to be forever stuck on a black screen due to abnormal server state)
2026-03-10 20:00:07 +02:00
Tropical
5406648692 fix: implement CConsoleMinecraftApp::FatalLoadError on linux 2026-03-10 11:16:42 -05:00
JuiceyDev
69c3e61ca3 Merge branch 'dev' into feat/sdl-support 2026-03-10 17:03:17 +01:00
JuiceyDev
ae00c4719f Merge pull request #164 from realffqq/feat/restore-java-gui
(feat/restore-java-gui) fix: pass ESC keypress to screen
2026-03-10 15:28:25 +01:00
Sally Knight
716fa4fc21 fix: pass ESC keypress to screen (#161) 2026-03-10 16:49:50 +03:00
JuiceyDev
712c3f1f47 better ci 2026-03-10 10:41:56 +01:00
JuiceyDev
56245448d3 Merge pull request #160 from vekidev/patch-1
the biggest pr of them all
2026-03-10 10:37:46 +01:00
vekidev
45c90ef358 the biggest commit of them all
its the biggest one what can i tell you
2026-03-10 10:27:24 +01:00
JuiceyDev
71f542a860 added back build-linux workflow 2026-03-10 09:43:30 +01:00
JuiceyDev
1c67f134b2 added files from pr 2026-03-10 09:18:20 +01:00
Tropical
1d406debe6 Merge branch 'dev' into feat/restore-java-gui 2026-03-10 02:29:05 -05:00
JuiceyDev
2464d27749 Merge pull request #152 from 4jcraft/chore/4jcraft-comments
chore: add comments indicating 4jcraft modifications, update contribution guidelines, undo #135
2026-03-10 07:15:38 +01:00
Tropical
3f8f7795f9 fix: display a blank screen while the world loads 2026-03-10 00:57:06 -05:00
Tropical
fc2a548f3e refactor: get rid of the FPS flamegraph 2026-03-09 23:57:48 -05:00
Tropical
c4ce9b5377 refactor: use InputManager for screens, DPI-aware InputManager 2026-03-09 23:41:56 -05:00
Tropical
f0aa04a7ee fix: compute logical mouse position using window scale factor
Fixes mouse support in menus on systems with scaling factors other than 1.0x
2026-03-09 23:07:42 -05:00
Tropical
0a286d4ddc refactor: modify ClientConstants::VERSION_STRING to list 4jcraft
Co-Authored-By: ffqq <36998498+realffqq@users.noreply.github.com>
2026-03-09 22:47:16 -05:00
Tropical
48f31b3e8f feat: default to true for enable_java_guis
Co-Authored-By: ffqq <36998498+realffqq@users.noreply.github.com>
2026-03-09 22:30:57 -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
10009abcc5 docs: clarify comment policy 2026-03-09 20:35:02 -05:00
Nikita Edel
6be6aadf0e another delete operator missmatch 2026-03-10 02:27:16 +01:00
Tropical
d6b8d665df docs: add actionable contribution guidelines 2026-03-09 20:23:04 -05:00
Nikita Edel
021c2809f4 purged -Wdelete-non-abstract-non-virtual-dtor 2026-03-10 02:13:56 +01:00