Merge branch 'server' into full-view

4d4537c7 · nanahira · f9d93b4a · 9da610d9 · 4d4537c7 · 4d4537c7
Commit 4d4537c7 authored Feb 06, 2022 by nanahira
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 2 deletions

cards.cdb cards.cdb +0 -0

gframe/game.cpp gframe/game.cpp +3 -0

ocgcore ocgcore +1 -1

script script +1 -1

No files found.
--- a/cards.cdb
+++ b/cards.cdb
--- a/gframe/game.cpp
+++ b/gframe/game.cpp
@@ -86,6 +86,9 @@ bool Game::Initialize() {
 				skinSystem->applySkin(skins[index].c_str());
 		}
 	}
+#ifndef _DEBUG
+	//device->getLogger()->setLogLevel(irr::ELOG_LEVEL::ELL_ERROR);
+#endif
 	xScale = 1;
 	yScale = 1;
 	linePatternD3D = 0;

--- a/ocgcore @ a4c305cf
+++ b/ocgcore @ a4c305cf
-Subproject commit 9b3458c7db51dbe52fdb7961cea504d4b705b908
+Subproject commit a4c305cfe6c7e4ab439e32cdf2c7a8af5a300195
--- a/script @ 4984b9f7
+++ b/script @ 4984b9f7
-Subproject commit d31bd272604f0c3e2cfb206207ab868cb6b010ba
+Subproject commit 4984b9f7d4b56e72f6fdf89098b95fd4848a71d1