Merge branch 'master' into server

1d53b377 · nanahira · 5add9553 · 2abe7765 · 1d53b377 · 1d53b377
Commit 1d53b377 authored Jan 05, 2021 by nanahira
Show whitespace changes
Inline Side-by-side

Showing with 3 additions and 2 deletions

cards.cdb cards.cdb +0 -0

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

script script +1 -1

strings.conf strings.conf +1 -0

No files found.
--- a/cards.cdb
+++ b/cards.cdb
--- a/gframe/game.cpp
+++ b/gframe/game.cpp
@@ -151,7 +151,7 @@ bool Game::Initialize() {
 	SetWindowsIcon();
 	//main menu
 	wchar_t strbuf[256];
-	myswprintf(strbuf, L"KoishiPro %X.0%X.%X Horizon", PRO_VERSION >> 12, (PRO_VERSION >> 4) & 0xff, PRO_VERSION & 0xf);
+	myswprintf(strbuf, L"KoishiPro %X.0%X.%X Shirayuki", 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/script @ 7515bff7
+++ b/script @ 7515bff7
-Subproject commit 3fa37bf268dfdc2f502f0acbc3d524c90b8f633b
+Subproject commit 7515bff775a80eaace2bbaa6f8bdd461018ee277
--- a/strings.conf
+++ b/strings.conf
@@ -1084,3 +1084,4 @@
 !setname 0x1158 圣蔓	サンヴァイン
 !setname 0x2158 圣天树	サンアバロン
 !setname 0x159 圣夜骑士	ホーリーナイツ
+!setname 0x15a 人偶怪兽	ドール・モンスター