Commit Graph

107 Commits

Author SHA1 Message Date
Tropical
197bf0033f Merge branch 'dev' into feat/sdl-support 2026-03-10 17:38:52 -05:00
Leah Anderson
4e39635f20 Merge pull request #167 from 4jcraft/fix/missing-asset-error
fix: remove unused console-only asset archive imports
2026-03-10 14:31:36 -06:00
Tropical
12ede0691a fix: remove unused console-only asset archive imports 2026-03-10 15:22:37 -05:00
Nikita Edel
c86bfe35f3 Merge branch '4jcraft:dev' into dev 2026-03-10 20:51:42 +01:00
Nikita Edel
0ff6f767e5 formailize comments 2026-03-10 20:30:31 +01:00
Tropical
750436d815 Merge pull request #165 from 4jcraft/fix/fatal-load-error
fix: implement `CConsoleMinecraftApp::FatalLoadError` on linux
2026-03-10 13:57:00 -05:00
Nikita Edel
f9fc430c43 Merge branch '4jcraft:dev' into dev 2026-03-10 19:34:42 +01:00
Echo J.
8a8280b242 GameNetworkManager: Fix incorrect infinity value redefinition
WaitForSingleObject() uses the maximum 32-bit value for specifying infinite timeout (while INFINITY might overflow that sized value back to 0) which caused the server wait event to not actually wait when compiled with Clang (and the game to be forever stuck on a black screen due to abnormal server state)
2026-03-10 20:00:07 +02:00
Tropical
5406648692 fix: implement CConsoleMinecraftApp::FatalLoadError on linux 2026-03-10 11:16:42 -05:00
JuiceyDev
1c67f134b2 added files from pr 2026-03-10 09:18:20 +01: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
Nikita Edel
66b31669c3 new batch of delete operator missmatch 2026-03-09 22:48:36 +01:00
Nikita Edel
5265eef759 first patch of UB 2026-03-09 21:54:43 +01:00
JuiceyDev
6753364573 Merge pull request #128 from 4jcraft/fix/remove-vibecode
fix: remove LLM-generated socket initialization fix
2026-03-09 16:13:36 +01:00
Tropical
66b10b8226 fix: remove vibecoded socket initialization fix 2026-03-09 09:52:47 -05:00
sewn
bf5f416ba5 fix: support backtrace only on glibc systems
execinfo is glibc only, and prevents compiling on
other systems.
2026-03-09 15:12:39 +03:00
Tropical
4be19958ea Merge branch 'dev' into refactor/untangle-assets-mess 2026-03-09 01:20:45 -05:00
Tropical
4d543dd59d fix: use Common/Media/MediaLinux.arc for mediapath 2026-03-09 00:34:28 -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
Tropical
ad1e8369bc refactor: move Common to Platform/Common 2026-03-09 00:17:42 -05:00
Tropical
49672a019f refactor: move anything in Build that isn't strictly source into Assets 2026-03-08 23:54:30 -05:00
Tropical
54dab7708d refactor: rename Build -> Platform in Minecraft.World 2026-03-08 21:33:18 -05:00
JuiceyDev
c7ede72c91 Merge pull request #100 from nikita-edel/dev
fix: wstring_to_utf8, depracated function and generated warnings.
2026-03-08 23:57:29 +01:00
JuiceyDev
21430e1758 fix new folder 2026-03-08 23:37:39 +01: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
Nikita Edel
1c4aa32b13 typo 2026-03-08 23:06:52 +01:00
JuiceyDev
cb7bc7c9c9 Added winapistubs cuz it pissed me off 2026-03-08 22:59:57 +01:00
Nikita Edel
85df07e232 fixed typos 2026-03-08 22:59:29 +01:00
Tropical
63d216a672 fix: add remaining std:: namespaces 2026-03-08 22:44:00 +01:00
Tropical
66248339e5 refactor: unglob std::dynamic_pointer_cast 2026-03-08 22:44:00 +01:00
Tropical
39a359ca56 fix: remove some unintended changes to DirectX library comments 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
a05a15eb73 fix: stupid 2026-03-08 22:43:59 +01:00
Tropical
a744f8f471 refactor: deglob std::weak_ptr 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
Pyogenics
53c22968ee Quick patch to just get strings.h generation to generate a file that can be used to compile with 2026-03-08 22:42:33 +01:00
Pyogenics
5c7485144c Create dedicated assets project to enable localisation header generation 2026-03-08 22:42:32 +01:00
Pyogenics
f4c9f0f51c Full meson asset build and copy hooked up 2026-03-08 22:42:08 +01:00
Pyogenics
18a5f2dbb3 Move Common/Media to Platform/MediaXbox 2026-03-08 22:42:08 +01:00
zukrmn
53b5f7058e fix: remove GCC diagnostic pragmas suppressing std::wstring_convert deprecation 2026-03-08 22:40:41 +01:00
zukrmn
42b0352ec3 fix: resolve all remaining compilation warnings 2026-03-08 22:40:41 +01:00
Nikita Edel
17a10ca9a3 fix wstring_to_utf8 2026-03-08 22:39:41 +01:00
Tropical
bcbaa98f90 fix: more replacement mistakes 2026-03-08 22:39:41 +01:00