Commit graph

1504 commits

Author SHA1 Message Date
Tropical 3fa28df4da TU19: merge Minecraft.Client/Platform/Common/GameRules 2026-03-22 01:27:23 -05:00
Tropical 87b4af678b format .Client/Common/GameRules 2026-03-22 01:15:44 -05:00
Tropical 6c92bc0be8 more build fixes 2026-03-22 01:14:52 -05:00
Tropical 195d82340a merge Consoles_App.h 2026-03-22 01:03:39 -05:00
Tropical fb2faecf33 format Consoles_app 2026-03-22 00:12:31 -05:00
Tropical 330ce54cda build fixes 2026-03-22 00:10:15 -05:00
Tropical ab2efa87e4 merge App_enums.h 2026-03-22 00:00:40 -05:00
Tropical e444bef081 implement DebugArtToolsOn, fix strings and includes 2026-03-21 23:50:56 -05:00
Tropical d230a1e4e4 add temp missing strings 2026-03-21 23:37:46 -05:00
Tropical fa4eb9cdf9 fix missing include and Minecraft.h errors 2026-03-21 23:33:30 -05:00
Tropical 371c734719 merge toplevel Minecraft.Client folders 2026-03-21 23:21:19 -05:00
Tropical 6e09aa7600 add BossMobGuiInfo to UI 2026-03-21 22:58:00 -05:00
Tropical 362a43ddee TU19: merge Minecraft.Client/Textures 2026-03-21 22:46:45 -05:00
Tropical 8f90088611 TU19: merge Minecraft.Client/Rendering 2026-03-21 22:28:58 -05:00
Tropical a493e42532 TU19: merge Minecraft.Client/Player 2026-03-21 22:03:18 -05:00
Tropical 3f143811e3 TU19: merge Minecraft.Client/Network 2026-03-21 21:54:07 -05:00
Tropical 92fbafe432 ahhhhhhh 2026-03-21 21:13:21 -05:00
Tropical 2e9cdf773b Merge branch 'tu19-take-2' of https://github.com/4jcraft/4jcraft into tu19-take-2 2026-03-21 20:50:37 -05:00
MatthewBeshay 91b13bccee TU19: fix build fallout across Client, World, NBT and Network 2026-03-22 12:45:21 +11:00
Tropical b319cb3cea TU19: merge Minecraft.Client/Level 2026-03-21 20:29:13 -05:00
Tropical 1c12bedc86 TU19: merge Minecraft.Client/GameState 2026-03-21 20:25:32 -05:00
Tropical d9aa793075 build fixes 2026-03-21 19:19:31 -05:00
Tropical 401a19ad67 fix bad std::string replacements 2026-03-21 18:52:06 -05:00
Tropical 8df2c2bb47 TU19: update NBT library 2026-03-21 18:43:44 -05:00
MatthewBeshay 993617025b TU19: merge Minecraft.World/IO 2026-03-22 10:13:01 +11:00
Tropical 11a0440998 TU19: merge Minecraft.World/Network 2026-03-21 18:09:02 -05:00
Tropical 0f280b5ed3 TU19: merge Minecraft.World/WorldGen 2026-03-21 17:45:10 -05:00
Tropical eb23fc1a83 TU19: merge Minecraft.World/Util 2026-03-21 17:37:16 -05:00
Tropical a1e4726296 TU19: merge Minecraft.World/Stats 2026-03-21 17:30:42 -05:00
ffqq 37dff30878
Merge pull request #300 from ViniciusCruzMoura/java_exit_btn_behaviour
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
TitleScreen: Fix main menu quit button for JAVA_GUIS, (same issue as #277)
2026-03-22 01:29:07 +03:00
Tropical 3b52fd1369 TU19: add Minecraft.World/Scores 2026-03-21 17:28:02 -05:00
Tropical 75a4897381 TU19: merge Minecraft.World/Recipes 2026-03-21 17:27:44 -05:00
Tropical 19026c057b TU19: merge Minecraft.World/Player 2026-03-21 17:26:42 -05:00
Tropical fdf5b8f8b9 merge Minecraft.World.cpp 2026-03-21 17:14:48 -05:00
Tropical e7bafb17d0 missed some 2026-03-21 17:12:22 -05:00
Tropical 357fca24aa refactor: nuke __int64/__uint64 in Minecraft.World 2026-03-21 17:10:36 -05:00
Tropical 8036565022 missed these two 2026-03-21 17:08:54 -05:00
Tropical 86e08af338 TU19: merge Minecraft.World/Level 2026-03-21 17:07:51 -05:00
Tropical 29522d1ac9 TU19: merge Minecraft.World/Items 2026-03-21 16:39:12 -05:00
Tropical 3d3fa566c7 TU19: merge Minecraft.World/Entities 2026-03-21 16:29:02 -05:00
Tropical 405a87e078 TU19: merge Minecraft.World/Enchantments 2026-03-21 15:55:35 -05:00
Tropical 7d05b36f85 TU19: add Minecraft.World/Core 2026-03-21 15:54:53 -05:00
Tropical 9b6046cb83 TU19: merge Minecraft.World/Blocks 2026-03-21 15:52:50 -05:00
Vinícius Moura 7775c59e3c
Merge branch '4jcraft:dev' into java_exit_btn_behaviour 2026-03-21 16:25:07 -04:00
ViniciusCruzMoura cbfdef7ba5 fix(TitleScreen): handle Exit Game properly with ENABLE_JAVA_GUIS
i noticed the main menu had the same problem as #277 and applied
the same fix
tested with java gui and shiggy, both close correctly now

Signed-off-by: ViniciusCruzMoura <contato.cruz.moura@gmail.com>
2026-03-21 16:23:48 -04:00
Tropical f25cd66f4d TU19: merge Minecraft.World/Containers
keeping virtual destructors where possible
2026-03-21 15:18:52 -05:00
Tropical db0a6b2e6a TU19: merge Minecraft.World/Commands 2026-03-21 15:14:17 -05:00
Tropical 36ca1d912e TU19: merge Minecraft.World/Headers 2026-03-21 15:13:02 -05:00
Tropical 7973172ae8 TU19: merge Minecraft.World/AI 2026-03-21 15:10:07 -05:00
Tropical 4cdea50a5a
Merge pull request #290 from Liriosha/dev
Miniaudio Integration
2026-03-21 15:03:31 -05:00