Merge branch 'master' into server

ce9ddf10 · nanahira · b53794e0 · 8a416561 · ce9ddf10 · ce9ddf10
Commit ce9ddf10 authored Jan 05, 2020 by nanahira
Hide whitespace changes
Inline Side-by-side

Showing with 3 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

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 Yume", PRO_VERSION >> 12, (PRO_VERSION >> 4) & 0xff, PRO_VERSION & 0xf);
+	myswprintf(strbuf, L"KoishiPro %X.0%X.%X Lunar", 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 @ 49e3cace
+++ b/ocgcore @ 49e3cace
-Subproject commit 619209b086897d3995324bb4c4ae9743a470ab88
+Subproject commit 49e3cacefd42b4846c6e0fd8dd14700243ae60d8
--- a/script @ b9595970
+++ b/script @ b9595970
-Subproject commit a9ab2c75c09d13898900a0814f761d760853b8fc
+Subproject commit b9595970d288c3cca00336b8ad49a362c9ce3a5f