Merge branch 'master' into server

2fa5771e · nanahira · dbc6dbc3 · 71821996 · 2fa5771e · da0cd22b
Commit 2fa5771e authored Oct 22, 2019 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 Scarlet", PRO_VERSION >> 12, (PRO_VERSION >> 4) & 0xff, PRO_VERSION & 0xf);
+	myswprintf(strbuf, L"KoishiPro %X.0%X.%X Nemesis", 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 @ da0cd22b
+++ b/ocgcore @ da0cd22b
-Subproject commit 3fec1b3a039f4f73871edfe4a51eed686c83a451
+Subproject commit da0cd22bbb58d6a871a3f8517eaf91b0bd4fbff5
--- a/script @ ce9691cb
+++ b/script @ ce9691cb
-Subproject commit feb9ce79cb5d52ae6ec047d467befec49329d601
+Subproject commit ce9691cbb3325e27644f82fd4e8f1dede07dbd4a