Skip to content

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

Merge branch 'master' into server

parents f96714ac 797bfbe6
Show whitespace changes
Inline Side-by-side
Showing with 4 additions and 5 deletions
cards.cdb
View file @ dd317bc8
No preview for this file type
gframe/game.cpp
View file @ dd317bc8
...@@ -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 Shirayuki", PRO_VERSION >> 12, (PRO_VERSION >> 4) & 0xff, PRO_VERSION & 0xf); myswprintf(strbuf, L"KoishiPro %X.0%X.%X Yunomix", 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 @ 9d0b7375
Subproject commit 8d89805c9042e4e55990a0658f49605a4f7aff71 Subproject commit 9d0b737589d04ac8485c5711451f0a27cd927b7d
script @ a9c74be8
Subproject commit f727103a211fc86405d40e7ae4a134f4c55f3b4c Subproject commit a9c74be81b3f53d1acdbc90d352be54442edad81
system.conf
View file @ dd317bc8
...@@ -36,8 +36,7 @@ ignore_deck_changes = 0 ...@@ -36,8 +36,7 @@ ignore_deck_changes = 0
default_ot = 1 default_ot = 1
enable_bot_mode = 1 enable_bot_mode = 1
bot_deck_path = ./windbot/Decks bot_deck_path = ./windbot/Decks
quick_animation = 1 quick_animation = 0
auto_save_replay = 1
draw_single_chain = 0 draw_single_chain = 0
prefer_expansion_script = 1 prefer_expansion_script = 1
ask_mset = 0 ask_mset = 0
......
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