Merge branch 'master' into server

02e141de · nanahira · 86771e28 · 00d2c2e1 · 02e141de · 02e141de
Commit 02e141de authored Aug 07, 2019 by nanahira
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 3 deletions

cards.cdb cards.cdb +0 -0

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/cards.cdb
+++ b/cards.cdb
--- a/gframe/game.cpp
+++ b/gframe/game.cpp
@@ -149,7 +149,7 @@ bool Game::Initialize() {
 	SetWindowsIcon();
 	//main menu
 	wchar_t strbuf[256];
-	myswprintf(strbuf, L"KoishiPro %X.0%X.%X Rosarium", PRO_VERSION >> 12, (PRO_VERSION >> 4) & 0xff, PRO_VERSION & 0xf);
+	myswprintf(strbuf, L"KoishiPro %X.0%X.%X Charin", 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));

--- a/ocgcore @ a863a19d
+++ b/ocgcore @ a863a19d
-Subproject commit 8394ad378997ed3ae8d262acd00c32d21ba11eb1
+Subproject commit a863a19d260bc343484ea0911c5f7a72fe9d6a87
--- a/script @ 1d99403a
+++ b/script @ 1d99403a
-Subproject commit 93ac2a46d32b5849c87aa7ee8241ea774cb9e1ef
+Subproject commit 1d99403acb4527402a1cf53c6a70ce1af6bdb479
--- a/strings.conf
+++ b/strings.conf
@@ -1007,3 +1007,6 @@
 !setname 0x130 破械
 !setname 0x1130 破械神
 !setname 0x131 梦镜	Dream Mirror
+!setname 0x132 斩机
+!setname 0x133 半龙女仆
+!setname 0x134 王战