Commit Graph

23 Commits

Author SHA1 Message Date
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
Nikita Edel
6cfc1efec2 Merge branch '4jcraft:dev' into fix-with-ubsan 2026-03-12 14:40:02 +01:00
Sally Knight
4b8d65d5e6 fix: use original disabled transforms to fix hotbar block lighting 2026-03-12 03:50:34 +03: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
notmatthewbeshay
a503336887 Merge upstream/dev into issue/51-phase-1-portable-win32-cleanup 2026-03-11 16:02:48 +11:00
notmatthewbeshay
1bf50e2549 Use fixed-width language IDs in sign rendering 2026-03-11 15:38:52 +11:00
Nikita Edel
f9fc430c43 Merge branch '4jcraft:dev' into dev 2026-03-10 19:34:42 +01:00
Tropical
e4868446bd chore: add comments for 4jcraft-added functionality, undo #135 2026-03-09 19:46:54 -05:00
Nikita Edel
66b31669c3 new batch of delete operator missmatch 2026-03-09 22:48:36 +01:00
Tropical
4be19958ea Merge branch 'dev' into refactor/untangle-assets-mess 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
Tropical
ed551d8658 refactor: unglob std::dynamic_pointer_cast 2026-03-06 22:13:29 -06:00
Tropical
bc7d4ff1d8 refactor: byebye using namespace std
shoo
2026-03-06 12:16:41 -06:00
Tropical
7c95bfc0bd refactor: begin unglobbing std::vector 2026-03-06 11:58:11 -06: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
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
ella love
2383fcee6e feat: move script & folder refactor 2026-03-05 03:29:23 -05:00