Commit graph

1331 commits

Author SHA1 Message Date
Mohamed Ashraf e1a20497e8 i'm stupid
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-25 10:05:03 +04:00
Mohamed Ashraf ac1fea0720 it compile 2026-03-25 10:00:01 +04:00
Mohamed Ashraf 8855266638 Not to mention most commit messages are just things like "skjdfhaufhafalkfjdashf". 2026-03-25 09:51:43 +04:00
Mohamed Ashraf 2f53275462 ficks directx maht
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
Clang Format / clang-format (push) Waiting to run
2026-03-25 09:32:20 +04:00
Mohamed Ashraf 1408a56ddc wawawawawawawa
forgot to enabel some stuff
2026-03-25 09:28:39 +04:00
Mohamed Ashraf b04b2d70fc redoing everything 2026-03-25 09:14:52 +04:00
DecalOverdose c90d9e11ef
Merge pull request #299 from 4jcraft/tu19-take-2
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
take two: merge TU19 changes (december 2014)
2026-03-25 08:35:09 +04:00
Tropical ed726d291a fix: properly bind minecart texture
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
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
Tropical d4af59cf77 Merge branch 'dev' into tu19-take-2 2026-03-24 19:12:19 -05:00
Tropical 0b2f5f8faf refactor(assets): move Xbox-specific strings back to XboxMedia 2026-03-24 17:58:46 -05:00
Sally Knight 5972c01ed4 fix: use original gui tile rendering (again) for proper lighting
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
Clang Format / clang-format (push) Waiting to run
2026-03-25 00:07:11 +03:00
Tropical e473825c76 fix: off-by-one in enchantment buttons 2026-03-24 15:45:59 -05:00
Tropical 69530dcccf Merge branch 'tu19-take-2' of https://github.com/4jcraft/4jcraft into tu19-take-2 2026-03-24 15:27:58 -05:00
Tropical 74252cc8d2 fix: slotId parsing in enchantment menu 2026-03-24 15:26:05 -05:00
Sally Knight d6070001d0 fix(jui): re-enable screen reinitialization on resize 2026-03-24 22:38:54 +03:00
Tropical ca533de1c3 Merge branch 'tu19-take-2' of https://github.com/4jcraft/4jcraft into tu19-take-2 2026-03-24 14:27:14 -05:00
Tropical a29b6ad45d refactor: cleanup UTF-16 digit parsing functionality 2026-03-24 14:27:07 -05:00
Sally Knight cd1b063ccd fix(jui): use icons.png from 1.6.4 2026-03-24 21:23:42 +03:00
Sally Knight a604a5e803 fix: lock Gui.cpp HUD back behind java gui 2026-03-24 17:52:14 +03:00
Sally Knight 5806fea864 TU19: merge UI/Gui 2026-03-24 17:33:13 +03:00
Tropical 1fcd456c30 fix iggy skin selector (again)
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
Clang Format / clang-format (push) Waiting to run
2026-03-24 00:55:24 -05:00
Sally Knight ba406c7e97 fix(jui): add null check for items to renderSlot()
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
Clang Format / clang-format (push) Waiting to run
2026-03-24 07:08:37 +03:00
Sally Knight fafaad1974 fix(jui): forward port (w)string overloads for item hover texts from TU18 2026-03-24 07:08:14 +03:00
Sally Knight 98b9cf6147 fix(jui): cast the tileEntity in openTextEdit() as a sign 2026-03-24 07:01:17 +03:00
Sally Knight 135b403af1 set default gui scale to large 2026-03-24 07:00:42 +03:00
Sally Knight f6e151265c fix(jui): mouse unlocking while in a screen 2026-03-24 07:00:21 +03:00
Sally Knight 3310481ca3 fix(jui): use the same iggy scalings for java UI 2026-03-24 06:59:49 +03:00
Sally Knight 032e56a47a fix(jui): add missing screen assignment to setScreen() 2026-03-24 06:53:14 +03:00
Sally Knight e972d8095d fix(jui): use ResourceLocation for TN_GUI_GUI and TN_GUI_ICONS 2026-03-24 06:48:07 +03:00
Sally Knight e779ab9554 fix: re-add java .lang 2026-03-24 06:39:56 +03:00
Tropical 63a059c06d fix: use correct path for fall damage sound 2026-03-23 16:58:18 -05:00
JuiceyDev 587d685c5b faster texture loading 2026-03-23 22:31:03 +01:00
MatthewBeshay fdb2a1098b fix: restore block lightmap sampling 2026-03-24 08:21:19 +11:00
Tropical f5c5df3680 fix: update movies1080 swf file list in Minecraft.Assets
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
Clang Format / clang-format (push) Waiting to run
fixes missing TU19 assets
2026-03-23 14:01:23 -05:00
Tropical 1f32cfb206 fix(hack): temporarily restore tutorial world functionality using old GameRuleManager logic 2026-03-23 13:33:09 -05:00
Tropical 7e27377d46 fix: incorrect HtmlString formatting for colored text 2026-03-23 13:23:58 -05:00
Sally Knight 98eea45bb7 fix: restore entity lighting, use tesselated clouds for night-time lighting 2026-03-23 20:33:55 +03:00
ffqq 52b553e85b
Merge pull request #302 from ViniciusCruzMoura/singleplayer_menu
Some checks failed
Publish Documentation / build (push) Has been cancelled
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
SelectWorldScreen: open Select World instead of Create New World for JAVA_GUIS
2026-03-23 14:37:24 +03:00
ffqq b7b339f9b2
Merge pull request #303 from silverhadch/nix-input
Fix Nix Package
2026-03-23 14:35:11 +03:00
Hadi Chokr 447c8e2571 Fix Nix Package 2026-03-23 10:22:24 +01:00
Tropical 8094590e8d fix some bad sound paths
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
Clang Format / clang-format (push) Waiting to run
2026-03-23 04:08:13 -05:00
Tropical ae15b32a0c Merge branch 'tu19-take-2' of https://github.com/4jcraft/4jcraft into tu19-take-2 2026-03-23 03:45:51 -05:00
Tropical 4d1e34dab0 Merge branch 'dev' into tu19-take-2 2026-03-23 03:45:22 -05:00
MatthewBeshay cc24fc996a fix: clean up sanitizer startup issues 2026-03-23 19:34:58 +11:00
MatthewBeshay fed9cf2d95 fix: resolve all build warnings and notes 2026-03-23 18:53:18 +11:00
Tropical 7a35d1caa2 fix: run Minecraft::init from the main thread only
this was an orbis-specific hack seemingly that developed into a datarace after merging TU19 causing clang to segfault on startup
2026-03-23 01:58:58 -05:00
ViniciusCruzMoura 94cabbe01b fix(SelectWorldScreen): open Select World instead of Create New World
i restored the Select World scene so it no longer immediately opens
"Create New World"

i wrapped the not used code in if (0) so its ignored at runtime
but still compiled to catch build breaks. fixing the Select World scene
also fixed the Cancel button so you can go back to the previous scene
(before it was stuck on Create New World)

i didnt remove the weird code because i dont know why its there
left it disabled for now

Signed-off-by: ViniciusCruzMoura <contato.cruz.moura@gmail.com>
2026-03-23 02:03:38 -04:00