Merge branch 'server' into server-develop

6074f4b7 · wind2009 · e4990422 · 7a0defb4 · 6074f4b7 · 6074f4b7
Commit 6074f4b7 authored Oct 08, 2024 by wind2009
Expand all Hide whitespace changes
Inline Side-by-side

Showing with 225 additions and 32 deletions

gframe/game.cpp gframe/game.cpp +1 -1

lflist.conf lflist.conf +222 -29

ocgcore ocgcore +1 -1

script script +1 -1

No files found.
--- a/gframe/game.cpp
+++ b/gframe/game.cpp
 #include "config.h"
 #include "game.h"
 #ifdef YGOPRO_SERVER_MODE
-#include <thread>
 #include "myfilesystem.h"
 #include "data_manager.h"
 #include "deck_manager.h"
@@ -27,6 +26,7 @@ namespace irr {
 #include "netserver.h"
 #include "single_mode.h"
 #endif //YGOPRO_SERVER_MODE
+#include <thread>

 const unsigned short PRO_VERSION = 0x1361;


--- a/lflist.conf
+++ b/lflist.conf
--- a/ocgcore @ 1701452d
+++ b/ocgcore @ 1701452d
-Subproject commit dc1e9c42af39de74117829abf8eac715e6112556
+Subproject commit 1701452d060a740c9d9cb796b2711550f5fb517e
--- a/script @ a852e8e7
+++ b/script @ a852e8e7
-Subproject commit db28e4a03749e11492bfba6358004dba2a432b9e
+Subproject commit a852e8e7d21eb61d043838fdd86170bef911871d