Merge branch 'develop' into server-develop

ffb9324a · nanahira · eaeaca8b · 2eb8b933 · ffb9324a · ffb9324a
Commit ffb9324a authored Mar 18, 2025 by nanahira
Show whitespace changes
Inline Side-by-side

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

strings.conf strings.conf +2 -0

No files found.
--- a/cards.cdb
+++ b/cards.cdb
--- a/gframe/game.cpp
+++ b/gframe/game.cpp
@@ -280,7 +280,7 @@ bool Game::Initialize() {
 	SetWindowsIcon();
 	//main menu
 	wchar_t strbuf[256];
-	myswprintf(strbuf, L"KoishiPro %X.0%X.%X Moon", (PRO_VERSION & 0xf000U) >> 12, (PRO_VERSION & 0x0ff0U) >> 4, PRO_VERSION & 0x000fU);
+	myswprintf(strbuf, L"KoishiPro %X.0%X.%X Overdose", (PRO_VERSION & 0xf000U) >> 12, (PRO_VERSION & 0x0ff0U) >> 4, PRO_VERSION & 0x000fU);
 	wMainMenu = env->addWindow(irr::core::rect<irr::s32>(370, 200, 650, 415), false, strbuf);
 	wMainMenu->getCloseButton()->setVisible(false);
 	btnLanMode = env->addButton(irr::core::rect<irr::s32>(10, 30, 270, 60), wMainMenu, BUTTON_LAN_MODE, dataManager.GetSysString(1200));

--- a/ocgcore @ b2d1a11d
+++ b/ocgcore @ b2d1a11d
-Subproject commit 1d7398c7e92cf9a53fa483527a9328cc82a067f5
+Subproject commit b2d1a11ded55b3efca59065a63ef55133200a6fc
--- a/script @ 00e65bf7
+++ b/script @ 00e65bf7
-Subproject commit 65a4ab26c4f556e0388a9b6c80cbb090cc5569be
+Subproject commit 00e65bf79f353e8b5f81484b27b67f9d8fcce440
--- a/strings.conf
+++ b/strings.conf
@@ -1257,3 +1257,5 @@
 !setname 0x1c4 征龙	征竜
 !setname 0x1c5 再世	再世
 !setname 0x1c6 统王	ドミナス
+!setname 0x1c7 塞勒凯特	Serket
+!setname 0x1c8 阿匹卜	Apophis