Commit graph

48 commits

Author SHA1 Message Date
Tropical c9b90cae2c chore: format everything 2026-03-30 02:17:54 -05:00
Tropical ecc15c6148 refactor: bring 4jlibs back in-tree 2026-03-30 02:04:44 -05:00
MatthewBeshay e0f4194bfb Delete in-tree 4J libraries after extraction 2026-03-21 00:38:32 +11:00
MatthewBeshay 1845c64ad4 Decouple 4J libs for extraction to 4jlibs 2026-03-20 11:08:45 +11:00
Sally Knight 97172039dd Merge branch 'dev' into feat/restore-java-gui 2026-03-16 16:04:30 +03:00
Tropical 1bad0a3048 Merge branch 'dev' into feat/iggy-dev 2026-03-15 15:30:59 -05:00
Tropical c19b31ddff feat: parity between Z/X and Escape/Return 2026-03-15 15:00:07 -05:00
notmatthewbeshay 24e10876ff Remove WinAPI primitive aliases from 4J.Input 2026-03-16 04:36:30 +11:00
Tropical 84b0767c62 Merge branch 'dev' into feat/iggy-dev
Some checks failed
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
2026-03-15 11:03:56 -05:00
WildBirdDog27 489205eabf menu controlls added 2026-03-15 01:41:59 -04:00
WildBirdDog27 d1c1f8c769 clang correction 2026-03-15 01:08:03 -04:00
WildBirdDog27 675195bcd5 fixed formatting 2026-03-14 23:35:36 -04:00
WildBirdDog27 050131c761 fixed formatting 2026-03-14 23:34:27 -04:00
WildBirdDog27 8c81fe3244 added controller support 2026-03-14 23:12:20 -04:00
Tropical f66b293e33 Merge branch 'dev' into feat/iggy-dev 2026-03-14 03:25:09 -05:00
Tropical 6318734652 chore: format 4JLibs 2026-03-13 17:11:59 -05:00
Tropical bbf8d2f06b fix: map ZXCV to ABXY (go play celeste)
celeste
2026-03-13 12:34:28 -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
Tropical 0577d994f3 Merge branch 'dev' into feat/restore-java-gui
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-11 15:21:48 -05:00
MatthewBeshay 42508c8399
Merge branch '4jcraft:dev' into issue/51-phase-1-portable-win32-cleanup 2026-03-11 18:27:03 +11:00
notmatthewbeshay a503336887 Merge upstream/dev into issue/51-phase-1-portable-win32-cleanup 2026-03-11 16:02:48 +11:00
notmatthewbeshay f7e6b02835 Use standard callback types in 4J input headers 2026-03-11 15:38:47 +11:00
notmatthewbeshay d285f41969 Use standard types in keyboard request APIs 2026-03-11 15:38:47 +11:00
Tropical c774e1eb18 feat(input): add sprint keys 2026-03-10 22:42:14 -05:00
Tropical 8ae9e62be3 feat: reimplement absolute mouse input on SDL 2026-03-10 21:14:19 -05: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 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
JuiceyDev 1c67f134b2 added files from pr 2026-03-10 09:18:20 +01:00
Tropical 3f8f7795f9 fix: display a blank screen while the world loads 2026-03-10 00:57:06 -05:00
Tropical c4ce9b5377 refactor: use InputManager for screens, DPI-aware InputManager 2026-03-09 23:41:56 -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 4be19958ea Merge branch 'dev' into refactor/untangle-assets-mess
Some checks failed
Build Linux Release / build-linux (push) Has been cancelled
2026-03-09 01:20:45 -05:00
JuiceyDev cbac41b152
Merge pull request #111 from lotaviods/camera_mov
fix: Camera movement and player hand
2026-03-09 07:15:03 +01:00
Tropical dd46307e4a Merge branch 'dev' into refactor/untangle-assets-mess 2026-03-09 00:38:30 -05:00
Tropical ad1e8369bc refactor: move Common to Platform/Common 2026-03-09 00:17:42 -05:00
lotaviods d1c602c2d7 fix: Camera movement and player hand 2026-03-09 00:53:44 -03:00
Danielcodedev da2cbecde9
Fix input W - S
Now W Is forward and S is Backward
2026-03-08 21:23:17 -06:00
JuiceyDev 417ea73050 painful update 2026-03-06 18:31:46 +01:00
Tropical 29346e056c chore: nuke CMake and visual studio solutions
bye
2026-03-06 02:01:20 -06:00
JuiceyDev b04a2369b6 meson basic intergration 2026-03-06 01:59:57 +01:00
JuiceyDev 65a9c99215 YES PLEASE 2026-03-06 00:01:26 +01:00
JuiceyDev fa9d517227 fdkgsekgdqsgf 2026-03-05 23:37:27 +01:00
JuiceyDev 771f2dde0c fix: update 4J lib include paths for folder refactor 2026-03-05 10:55:13 +01:00
JuiceyDev ca0363b07b implement input, profile, render, and storage management functionalities 2026-03-05 10:48:23 +01:00
JuiceyDev 3379b2ab6a fix: update include paths and add Linux compatibility for various files 2026-03-05 10:48:23 +01:00
JuiceyDev 4160a8c78e add 4JLib from Pyogenics:4jlibs 2026-03-05 10:44:11 +01:00