Skip to content

Y
ygopro
Commit 6074f4b7 authored by wind2009's avatar wind2009
Browse files
Options

Merge branch 'server' into server-develop

parents e4990422 7a0defb4
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 225 additions and 32 deletions
gframe/game.cpp
View file @ 6074f4b7
#include "config.h" #include "config.h"
#include "game.h" #include "game.h"
#ifdef YGOPRO_SERVER_MODE #ifdef YGOPRO_SERVER_MODE
#include <thread>
#include "myfilesystem.h" #include "myfilesystem.h"
#include "data_manager.h" #include "data_manager.h"
#include "deck_manager.h" #include "deck_manager.h"
...@@ -27,6 +26,7 @@ namespace irr { ...@@ -27,6 +26,7 @@ namespace irr {
#include "netserver.h" #include "netserver.h"
#include "single_mode.h" #include "single_mode.h"
#endif //YGOPRO_SERVER_MODE #endif //YGOPRO_SERVER_MODE
#include <thread>
const unsigned short PRO_VERSION = 0x1361; const unsigned short PRO_VERSION = 0x1361;
......
lflist.conf
View file @ 6074f4b7
This diff is collapsed.
ocgcore @ 1701452d
Subproject commit dc1e9c42af39de74117829abf8eac715e6112556 Subproject commit 1701452d060a740c9d9cb796b2711550f5fb517e
script @ a852e8e7
Subproject commit db28e4a03749e11492bfba6358004dba2a432b9e Subproject commit a852e8e7d21eb61d043838fdd86170bef911871d
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment