Merge branch 'master' into link

gframe/duelclient.cpp

@@ -1485,6 +1485,7 @@ int DuelClient::ClientAnalyze(char * msg, unsigned int len) {
 		int count = BufferIO::ReadInt8(pbuf);
 		mainGame->dField.selectable_cards.clear();
 		mainGame->dField.selected_cards.clear();
+		mainGame->dField.select_panalmode = false;
 		int c, l, s, t;
 		unsigned int code;
 		ClientCard* pcard;

gframe/game.cpp

@@ -14,7 +14,7 @@
 #include <dirent.h>
 #endif
 
-const unsigned short PRO_VERSION = 0x233F;
+const unsigned short PRO_VERSION = 0x1340;
 
 namespace ygo {
 

ocgcore @ 1f1d9cba

-Subproject commit be07da20a7f5225572beaf12414d251fd15f3255
+Subproject commit 1f1d9cba25969e85760185a3fbb6f2070beba1aa

premake5.lua

@@ -19,7 +19,7 @@ solution "ygo"
 
     configuration "macosx"
         defines { "LUA_USE_MACOSX" }
-        includedirs { "/usr/local/include/*" }
+        includedirs { "/usr/local/include", "/usr/local/include/*" }
         libdirs { "/usr/local/lib", "/usr/X11/lib" }
         buildoptions { "-stdlib=libc++" }
         links { "OpenGL.framework", "Cocoa.framework", "IOKit.framework" }

script @ 0f2bb610

-Subproject commit 14c74b934e2da9201a3dfe70fb96782185bcce66
+Subproject commit 0f2bb610e85d5d61faefbf91c6f4c5aa4e52ec3c

strings.conf

@@ -100,6 +100,7 @@
 !system 530 请选择对方的卡
 !system 531 请选择上级召唤用需要解放的怪兽
 !system 532 请选择要取除超量素材的怪兽
+!system 533 请选择连接召唤的素材
 !system 549 请选择攻击的对象
 !system 550 请选择要发动的效果
 !system 551 请选择效果的对象

system.conf

@@ -11,7 +11,6 @@ numfont = c:/windows/fonts/arialbd.ttf
 serverport = 7911
 lasthost = s1.ygo233.com
 lastport = 233
-autopos = 1
 automonsterpos = 0
 autospellpos = 1
 randompos = 0