Commit Graph
100 Commits
Author SHA1 Message Date
Tropical e437a5f4be fix build 2026-03-29 23:35:51 -05:00
Tropical e4c0a3a35b fix: assets loading and text input issues 2026-03-29 23:24:37 -05:00
Tropical 0644d9bcde fix: use correct 4jlibs branch 2026-03-29 23:18:26 -05:00
Tropical c5d50c4066 fix: PathHelper include path 2026-03-29 23:13:15 -05:00
Tropical 2c72e3de6d Merge pull request #350 from 4jcraft/fix/revert-ci
revert CI
2026-03-29 23:02:43 -05:00
Tropical b5b9b66307 add libglm dependency again 2026-03-29 23:00:46 -05:00
Tropical e7af3b42bb Merge pull request #344 from MatthewBeshay/feat/text-input-support
Feat/text input support
2026-03-29 23:00:18 -05:00
Tropical 4ee9175501 don't use apt-install github action 2026-03-29 22:59:23 -05:00
Tropical 2ce1b0b261 add libglm-dev 2026-03-29 22:56:53 -05:00
Tropical cf1d3436f1 remove env field 2026-03-29 22:56:05 -05:00
Tropical 1128e602fd overcomplicating it 2026-03-29 22:51:54 -05:00
Tropical a5b66ec462 revert CI 2026-03-29 22:46:00 -05:00
Tropical ee5ec1b872 Merge pull request #320 from 4jcraft/func/bttr-cwd
CWD Deprecation, Better Media searching (sound, fonts, textures).
2026-03-29 21:17:44 -05:00
Tropical bfbbf64592 THAT IS SO ANNOYING WHY NIX 2026-03-29 21:06:57 -05:00
Tropical 4b8ebbb824 what if i 2026-03-29 21:02:24 -05:00
Tropical 94a67d41b6 inline that 2026-03-29 20:55:59 -05:00
Tropical 21092cb686 fix: stub IggyValueGetTypeRS 2026-03-29 20:55:59 -05:00
Tropical d6394de900 fix: get rid of redundant option check 2026-03-29 20:55:58 -05:00
Tropical 19d0af460e fix: remove gl2 option 2026-03-29 20:55:58 -05:00
Tropical b963a61caf refactor: use combo option for renderer selection 2026-03-29 20:55:58 -05:00
Tropical 73a74f4872 chore: clean up LevelRenderer diffs 2026-03-29 20:55:58 -05:00
Tropical 35d92fe504 docs: add FIXME for clipChunk translation 2026-03-29 20:55:57 -05:00
Tropical 485edf0679 clean up the diff further 2026-03-29 20:55:57 -05:00
Tropical fc6e4e32b1 undo further LevelRenderer changes 2026-03-29 20:55:57 -05:00
Tropical fb745767f2 undo changes to Camera.cpp 2026-03-29 20:55:57 -05:00
Tropical 69e9db9edc chore: undo some comments 2026-03-29 20:55:57 -05:00
Tropical c60a71581d revert ItemRenderer changes 2026-03-29 20:55:57 -05:00
Tropical fa24812582 revert some seemingly unneeded changes 2026-03-29 20:55:57 -05:00
Tropical 23af1b0a72 revert unintentional turnOnGui 2026-03-29 20:55:57 -05:00
Tropical a4db31ee64 add back ItemRenderer comment 2026-03-29 20:55:57 -05:00
Tropical dbd7ce40cd fix: don't GL_NORMALIZE/GL_RESCALE_NORMAL when rendering items 2026-03-29 20:55:57 -05:00
Tropical ca601c8205 restore original code for renderGuiItem 2026-03-29 20:55:57 -05:00
Tropical 98c8d49eaf fix: make hit outline width 1 pixel 2026-03-29 20:55:56 -05:00
Tropical b7ac84ca79 fix: revert changes to lighting direction 2026-03-29 20:55:56 -05:00
Tropical 7d7116b6ec Merge pull request #338 from Merc6/ci/cleanup-github-actions
Ci/cleanup GitHub actions
2026-03-29 20:53:33 -05:00
Tropical 9d40fceece cache clang-format installation 2026-03-29 20:51:08 -05:00
Tropical 7b5c2dfe25 use fetch-depth 0 for format workflow 2026-03-29 20:43:14 -05:00
Tropical 0e9c1403bf hate you ubuntu 2026-03-29 20:36:42 -05:00
Tropical 6010fa1848 test 2026-03-29 20:35:03 -05:00
Tropical dcebd64557 rename to format check 2026-03-29 20:07:16 -05:00
Tropical 327addddae yaml and its consequences for the human race 2026-03-29 20:06:38 -05:00
Tropical 39ebddbafc update format workflow 2026-03-29 20:04:19 -05:00
Tropical 43908b1de5 Update clang-format.yml 2026-03-29 19:54:51 -05:00
Tropical 357b6ce6bc Merge branch 'ci/cleanup-github-actions' of https://github.com/Merc6/4jcraft into pr/338 2026-03-29 19:54:05 -05:00
Tropical aafc823c75 fix: --print-build-logs 2026-03-29 19:52:44 -05:00
Tropical ec2a2b8d13 guhhhhhh 2026-03-29 19:16:51 -05:00
Tropical 23452bf129 guh 4 2026-03-29 19:15:53 -05:00
Tropical 80ca9142ef guh 3 2026-03-29 19:14:35 -05:00
Tropical d669174ecd guh 2 2026-03-29 19:11:32 -05:00
Tropical ceea5c356c guh 1 2026-03-29 19:09:50 -05:00
Tropical 8c6c17677d Merge pull request #334 from Merc6/refactor/remove-PolygonArray
refactor: optimize `Block` rendering
2026-03-29 18:45:06 -05:00
Tropical 1e5a43cdc0 Merge pull request #313 from realffqq/feat/new-java-gui
feat: modernize java gui (make it era equivalent)
2026-03-29 16:16:18 -05:00
Tropical a856a7e54e fix: rebase issue with CreativeInventoryScreen 2026-03-29 16:12:30 -05:00
Tropical 3653b7b465 fix: readjust VideoSettingsScreen ITEM_COUNT 2026-03-29 15:53:10 -05:00
Tropical 238b001910 fix: remove remaining iggy checkmarks for pano 2026-03-29 15:53:10 -05:00
Tropical ad67f4be71 refactor: configure classic panorama at compile-time 2026-03-29 15:53:10 -05:00
Tropical 0e56f2c660 fix: regression in tile bounding box clip 2026-03-29 14:55:36 -05:00
Tropical dcc937da5e Merge pull request #337 from 4jcraft/fix/entity-aabb
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
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
Tropical eb7bb6e518 Merge pull request #330 from 4jcraft/meson-options-cleanup
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
Fix nix flake build phase errors
2026-03-28 05:04:14 -05: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
Tropical 8cbdb636aa Merge pull request #329 from Merc6/refactor/remove-aabb-tls
Refactor/remove aabb tls
2026-03-28 04:23:21 -05:00
Tropical 939310be64 refactor: rework meson options, fix ENABLE_VSYNC 2026-03-28 02:13:27 -05:00
Tropical da7cbcb4b6 Merge pull request #326 from realffqq/dev
fix: add null check to renderItemInHand
2026-03-27 19:49:37 -05: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 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
Tropical d2f127349b Merge pull request #319 from Merc6/refactor/rewrite-nix-flake
refactor: rewrite `flake.nix`
2026-03-27 13:20:35 -05:00
Tropical c18e86944f Merge pull request #311 from Merc6/refactor/remove-BasicTypeContainers
refactor: remove basic type containers
2026-03-25 19:36:36 -05:00
Tropical cbca0280b4 rust brainrot 2026-03-25 19:21:36 -05:00
Tropical b598aa9232 fix: only use InterlockedCompareExchangeRelease64 on LP64 systems 2026-03-25 19:20:18 -05:00
Tropical caf7128d58 refactor: remove Sleep from winapi_stubs 2026-03-25 19:14:53 -05:00
Tropical d9f03fdddf refactor: replace 0ms sleep with a proper yield 2026-03-25 19:13:12 -05:00
Tropical 8e94b763a7 refactor: remove usage of win32 Sleep function for this_thread::sleep_for 2026-03-25 19:12:11 -05:00
Tropical 06a4096cf6 fix: properly assign new pool to m_tlsPool 2026-03-25 18:43:10 -05:00
Tropical 9fec342554 remove TlsAlloc, TlsFree, TlsGetValue, TlsSetValue 2026-03-25 16:32:06 -05:00
Tropical 7b18641f70 chore: clean up unused code from Linux_Minecraft.cpp 2026-03-25 16:24:45 -05:00
Tropical 7c6c6d3df7 refactor: replace winapi TLS functions in Vec3 and AABB 2026-03-25 16:22:02 -05:00
Tropical aff677a995 chore: fmt 2026-03-25 16:08:00 -05:00
Tropical 73392fa06a fix: use correct name for default Compression thread storage 2026-03-25 16:02:26 -05:00
Tropical 22671562ca fix: add back public visibility specifier for Entity 2026-03-25 16:00:13 -05:00
Tropical 29c0185553 fix: remove PistonBaseTile::tlsIdx 2026-03-25 15:56:08 -05:00
Tropical e5414bf871 refactor: remove unneeded TlsKey typedefs 2026-03-25 15:55:37 -05:00
Tropical 28816876a1 chore: remove unneeded pthread includes 2026-03-25 15:52:37 -05:00
Tropical 30170b8f9c adjust naming scheme of private TLS members 2026-03-25 14:46:16 -05:00
Tropical 9ff2fb4fef refactor: switch to thread_local in Chunk, PistonBaseTile, TheEndPortalTile, Compression 2026-03-25 14:41:08 -05:00
Tropical 4a1fb94600 refactor: convert Tile::tlsIdxShape to thread_local 2026-03-25 14:20:08 -05:00
Tropical 625ce97385 refactor: use thread_local in OldChunkStorage, FireworksRecipe, Level, Entity 2026-03-25 14:13:00 -05:00
Tropical 03f62dcb9e refactor: FireworksRecipe thread-local storage 2026-03-25 12:59:15 -05:00
Tropical a82d76ca46 refactor: Tesselator thread-local storage 2026-03-25 12:43:41 -05:00
Tropical ed726d291a fix: properly bind minecart texture
happened because of a bad merge
2026-03-24 23:17:47 -05:00
Tropical 8d1c7c9f74 fix: "properly" merge Vita strings into Windows64 strings.lang 2026-03-24 22:43:11 -05:00
Tropical fe5b66fca6 clean up more assets 2026-03-24 19:48:15 -05:00
Tropical 237eae2573 add back SoundEngine impls from merge 2026-03-24 19:17:00 -05:00