Skip to content

Y
ygopro
Commit 9da610d9 authored by nanahira's avatar nanahira
Browse files
Options

Merge branch 'master' into server

parents f961f53d 5488e8a8
Hide whitespace changes
Inline Side-by-side
Showing with 5 additions and 2 deletions
cards.cdb
View file @ 9da610d9
No preview for this file type
gframe/game.cpp
View file @ 9da610d9
...@@ -86,6 +86,9 @@ bool Game::Initialize() { ...@@ -86,6 +86,9 @@ bool Game::Initialize() {
skinSystem->applySkin(skins[index].c_str()); skinSystem->applySkin(skins[index].c_str());
} }
} }
#ifndef _DEBUG
//device->getLogger()->setLogLevel(irr::ELOG_LEVEL::ELL_ERROR);
#endif
xScale = 1; xScale = 1;
yScale = 1; yScale = 1;
linePatternD3D = 0; linePatternD3D = 0;
......
ocgcore @ a4c305cf
Subproject commit 9b3458c7db51dbe52fdb7961cea504d4b705b908 Subproject commit a4c305cfe6c7e4ab439e32cdf2c7a8af5a300195
script @ 4984b9f7
Subproject commit d31bd272604f0c3e2cfb206207ab868cb6b010ba Subproject commit 4984b9f7d4b56e72f6fdf89098b95fd4848a71d1
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