Commit graph

59 commits

Author SHA1 Message Date
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
JuiceyDev e631a62620 Fix: Ensure host-local socket streams created before any Connection is built 2026-03-08 22:59:57 +01:00
Tropical cff2fc5f44 refactor: unglob std::wstring 2026-03-08 22:43:43 +01:00
Pyogenics 1e06432842 Sort localisation strings alphabetically like 4j does 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 506532f2c1 Move assets to more logical location 2026-03-08 22:41:47 +01:00
Tropical 052a656673 fix: remove byte type alias 2026-03-08 22:39:40 +01:00
Tropical 43a28fc490
Merge pull request #71 from 4jcraft/refactor/no-std-wildcard
refactor: remove `using namespace std`
2026-03-08 10:09:33 -05:00
DecalOverdose a508412246
Merge pull request #75 from Pyogenics/assetbuild
Asset build on compile
2026-03-07 20:44:12 +04:00
Pyogenics dc54566cd4 Sort localisation strings alphabetically like 4j does 2026-03-07 16:08:44 +00:00
Pyogenics edae8c85c9 Create dedicated assets project to enable localisation header generation 2026-03-07 14:36:34 +00:00
Tropical 06ca3c6b78 fix: add remaining std:: namespaces 2026-03-06 23:51:37 -06:00
zukrmn ca11afdfca fix: resolve all remaining compilation warnings 2026-03-07 04:43:50 +00:00
Tropical deaeef7f7d fix: missed some dynamic_pointer_cast calls in Common 2026-03-06 22:30:39 -06:00
Tropical e0479e90b4 fix: unglob everything else and make it build 2026-03-06 21:06:31 -06:00
Tropical 04ff82ba70 fix: unglob std::{min, max}, manual stuff 2026-03-06 20:47:11 -06:00
Tropical 6131826226 refactor: deglob std::weak_ptr 2026-03-06 20:38:50 -06:00
Tropical 277e3a1e87 fix: unglob all of /Build/Common 2026-03-06 20:31:41 -06:00
Pyogenics b9247c698c Move Common/Media to Platform/MediaXbox 2026-03-07 01:30:34 +00:00
Pyogenics 3f3a0ab72a Move assets to more logical location 2026-03-06 23:47:26 +00:00
JuiceyDev 2f8ed831fc fix: enable TRIANGLE_MODE and use correct OpenGL constants to fix invisible terrain 2026-03-06 22:10:41 +01:00
Tropical ac9f3cbca3 chore: resolve some void* memset cast warnings 2026-03-06 11:55:28 -06:00
Tropical cdc08700e4 refactor: unglob std::wstring 2026-03-06 11:50:22 -06:00
JuiceyDev 417ea73050 painful update 2026-03-06 18:31:46 +01:00
JuiceyDev 0e13ac4955 funny 2026-03-06 17:22:54 +01:00
JuiceyDev f9932754e5 so we back in the mines,, grab my pickaxe 2026-03-06 15:04:49 +01:00
JuiceyDev cdb02fa0af Fix: Ensure host-local socket streams created before any Connection is built 2026-03-06 12:10:39 +01:00
Tropical 15af35eef2 fix: remove byte type alias 2026-03-06 05:03:37 -06:00
JuiceyDev 76b441dd91 network packet 2026-03-06 10:51:07 +01:00
Tropical 29cc47183f Merge remote-tracking branch 'origin/dev' into create-juicey-app/dev 2026-03-06 03:43:13 -06:00
Tropical 29346e056c chore: nuke CMake and visual studio solutions
bye
2026-03-06 02:01:20 -06:00
JuiceyDev d5db5cc071 fix: guard CXuiStringTable StringTable global from Linux unity builds to prevent class shadowing 2026-03-06 08:43:47 +01:00
JuiceyDev 50d28ade69 filez 2026-03-06 08:03:07 +01:00
Tropical 953d7257d3 Merge branch 'dev' of https://github.com/create-juicey-app/4jcraft-juicefork into juice-dev 2026-03-06 00:18:34 -06:00
Tropical 7baf1cbfa1 refactor: clean up meson build scripts, use in-tree zlib 2026-03-06 00:17:31 -06:00
JuiceyDev 17ac8deddf hhhhh 2026-03-06 07:13:57 +01:00
JuiceyDev c55ed7b261 game compiles 2026-03-06 06:13:22 +01:00
JuiceyDev baab1724ff fix include 2026-03-06 02:02:49 +01:00
JuiceyDev b04a2369b6 meson basic intergration 2026-03-06 01:59:57 +01:00
JuiceyDev fddd777399 fixed font 2026-03-06 00:34:36 +01:00
JuiceyDev fa9d517227 fdkgsekgdqsgf 2026-03-05 23:37:27 +01:00
JuiceyDev 06afba4d34
Merge branch 'dev' into dev 2026-03-05 22:33:38 +01:00
Pyogenics d788d20461 Fix VS project generation 2026-03-05 19:25:43 +00:00
Pyogenics 20df5342de Remove unused vs studio files 2026-03-05 19:01:54 +00:00
JuiceyDev 44b4ba84c2 Horrible code alert 2026-03-05 19:06:07 +01:00
JuiceyDev cb4e0e82b7 Basic IGGY renderer implementation, do not PR. 2026-03-05 16:54:56 +01:00
six 4a0e6ea98f
fix(CMakeLists): add early check for libGLU 2026-03-05 15:30:38 +01:00
JuiceyDev a1f1681ce7 Starting IGGY impl 2026-03-05 14:02:05 +01:00
Mohamed Ashraf 1ae227e9ba FIX COMPILE AND IT'S ALMOST DONE HOLY SHIT 2026-03-05 16:12:37 +04:00
JuiceyDev 6c5a675f3c fix: correct stale include paths after folder refactor 2026-03-05 11:40:43 +01:00