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
Leah Anderson
2fd1a136df
Merge pull request #210 from lotaviods/creative_java_gui
...
Build (Linux, x86_64) / build-linux (push) Waiting to run
Build (Linux, x86_64) / build-linux-debug (push) Waiting to run
(java gui) Implement Creative Inventory screen and container
2026-03-13 09:23:28 -06:00
Sally Knight
e4428a983a
feat: backport more advanced world creation screen from 1.3.2
...
Main reference used was MCP 7.1
This allows players to toggle:
Gamemodes
Structure generation
Flat/normal world generation
Cheats (needs chat fully implemented to work however)
2026-03-13 16:52:34 +03:00
notmatthewbeshay
00d65b8487
Address remaining review feedback on buffer reads
2026-03-13 20:11:00 +11:00
notmatthewbeshay
883e98bde0
Address review feedback on protocol types
2026-03-13 19:47:32 +11:00
lotaviods
66fb0f1a96
feat: Implement creative inventory
2026-03-13 03:22:42 -03:00
Tropical
8f10806f70
Merge branch 'dev' into feat/restore-java-gui
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
notmatthewbeshay
e3d910c6a1
Merge remote-tracking branch 'origin/issue/51-phase-1-portable-win32-cleanup' into issue/51-phase-1-portable-win32-cleanup
2026-03-13 15:12:53 +11:00
notmatthewbeshay
85208b12b7
Keep network player limit as an int constant
2026-03-13 15:12:25 +11:00
Tropical
807af92321
Merge pull request #169 from nikita-edel/fix-with-ubsan
...
Build (Linux, x86_64) / build-linux (push) Waiting to run
Build (Linux, x86_64) / build-linux-debug (push) Waiting to run
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
Sally Knight
8e26b471ea
fix: remove unused GLFW include
...
was causing CI failure
2026-03-12 22:13:08 +03:00
Nikita Edel
99c763e68a
typo
2026-03-12 17:34:17 +01:00
Nikita Edel
ee33f0663f
Merge branch '4jcraft:dev' into fix-with-ubsan
2026-03-12 17:17:38 +01:00
Nikita Edel
6d952e24f5
revising everything
2026-03-12 16:42:36 +01:00
Leah Anderson
a386bcfbfd
Merge pull request #191 from 4jcraft/chore/remove-pragma-warning
...
Build (Linux, x86_64) / build-linux (push) Waiting to run
Build (Linux, x86_64) / build-linux-debug (push) Waiting to run
chore: remove `#pragma warning` directives
2026-03-12 08:17:48 -06:00
Nikita Edel
6cfc1efec2
Merge branch '4jcraft:dev' into fix-with-ubsan
2026-03-12 14:40:02 +01:00
Sally Knight
5525aac9d5
fix: reorder and correct lighting for blocks in container screens
2026-03-12 16:07:16 +03: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
10a1095ab2
fix: add proper head movement to player inventory preview
2026-03-12 02:07:36 +03:00
Sally Knight
3031f64401
fix: restore rainfall visibility by removing top edge transparency
2026-03-12 00:53:50 +03:00
Tropical
ae84186d3a
chore: remove #pragma warning directives
...
These are only recognized by MSVC and will throw *additional* warnings on other compilers.
2026-03-11 16:49:12 -05:00
Tropical
0577d994f3
Merge branch 'dev' into feat/restore-java-gui
Build (Linux, x86_64) / build-linux (push) Waiting to run
Build (Linux, x86_64) / build-linux-debug (push) Waiting to run
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
Nikita Edel
69a8ce84b9
giant batch BOOOOM
2026-03-11 17:28:13 +01:00
Nikita Edel
ed13020cf3
s integer overflow, unsafe cast
2026-03-11 16:10:48 +01:00
Sally Knight
798781c10a
fix: use proper pixel format for the minimap
...
fixes pink maps
2026-03-11 17:37:27 +03:00
Nikita Edel
a24f9f5a5e
better rounding and s int overflow
2026-03-11 14:21:04 +01:00
Nikita Edel
5aef20e37e
fixed rounding, mb
2026-03-11 14:13:32 +01:00
Nikita Edel
8395277c0c
shift of signed int, s int overflow
2026-03-11 13:36:44 +01:00
Nikita Edel
63e4b9b18a
next little patch of ub, unallocated variable, s int overflow
2026-03-11 13:36:44 +01:00
Nikita Edel
11aa08aece
Merge branch '4jcraft:dev' into fix-with-ubsan
2026-03-11 11:57:46 +01: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
MatthewBeshay
42508c8399
Merge branch '4jcraft:dev' into issue/51-phase-1-portable-win32-cleanup
2026-03-11 18:27:03 +11:00
notmatthewbeshay
50693bfc20
Use unique thumbnail callback thunks in UI scenes
2026-03-11 18:20:13 +11:00
JuiceyDev
8085703dbc
Merge pull request #176 from 4jcraft/feat/sprint-key
...
feat(input): add sprint keys
2026-03-11 08:11:21 +01:00
Tropical
9acefd2cc6
fix: hotbar selection indicator being chopped off at the bottom
Build (Linux, x86_64) / build-linux (push) Waiting to run
Build (Linux, x86_64) / build-linux-debug (push) Waiting to run
2026-03-11 01:27:02 -05: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
f187f89dc3
Use standard thumbnail callbacks in storage
2026-03-11 16:29:02 +11:00