Merge branch 'resize' into test

a698eea1 · mercury233 · 46c9b4d5 · 5b742049 · a698eea1 · b5f28bc4
Commit a698eea1 authored Aug 16, 2018 by mercury233
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 3 deletions

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

ocgcore ocgcore +1 -1

script script +1 -1

strings.conf strings.conf +3 -0

No files found.
--- a/gframe/game.cpp
+++ b/gframe/game.cpp
@@ -20,7 +20,7 @@
 #include <io.h>
 #endif
-const unsigned short PRO_VERSION = 0x1344;
+const unsigned short PRO_VERSION = 0x1345;
 namespace ygo {

--- a/ocgcore @ b5f28bc4
+++ b/ocgcore @ b5f28bc4
-Subproject commit 3043ca85739b5ba342e47bce49d472689238bae1
+Subproject commit b5f28bc46173c98b20a83ddada5442d5c5ce99f2
--- a/script @ fa9a0e7b
+++ b/script @ fa9a0e7b
-Subproject commit fd6a91ec06257df19fc693eefa8e7cbfa5d716c6
+Subproject commit fa9a0e7ba5c6eb54a0c330bf90f83e90a6d187b0
--- a/strings.conf
+++ b/strings.conf
@@ -243,6 +243,9 @@
 !system 1164 同调召唤
 !system 1165 超量召唤
 !system 1166 连接召唤
+!system 1190 加入手卡
+!system 1191 送去墓地
+!system 1192 除外
 #menu
 !system 1200 联机模式
 !system 1201 单人模式