Commit graph

1826 commits

Author SHA1 Message Date
Sally Knight 08a87c432a fix: put jui-specific texture usage behind ifdefs 2026-03-29 15:50:34 -05:00
Sally Knight 65ff6a97f0 feat(jui): add horse inventory screen 2026-03-29 15:50:34 -05:00
Sally Knight 3f2c6e0012 feat(jui): add panorama and splashes to title screen
Also moved the version string to the same height as the copyright message, matching Beta 1.8+
2026-03-29 15:50:34 -05:00
Sally Knight 0728ac8731 fix(jui): tick screen even if not ingame
required for title screen panorama
2026-03-29 15:50:34 -05:00
ffqq 1d25dc9750
Merge pull request #341 from 4jcraft/fix/tile-clip
fix: regression in tile bounding box clip
2026-03-29 22:57:42 +03:00
Tropical 0e56f2c660 fix: regression in tile bounding box clip 2026-03-29 14:55:36 -05:00
orng a954f3f616 chore: remove dummy file 2026-03-28 23:01:06 -05:00
orng 09f3a33edd test: push dummy file 2026-03-28 22:59:03 -05:00
orng 3a736777fd ci: simplify clang-format 2026-03-28 22:50:45 -05:00
orng 3fc458c4bd ci: make build-linux use flake.nix 2026-03-28 22:50:30 -05:00
Tropical dcc937da5e
Merge pull request #337 from 4jcraft/fix/entity-aabb
Some checks are pending
Publish Documentation / build (push) Waiting to run
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
fix: correctly restore entity bounding boxes when computing movement physics
2026-03-28 22:35:04 -05:00
Tropical fd90607719
Merge pull request #335 from aedanmills/dev
Fixed broken exit game button again
2026-03-28 21:59:49 -05:00
aedanmills 740f1b5c64 Update 2026-03-28 22:53:15 -04:00
Tropical 2302f25e93 chore: fmt 2026-03-28 21:38:26 -05:00
Tropical ad77a955c0 fix: correctly restore entity bounding boxes when computing movement physics 2026-03-28 21:36:17 -05:00
aedanmills 75d83a4556 Fixed broken quit game button again. 2026-03-28 21:01:28 -04:00
orng 659b9c32cb fix: OOB when iterating over all cube faces 2026-03-28 13:50:35 -05:00
orng f614e661d2 refactor: remove PolygonArray 2026-03-28 13:34:20 -05:00
orng 5ba20b155c refactor: remove VertexArray 2026-03-28 12:53:07 -05:00
Tropical eb7bb6e518
Merge pull request #330 from 4jcraft/meson-options-cleanup
Some checks are pending
Publish Documentation / build (push) Waiting to run
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
refactor: rework meson options, fix ENABLE_VSYNC
2026-03-28 11:12:24 -05:00
Tropical caa512fcdb
Merge pull request #323 from milomc123/nix-build-fix
Some checks are pending
Publish Documentation / build (push) Waiting to run
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
Fix nix flake build phase errors
2026-03-28 05:04:14 -05:00
milomc123 f195fc555f fix(nix flake): Fix Nix build phase errors
- postUnpack: use $sourceRoot instead of hardcoded "source/" so subprojects are copied into the actual unpacked directory
- installPhase: call makeWrapper directly, it is a setup hook injected by nativeBuildInputs, not a bin/ binary
- nativeBuildInputs: add makeWrapper and unzip
2026-03-28 09:59:48 +00:00
Tropical 38ba5e144d
Merge pull request #331 from MatthewBeshay/fix/pr329-aabb-followup
fix: restore ghast reach checks and fire collision bounds after AABB refactor
2026-03-28 04:46:27 -05:00
MatthewBeshay c12f32f637 fix: restore ghast reach checks and fire collision bounds after AABB refactor 2026-03-28 20:43:36 +11:00
Tropical 8cbdb636aa
Merge pull request #329 from Merc6/refactor/remove-aabb-tls
Refactor/remove aabb tls
2026-03-28 04:23:21 -05:00
orng a0be2e2fb5 refactor: remove aabb tls 2026-03-28 03:05:06 -05:00
orng 7101d03c6a refactor: remove heap-allocated AABBs 2026-03-28 02:58:56 -05:00
Tropical 939310be64 refactor: rework meson options, fix ENABLE_VSYNC 2026-03-28 02:13:27 -05:00
orng e48a05bb8f refactor: remove the last AABB::newTemp 2026-03-28 00:50:56 -05:00
orng ddfe9b3d48 refactor: make Tile::getTileAABB return AABB 2026-03-28 00:30:07 -05:00
orng 7158fd398f refactor: make Tile::getAABB return optional<AABB> 2026-03-28 00:11:19 -05:00
orng 78b5255224 refactor: make AABBList own its values 2026-03-27 22:37:22 -05:00
orng d7d99db4c5 refactor: remove AABB::newTemp when not returned 2026-03-27 21:56:57 -05:00
orng 534879e2e7 refactor: replace AABB::newPermanent with new AABB 2026-03-27 21:17:55 -05:00
orng 79217ca8e3 refactor: modernize AABB class 2026-03-27 21:11:11 -05:00
Tropical da7cbcb4b6
Merge pull request #326 from realffqq/dev
Some checks are pending
Publish Documentation / build (push) Waiting to run
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
fix: add null check to renderItemInHand
2026-03-27 19:49:37 -05:00
ffqq 016a3ebfb4
Merge branch '4jcraft:dev' into dev 2026-03-28 03:48:04 +03:00
Sally Knight 40a3f90d89 fix: add null check to renderItemInHand 2026-03-28 03:47:49 +03:00
Tropical 9bed5431eb
Merge pull request #310 from 4jcraft/refactor/replace-winapi-stubs
refactor: finish up removing `Tls*` functions from linux code
2026-03-27 18:53:22 -05:00
Tropical 06c73c821c
Merge pull request #312 from 4jcraft/refactor/replace-sleep
refactor: replace win32 thread sleeping and yielding with `std::thread` primitives
2026-03-27 18:47:47 -05:00
Tropical 8b11eb7a3a
Merge branch 'dev' into refactor/replace-winapi-stubs
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-27 18:35:12 -05:00
Tropical f59085c782
Merge pull request #325 from realffqq/dev
fix(goal): add a duration to panics
2026-03-27 18:20:35 -05:00
Tropical 293590ef77
Merge branch 'dev' into dev 2026-03-27 18:20:24 -05:00
Tropical e38f162c10
Merge pull request #314 from Merc6/refactor/remove-vec3-tls
refactor: remove vec3 tls
2026-03-27 18:19:21 -05:00
Sally Knight 23ab4de9ac fix(goal): add a duration to panics 2026-03-28 02:18:23 +03:00
JuiceyDev 6be5f627ef make consoles_app use pathhelper :)
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-27 20:57:46 +01:00
JuiceyDev 21fc2166ff cleaned up, less hacky, more silly 2026-03-27 20:54:21 +01:00
Tropical d2f127349b
Merge pull request #319 from Merc6/refactor/rewrite-nix-flake
Some checks are pending
Publish Documentation / build (push) Waiting to run
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
refactor: rewrite `flake.nix`
2026-03-27 13:20:35 -05:00
ffqq 7db2fe0318
Merge pull request #318 from StevenSYS/dev
Make the Java creative inventory more complete.
2026-03-27 20:42:06 +03:00
JuiceyDev ca84ac0512 okay managed to do it, anyways hacky code land :3
mainly rewrote a bit of the soundengine, made files now load without being mean and uh yeah it works
2026-03-27 18:07:38 +01:00