Commit graph

54 commits

Author SHA1 Message Date
Tropical 8f90088611 TU19: merge Minecraft.Client/Rendering 2026-03-21 22:28:58 -05:00
Sally Knight 938999b707 fix(lighting): use gamma value from java UI options for brightness 2026-03-16 19:37:12 +03:00
Sally Knight 97172039dd Merge branch 'dev' into feat/restore-java-gui 2026-03-16 16:04:30 +03:00
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
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
Build (Linux, x86_64) / build-linux-debug (push) Waiting to run
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
Sally Knight e41abdb9da fix: make sure to enable alpha test for short/tiny view distances 2026-03-13 00:36:39 +03:00
Sally Knight e66f279a5b Merge branch 'dev' into feat/restore-java-gui 2026-03-12 16:01:31 +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
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 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
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
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
Tropical e4868446bd chore: add comments for 4jcraft-added functionality, undo #135 2026-03-09 19:46:54 -05:00
notmatthewbeshay 8da27c59ad Remove LPVOID from game renderer update thread 2026-03-10 10:14:01 +11: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 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 54dab7708d refactor: rename Build -> Platform in Minecraft.World 2026-03-08 21:33:18 -05:00
Tropical 66248339e5 refactor: unglob std::dynamic_pointer_cast 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 5fad08b9fd refactor: begin unglobbing std::vector 2026-03-08 22:43:43 +01:00
Tropical 8812c3967b refactor: unglob std::shared_ptr 2026-03-08 22:43:43 +01:00
Tropical 052a656673 fix: remove byte type alias 2026-03-08 22:39:40 +01: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 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 58780ca7cd i fucked up 2026-03-06 18:54:29 +01:00
JuiceyDev d9184f1a99 screen size 2026-03-06 18:50:28 +01:00
JuiceyDev 36166bfdae added bunch of todos, modified readme 2026-03-06 17:28:35 +01:00
JuiceyDev 65a9c99215 YES PLEASE 2026-03-06 00:01:26 +01:00