Skip to content

Y
ygopro
Commit 1d53b377 authored by nanahira's avatar nanahira
Browse files
Options

Merge branch 'master' into server

parents 5add9553 2abe7765
Show whitespace changes
Inline Side-by-side
Showing with 3 additions and 2 deletions
cards.cdb
View file @ 1d53b377
No preview for this file type
gframe/game.cpp
View file @ 1d53b377
...@@ -151,7 +151,7 @@ bool Game::Initialize() { ...@@ -151,7 +151,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 Horizon", PRO_VERSION >> 12, (PRO_VERSION >> 4) & 0xff, PRO_VERSION & 0xf); myswprintf(strbuf, L"KoishiPro %X.0%X.%X Shirayuki", 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));
......
script @ 7515bff7
Subproject commit 3fa37bf268dfdc2f502f0acbc3d524c90b8f633b Subproject commit 7515bff775a80eaace2bbaa6f8bdd461018ee277
strings.conf
View file @ 1d53b377
...@@ -1084,3 +1084,4 @@ ...@@ -1084,3 +1084,4 @@
!setname 0x1158 圣蔓 サンヴァイン !setname 0x1158 圣蔓 サンヴァイン
!setname 0x2158 圣天树 サンアバロン !setname 0x2158 圣天树 サンアバロン
!setname 0x159 圣夜骑士 ホーリーナイツ !setname 0x159 圣夜骑士 ホーリーナイツ
!setname 0x15a 人偶怪兽 ドール・モンスター
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