Merge branch 'master' into server

9a72af72 · nanahira · 02e141de · 2e7d38a5 · 9a72af72 · 9a72af72
Commit 9a72af72 authored Aug 11, 2019 by nanahira
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 6 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 -3

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 Charin", PRO_VERSION >> 12, (PRO_VERSION >> 4) & 0xff, PRO_VERSION & 0xf);
+	myswprintf(strbuf, L"KoishiPro %X.0%X.%X Outsider", 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 @ 01413f65
+++ b/ocgcore @ 01413f65
-Subproject commit a863a19d260bc343484ea0911c5f7a72fe9d6a87
+Subproject commit 01413f65b6902fd533fd26f8599e23b4b98438c1
--- a/script @ 15084f81
+++ b/script @ 15084f81
-Subproject commit 1d99403acb4527402a1cf53c6a70ce1af6bdb479
+Subproject commit 15084f811048aa8116ae2e2e3d1203ee1dabae8c
--- a/strings.conf
+++ b/strings.conf
@@ -1007,6 +1007,6 @@
 !setname 0x130 破械
 !setname 0x1130 破械神
 !setname 0x131 梦镜	Dream Mirror
-!setname 0x132 斩机
-!setname 0x133 半龙女仆
-!setname 0x134 王战
+!setname 0x132 斩机	斬機
+!setname 0x133 半龙女仆	ドラゴンメイド
+!setname 0x134 王战	ジェネレイド