Merge branch 'master' into server

b1bb9bc4 · nanahira · e865216b · 0dc08ed4 · b1bb9bc4 · 747a89ce
Commit b1bb9bc4 authored Apr 01, 2020 by nanahira
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 3 deletions

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

ocgcore ocgcore +1 -1

script script +1 -1

No files found.
--- 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 Colorful", PRO_VERSION >> 12, (PRO_VERSION >> 4) & 0xff, PRO_VERSION & 0xf);
+	myswprintf(strbuf, L"KoishiPro %X.0%X.%X Monokuro", 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 @ 747a89ce
+++ b/ocgcore @ 747a89ce
-Subproject commit d52a922a8b00b9a9ee8292a8891857343e1ed57c
+Subproject commit 747a89ce98de621be537d4d2778e4491881521d3
--- a/script @ a290bcc4
+++ b/script @ a290bcc4
-Subproject commit 9f445929001b004212b2d90171192c994b3ec852
+Subproject commit a290bcc4ec4401c688a023b58222caa9ad798e3a