Merge branch 'master' into server

02006f16 · nanahira · bf13bb4c · 67478385 · 02006f16 · 02006f16
Commit 02006f16 authored Aug 15, 2022 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
@@ -214,7 +214,7 @@ bool Game::Initialize() {
 	SetWindowsIcon();
 	//main menu
 	wchar_t strbuf[256];
-	myswprintf(strbuf, L"KoishiPro %X.0%X.%X Aragami", PRO_VERSION >> 12, (PRO_VERSION >> 4) & 0xff, PRO_VERSION & 0xf);
+	myswprintf(strbuf, L"KoishiPro %X.0%X.%X Lanterns", 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 @ 987fd9da
+++ b/ocgcore @ 987fd9da
-Subproject commit eb68f437522562fd2461ff843ae46e6d75677f18
+Subproject commit 987fd9dab72261ad1bc4d995b9dd1f89bffd7a32
--- a/script @ ea9be939
+++ b/script @ ea9be939
-Subproject commit 329c08f1a55c2f08a08f9397a246c52426887f12
+Subproject commit ea9be939b5e25b84cc365c5104c2b48b4e54f85c