Merge branch 'master' into server

gframe/game.cpp

@@ -214,7 +214,7 @@ bool Game::Initialize() {
 	SetWindowsIcon();
 	//main menu
 	wchar_t strbuf[256];
-	myswprintf(strbuf, L"KoishiPro %X.0%X.%X Thirdeye", PRO_VERSION >> 12, (PRO_VERSION >> 4) & 0xff, PRO_VERSION & 0xf);
+	myswprintf(strbuf, L"KoishiPro %X.0%X.%X Aragami", PRO_VERSION >> 12, (PRO_VERSION >> 4) & 0xff, PRO_VERSION & 0xf);
 	wMainMenu = env->addWindow(rect<s32>(370, 200, 650, 415), false, strbuf);
 	wMainMenu->getCloseButton()->setVisible(false);
 	btnLanMode = env->addButton(rect<s32>(10, 30, 270, 60), wMainMenu, BUTTON_LAN_MODE, dataManager.GetSysString(1200));

ocgcore @ eb68f437

-Subproject commit 141fa84f23157216f03bf60969eb6557a17799ab
+Subproject commit eb68f437522562fd2461ff843ae46e6d75677f18

premake5.lua

@@ -269,7 +269,7 @@ end
     filter { "configurations:Release", "action:vs*" }
         flags { "LinkTimeOptimization" }
         staticruntime "On"
-        disablewarnings { "4244", "4267", "4838", "4577", "4819", "4018", "4996", "4477", "4091", "4828", "4800" }
+        disablewarnings { "4244", "4267", "4838", "4577", "4819", "4018", "4996", "4477", "4091", "4828", "4800", "6011", "6031", "6054", "6262" }
 
     filter { "configurations:Release", "not action:vs*" }
         symbols "On"
@@ -279,8 +279,7 @@ end
         end
 
     filter { "configurations:Debug", "action:vs*" }
-        defines { "_ITERATOR_DEBUG_LEVEL=0" }
-        disablewarnings { "4819", "4828" }
+        disablewarnings { "4819", "4828", "6011", "6031", "6054", "6262" }
 
     filter "action:vs*"
         vectorextensions "SSE2"

script @ edea1bcb

-Subproject commit dd222d324189d303d9427cd746182c32ee1d5bf7
+Subproject commit edea1bcb385ed0fe6496b26247e171196e9e079a

strings.conf

@@ -1160,3 +1160,6 @@
 !setname 0x1185 涂鸦兽	らくがきじゅう
 !setname 0x2185 涂鸦本	らくがきちょう
 !setname 0x186 G石人	Gゴーレム
+!setname 0x187 桥梁	架け橋
+!setname 0x188 深渊之兽	ビーステッド
+!setname 0x189 俱舍怒威族	クシャトリラ