Commit graph

305 commits

Author SHA1 Message Date
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
Tropical c606302808 fix: dl dep is gone 2026-03-10 18:09:03 -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
Some checks are pending
Build Linux Release / build-linux (push) Waiting to run
Build Linux Release / build-linux-debug (push) Waiting to run
fix: remove unused console-only asset archive imports
2026-03-10 14:31:36 -06:00
Tropical 12ede0691a fix: remove unused console-only asset archive imports 2026-03-10 15:22:37 -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
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
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
Sally Knight 716fa4fc21 fix: pass ESC keypress to screen (#161) 2026-03-10 16:49:50 +03: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
Some checks are pending
Build Linux Release / build-linux (push) Waiting to run
2026-03-10 02:29:05 -05: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 db7a5f9519 feat: restore unused java GUI
Co-Authored-By: ffqq <36998498+realffqq@users.noreply.github.com>
2026-03-09 22:29:32 -05:00
Nikita Edel 6be6aadf0e another delete operator missmatch 2026-03-10 02:27:16 +01:00
Nikita Edel 021c2809f4 purged -Wdelete-non-abstract-non-virtual-dtor 2026-03-10 02:13:56 +01:00
Tropical e4868446bd chore: add comments for 4jcraft-added functionality, undo #135 2026-03-09 19:46:54 -05:00
Nikita Edel 2ae8ac3b80
fix typos in comment 2026-03-09 23:15:34 +01:00
Nikita Edel 66b31669c3 new batch of delete operator missmatch 2026-03-09 22:48:36 +01:00
Nikita Edel 5265eef759 first patch of UB 2026-03-09 21:54:43 +01:00
MathiewMay 3f1c95418f removed the turnOnLightLayer on handRenderer so that it renders correctly (similar to how chunk renderer had to be disbaled for proper rednering)
Add nullptr check before calling redner on itemInHandRenderre to prevent a occasional seg fault.
2026-03-09 13:25:56 -04:00
Emily e13c573ecc disable vsync and force maxFps to zero 2026-03-09 13:03:23 -04:00
JuiceyDev 6753364573
Merge pull request #128 from 4jcraft/fix/remove-vibecode
fix: remove LLM-generated socket initialization fix
2026-03-09 16:13:36 +01:00
Tropical 66b10b8226 fix: remove vibecoded socket initialization fix 2026-03-09 09:52:47 -05:00
sewn bf5f416ba5
fix: support backtrace only on glibc systems
execinfo is glibc only, and prevents compiling on
other systems.
2026-03-09 15:12:39 +03:00
Sally Knight 63bed1be5d fix: remove hardcoded interpolation
fixes the game feeling like low fps
2026-03-09 14:12:02 +04:00
DecalOverdose a73e6e145f
Merge pull request #107 from 4jcraft/refactor/untangle-assets-mess
refactor: untangle assets from source
2026-03-09 11:10:27 +04:00
Tropical c1d9413968 feat: render HUD 2026-03-09 02:04:02 -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
Tropical 4d543dd59d fix: use Common/Media/MediaLinux.arc for mediapath 2026-03-09 00:34:28 -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 dec2f8d8d0 fix: hopefully get assets building 2026-03-09 00:22:02 -05:00
Tropical ad1e8369bc refactor: move Common to Platform/Common 2026-03-09 00:17:42 -05:00
Tropical 10920d7be7 refactor: move unused assets in Client to .Assets/_unused 2026-03-08 23:56:50 -05:00
Tropical 49672a019f refactor: move anything in Build that isn't strictly source into Assets 2026-03-08 23:54:30 -05:00
Tropical 1308333c86 refactor: move redist64 and x64 into Minecraft.Assets
These are
2026-03-08 23:46:15 -05:00
lotaviods d1c602c2d7 fix: Camera movement and player hand 2026-03-09 00:53:44 -03:00
Tropical 54dab7708d refactor: rename Build -> Platform in Minecraft.World 2026-03-08 21:33:18 -05:00