backups/4jcraft
2
0
Fork 0
mirror of https://github.com/4jcraft/4jcraft.git synced 2026-06-02 12:03:34 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
1611 commits 11 branches 1 tag 1.7 GiB
Commit graph

214 commits

Author SHA1 Message Date
lotaviods 6ad898877d fix: add dynamic window resize support 2026-03-16 01:11:29 -03:00
Tropical e8424f2000 chore: format Minecraft.Client 2026-03-13 17:10:10 -05:00
notmatthewbeshay 0249bfd2bf Fix Linux build warnings 2026-03-14 04:37:55 +11: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 44ade1f2b2
Merge pull request #149 from MatthewBeshay/issue/51-phase-1-portable-win32-cleanup 
Draft: remove Win32 types from portable code
 2026-03-13 11:58:09 -05:00
Sally Knight 7fe14f92bb fix: unconditionally enable GL_ALPHA_TEST in renderLevel 
Fixes a similar issue to #200 but for the Nether
 2026-03-13 19:09:21 +03:00
Tropical 8f10806f70 Merge branch 'dev' into feat/restore-java-gui
Some checks are pending
Build (Linux, x86_64) / build-linux (push) Waiting to run
Details
Build (Linux, x86_64) / build-linux-debug (push) Waiting to run
Details
2026-03-13 01:02:17 -05:00
notmatthewbeshay bcc765f3e7 Merge remote-tracking branch 'upstream/dev' into issue/51-phase-1-portable-win32-cleanup 
# Conflicts:
#	Minecraft.Client/Platform/Common/DLC/DLCManager.cpp
#	Minecraft.Client/Rendering/Tesselator.cpp
 2026-03-13 15:16:43 +11:00
Tropical 807af92321
Merge pull request #169 from nikita-edel/fix-with-ubsan
Some checks are pending
Build (Linux, x86_64) / build-linux (push) Waiting to run
Details
Build (Linux, x86_64) / build-linux-debug (push) Waiting to run
Details 
enhancement: make LCE runnable with UBSan and fix: alot of UB
 2026-03-12 21:14:17 -05:00
Sally Knight e41abdb9da fix: make sure to enable alpha test for short/tiny view distances 2026-03-13 00:36:39 +03:00
Nikita Edel 6cfc1efec2
Merge branch '4jcraft:dev' into fix-with-ubsan 2026-03-12 14:40:02 +01:00
Sally Knight e66f279a5b Merge branch 'dev' into feat/restore-java-gui 2026-03-12 16:01:31 +03:00
Sally Knight 4b8d65d5e6 fix: use original disabled transforms to fix hotbar block lighting 2026-03-12 03:50:34 +03:00
MatthewBeshay dbdf4fdd22
Merge branch 'dev' into issue/51-phase-1-portable-win32-cleanup 2026-03-12 10:21:19 +11:00
Sally Knight 3031f64401 fix: restore rainfall visibility by removing top edge transparency 2026-03-12 00:53:50 +03: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
Details
Build (Linux, x86_64) / build-linux-debug (push) Waiting to run
Details
2026-03-11 15:21:48 -05:00
ffqq d83f10c648
fix: correct cloud day/night coloring using disabled tesselator method (#189) 2026-03-11 15:16:19 -05:00
Nikita Edel b47ee34a61
Merge branch '4jcraft:dev' into fix-with-ubsan 2026-03-11 19:25:14 +01:00
Nikita Edel ec82ee1ea1 final commit 2026-03-11 19:22:28 +01:00
Nikita Edel faa4a989ce new blob 2026-03-11 18:49:36 +01:00
Nikita Edel cc65f7ee29 FINALLY LOADS IN, crashes when clicking :( 2026-03-11 18:01:00 +01:00
Sally Knight 798781c10a fix: use proper pixel format for the minimap 
fixes pink maps
 2026-03-11 17:37:27 +03:00
MatthewBeshay a9d1322a6e
Merge branch '4jcraft:dev' into issue/51-phase-1-portable-win32-cleanup 2026-03-11 19:53:03 +11:00
Echo J. e9fe7fee4d LevelRenderer: Add missing namespace for player variable 
This caused compile errors on my GitHub Actions instance
 2026-03-11 08:18:29 +00:00
notmatthewbeshay 5f8c9c8a25 Merge upstream/dev into issue/51-phase-1-portable-win32-cleanup 2026-03-11 17:09:16 +11:00
Tropical 0c1ae27810 Merge branch 'dev' into feat/restore-java-gui 2026-03-11 00:44:30 -05:00
notmatthewbeshay a503336887 Merge upstream/dev into issue/51-phase-1-portable-win32-cleanup 2026-03-11 16:02:48 +11:00
Tropical 2c3a816e4b
Merge pull request #175 from realffqq/dev 
fix: restore and fix entity, block and hand lighting
 2026-03-10 23:59:42 -05:00
notmatthewbeshay 1bf50e2549 Use fixed-width language IDs in sign rendering 2026-03-11 15:38:52 +11:00
notmatthewbeshay 0ab0fd9209 Standardise fixed-width integer usage in touched files 2026-03-11 15:38:42 +11:00
Emily 4e286dd92c ifdef the option 3 2026-03-11 00:29:19 -04:00
Sally Knight c42f71ba22 fix: restore and fix entity, block and hand lighting 
Block and entity light layers are done differently for now due to some caveats with light map transformation
 2026-03-11 07:13:48 +03:00
Emily 0f605b8997 mrrrp (V-Sync Changes) 2026-03-11 00:09:07 -04:00
Tropical cf3defee35 Merge branch 'dev' into feat/restore-java-gui 2026-03-10 21:02:58 -05:00
Nikita Edel f9fc430c43
Merge branch '4jcraft:dev' into dev 2026-03-10 19:34:42 +01:00
MatthewBeshay 2a2558ace3
Merge branch '4jcraft:dev' into issue/51-phase-1-portable-win32-cleanup 2026-03-10 18:39:30 +11:00
Tropical 1d406debe6 Merge branch 'dev' into feat/restore-java-gui
Some checks are pending
Build Linux Release / build-linux (push) Waiting to run
Details
2026-03-10 02:29:05 -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 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
notmatthewbeshay 344921bb26 Remove DWORD from tesselator TLS storage 2026-03-10 10:14:01 +11:00
notmatthewbeshay 96a7519f5d Remove DWORD from chunk TLS storage 2026-03-10 10:14:01 +11:00
notmatthewbeshay 529ecb8185 Remove LPVOID from level renderer rebuild threads 2026-03-10 10:14:01 +11:00
notmatthewbeshay 8da27c59ad Remove LPVOID from game renderer update thread 2026-03-10 10:14:01 +11:00
Nikita Edel 66b31669c3 new batch of delete operator missmatch 2026-03-09 22:48:36 +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
Sally Knight 63bed1be5d fix: remove hardcoded interpolation 
fixes the game feeling like low fps
 2026-03-09 14:12:02 +04:00
Tropical 4be19958ea Merge branch 'dev' into refactor/untangle-assets-mess
Some checks failed
Build Linux Release / build-linux (push) Has been cancelled
Details
2026-03-09 01:20:45 -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
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
JuiceyDev f12cd2e1f2 Merge origin/dev into reapply/dev-on-upstream-202603082259 - auto-resolved conflicts preferring origin/dev 2026-03-08 23:19:14 +01:00
Tropical 66248339e5 refactor: unglob std::dynamic_pointer_cast 2026-03-08 22:44:00 +01:00
Tropical 5045acb86e fix: unglob everything else and make it build 2026-03-08 22:44:00 +01:00
Tropical a2e6957383 fix: unglob std::{min, max}, manual stuff 2026-03-08 22:43:59 +01:00
Tropical cce3b0fdfe refactor: unglob std::deque 2026-03-08 22:43:59 +01:00
Tropical 9a1e4e7752 refactor: byebye using namespace std 
shoo
 2026-03-08 22:43:44 +01:00
Tropical 6c4c3a9c94 refactor: unglob std::unordered_set 2026-03-08 22:43:43 +01:00
Tropical 5fad08b9fd refactor: begin unglobbing std::vector 2026-03-08 22:43:43 +01:00
Tropical cff2fc5f44 refactor: unglob std::wstring 2026-03-08 22:43:43 +01:00
Tropical c571014bc9 refactor: unglob std::unordered_map 2026-03-08 22:43:43 +01:00
Tropical 8812c3967b refactor: unglob std::shared_ptr 2026-03-08 22:43:43 +01:00
zukrmn 42b0352ec3 fix: resolve all remaining compilation warnings 2026-03-08 22:40:41 +01:00
Tropical 052a656673 fix: remove byte type alias 2026-03-08 22:39:40 +01:00
JuiceyDev 44251492ff im gonna ry it works im so happy 2026-03-08 21:54:27 +01:00
JuiceyDev 3657169222 fixing my mistake in w 2026-03-08 17:18:21 +01:00
JuiceyDev 3c825a244c w 2026-03-08 17:03:55 +01:00
Tropical 43a28fc490
Merge pull request #71 from 4jcraft/refactor/no-std-wildcard 
refactor: remove `using namespace std`
 2026-03-08 10:09:33 -05:00
zukrmn ca11afdfca fix: resolve all remaining compilation warnings 2026-03-07 04:43:50 +00:00
Tropical ed551d8658 refactor: unglob std::dynamic_pointer_cast 2026-03-06 22:13:29 -06:00
Tropical e0479e90b4 fix: unglob everything else and make it build 2026-03-06 21:06:31 -06:00
Tropical 04ff82ba70 fix: unglob std::{min, max}, manual stuff 2026-03-06 20:47:11 -06:00
Tropical 967ffbb2a6 refactor: unglob std::deque 2026-03-06 20:41:22 -06:00
JuiceyDev 8077e706e7 wawa the third 2026-03-07 00:20:11 +01:00
JuiceyDev 6d46ef2273 wawa 2026-03-07 00:17:56 +01:00
JuiceyDev 9dda66e0fc wa 2026-03-07 00:16:44 +01:00
JuiceyDev 0ae4ba9dc6 wawa 2026-03-07 00:14:19 +01:00
JuiceyDev a4ad9f771e wawa 2026-03-07 00:11:28 +01:00
JuiceyDev ffbb8598d4 wawa 2026-03-07 00:09:19 +01:00
JuiceyDev 8281af31b6 this will break the whole renderer pipeline 2026-03-07 00:08:03 +01:00
JuiceyDev 03f92a4dd7 wa 2026-03-07 00:05:51 +01:00
JuiceyDev 30e9149e29 wawawa 2026-03-07 00:02:06 +01:00
JuiceyDev 9dbdee6c30 hihihihihih 2026-03-06 23:58:56 +01:00
JuiceyDev 99f1dcf898 test 2026-03-06 23:50:56 +01:00
JuiceyDev 0b405ad590 cough couughhcougghhhc ougghh 2026-03-06 22:13:02 +01:00
JuiceyDev 2f8ed831fc fix: enable TRIANGLE_MODE and use correct OpenGL constants to fix invisible terrain 2026-03-06 22:10:41 +01:00
JuiceyDev 12c48a02ad fix: use standard OpenGL constants on Linux to fix invisible terrain 2026-03-06 21:43:31 +01:00
JuiceyDev 2aa0058a8d debug: disable fancy second pass to test terrain visibility 2026-03-06 21:22:05 +01:00
JuiceyDev 4ad16db139 fix: disable compact vertex format for terrain to fix invisible geometry on laptop/AMD GPUs 2026-03-06 21:01:42 +01:00
JuiceyDev a92180a713 Revert "fix: reduce max level render size to stay within laptop GPU display list limits" 
This reverts commit 2565c7193c.
 2026-03-06 21:00:10 +01:00
JuiceyDev 2565c7193c fix: reduce max level render size to stay within laptop GPU display list limits 2026-03-06 20:53:12 +01:00
JuiceyDev 3f489a4202 fixed a bunch of shit, might fix renderer ? 2026-03-06 20:09:37 +01:00
Tropical bc7d4ff1d8 refactor: byebye using namespace std 
shoo
 2026-03-06 12:16:41 -06:00
Tropical 0855e6ddf4 refactor: unglob std::unordered_set 2026-03-06 12:13:01 -06:00
Tropical 7c95bfc0bd refactor: begin unglobbing std::vector 2026-03-06 11:58:11 -06:00
JuiceyDev 58780ca7cd i fucked up 2026-03-06 18:54:29 +01:00
JuiceyDev d9184f1a99 screen size 2026-03-06 18:50:28 +01:00
Tropical cdc08700e4 refactor: unglob std::wstring 2026-03-06 11:50:22 -06:00
Tropical ecf7fc7f61 refactor: unglob std::unordered_map 2026-03-06 11:29:36 -06:00
Tropical 67ceccf2d4 refactor: unglob std::shared_ptr 2026-03-06 11:20:45 -06:00
JuiceyDev 36166bfdae added bunch of todos, modified readme 2026-03-06 17:28:35 +01:00
Tropical 15af35eef2 fix: remove byte type alias 2026-03-06 05:03:37 -06:00
JuiceyDev 17ac8deddf hhhhh 2026-03-06 07:13:57 +01:00
JuiceyDev 2f7962cbb2 woah 2026-03-06 00:19:13 +01:00
JuiceyDev 65a9c99215 YES PLEASE 2026-03-06 00:01:26 +01:00
JuiceyDev 06afba4d34
Merge branch 'dev' into dev 2026-03-05 22:33:38 +01:00
JuiceyDev 6b6fa9a6b0 find my renderers - slenderman or some shit 2026-03-05 22:28:13 +01:00
JuiceyDev ad50bf21d4 shit renderer 2026-03-05 21:31:54 +01:00
JuiceyDev a8846c9f46 larp renderer 2026-03-05 20:27:14 +01:00
Mohamed Ashraf 1ae227e9ba FIX COMPILE AND IT'S ALMOST DONE HOLY SHIT 2026-03-05 16:12:37 +04:00
JuiceyDev 70a5f01070 feat: OpenGL rendering implementation (GLFW/OpenGL 2.1 pipeline) 2026-03-05 11:18:20 +01:00
JuiceyDev 3379b2ab6a fix: update include paths and add Linux compatibility for various files 2026-03-05 10:48:23 +01:00
ella love 2383fcee6e feat: move script & folder refactor 2026-03-05 03:29:23 -05:00