Commit 2283729d authored by nanahira's avatar nanahira

Merge branch 'master' into server

parents 4965a378 b4d7cc66
No preview for this file type
......@@ -229,7 +229,7 @@ bool Game::Initialize() {
SetWindowsIcon();
//main menu
wchar_t strbuf[256];
myswprintf(strbuf, L"KoishiPro %X.0%X.%X DaydreamCafe", PRO_VERSION >> 12, (PRO_VERSION >> 4) & 0xff, PRO_VERSION & 0xf);
myswprintf(strbuf, L"KoishiPro %X.0%X.%X Camellia", 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));
......
Subproject commit 7c04707022bab65e5fb76f45637e7094476285bb
Subproject commit 77e8bf1062a69bcff61052b3d6112df3fc60f0a8
Subproject commit b1a22d4edbc3505340cb0bbb25dcb605ec9c5556
Subproject commit 5b3ad6d11e7c754920dea7237a115ffe1e1cc82b
......@@ -827,6 +827,7 @@
#setname 0x7a 圣 聖
!setname 0x107a 圣骑士 聖騎士(せいきし)
!setname 0x207a 圣剑 聖剣(せいけん)
!setname 0x507a 焰圣骑士 焔聖騎士
!setname 0x7b 银河 ギャラクシー
!setname 0x107b 银河眼 ギャラクシーアイズ
!setname 0x307b 银河眼时空龙 ギャラクシーアイズ・タキオン・ドラゴン
......
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