Merge branch 'master' into server

aadbdbe8 · nanahira · 3645d9cc · 7b763108 · aadbdbe8 · aadbdbe8
Commit aadbdbe8 authored Jun 21, 2021 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
@@ -209,7 +209,7 @@ bool Game::Initialize() {
 	SetWindowsIcon();
 	//main menu
 	wchar_t strbuf[256];
-	myswprintf(strbuf, L"KoishiPro %X.0%X.%X Yunomoq", PRO_VERSION >> 12, (PRO_VERSION >> 4) & 0xff, PRO_VERSION & 0xf);
+	myswprintf(strbuf, L"KoishiPro %X.0%X.%X FunFunFun", 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 @ 6eba9f1b
+++ b/ocgcore @ 6eba9f1b
-Subproject commit 53052e1e1e2bfcc77146dc451da24ad585e24baf
+Subproject commit 6eba9f1b18f013eb28c0a7b5cc8611d0cfbc21e3
--- a/script @ eeb867bb
+++ b/script @ eeb867bb
-Subproject commit 7b721c6472ec5adfbfb3ef14c952bf02a1cd5f35
+Subproject commit eeb867bbcdfed8a128817761f0902194603f647b