Skip to content

Y
ygopro
Commit 1860d4bf authored by nanahira's avatar nanahira
Browse files
Options

Merge branch 'master' into server

parents d23e8198 b59b73f1
Show whitespace changes
Inline Side-by-side
Showing with 6 additions and 3 deletions
cards.cdb
View file @ 1860d4bf
No preview for this file type
gframe/game.cpp
View file @ 1860d4bf
...@@ -214,7 +214,7 @@ bool Game::Initialize() { ...@@ -214,7 +214,7 @@ bool Game::Initialize() {
SetWindowsIcon(); SetWindowsIcon();
//main menu //main menu
wchar_t strbuf[256]; wchar_t strbuf[256];
myswprintf(strbuf, L"KoishiPro %X.0%X.%X Lanterns", PRO_VERSION >> 12, (PRO_VERSION >> 4) & 0xff, PRO_VERSION & 0xf); myswprintf(strbuf, L"KoishiPro %X.0%X.%X Gloxinia", PRO_VERSION >> 12, (PRO_VERSION >> 4) & 0xff, PRO_VERSION & 0xf);
wMainMenu = env->addWindow(rect<s32>(370, 200, 650, 415), false, strbuf); wMainMenu = env->addWindow(rect<s32>(370, 200, 650, 415), false, strbuf);
wMainMenu->getCloseButton()->setVisible(false); wMainMenu->getCloseButton()->setVisible(false);
btnLanMode = env->addButton(rect<s32>(10, 30, 270, 60), wMainMenu, BUTTON_LAN_MODE, dataManager.GetSysString(1200)); btnLanMode = env->addButton(rect<s32>(10, 30, 270, 60), wMainMenu, BUTTON_LAN_MODE, dataManager.GetSysString(1200));
......
ocgcore @ d2cbf8a7
Subproject commit 987fd9dab72261ad1bc4d995b9dd1f89bffd7a32 Subproject commit d2cbf8a74dc3e3443a74d34e495cc9acc31fc801
script @ a0c5dba6
Subproject commit ea9be939b5e25b84cc365c5104c2b48b4e54f85c Subproject commit a0c5dba6afc89817e76d28db8a0562b6708f1412
strings.conf
View file @ 1860d4bf
...@@ -1164,3 +1164,6 @@ ...@@ -1164,3 +1164,6 @@
!setname 0x188 深渊之兽 ビーステッド !setname 0x188 深渊之兽 ビーステッド
!setname 0x189 俱舍怒威族 クシャトリラ !setname 0x189 俱舍怒威族 クシャトリラ
!setname 0x18a 魊影 Ghoti !setname 0x18a 魊影 Ghoti
!setname 0x18b 救援ACE队 R－ACE
!setname 0x18c 纯爱妖精 ピュアリィ
!setname 0x18d 御巫
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment