Commit 45d078ce authored by nanahira's avatar nanahira

Merge branch 'master' into server

parents 9da610d9 b174c7e9
Pipeline #10477 passed with stages
in 2 minutes and 7 seconds
No preview for this file type
......@@ -214,7 +214,7 @@ bool Game::Initialize() {
SetWindowsIcon();
//main menu
wchar_t strbuf[256];
myswprintf(strbuf, L"KoishiPro %X.0%X.%X PONPONPON", PRO_VERSION >> 12, (PRO_VERSION >> 4) & 0xff, PRO_VERSION & 0xf);
myswprintf(strbuf, L"KoishiPro %X.0%X.%X Sunflower", 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 a4c305cfe6c7e4ab439e32cdf2c7a8af5a300195
Subproject commit 5ad519099511f9b4ff1ebc22992929990ef8bc5e
Subproject commit 4984b9f7d4b56e72f6fdf89098b95fd4848a71d1
Subproject commit 37ebb4228538260fb3e54583c518f8d11b1e2546
......@@ -650,6 +650,7 @@
!counter 0x5e 皇之键指示物
!counter 0x5f 拼图指示物
!counter 0x60 指示物(北极天熊辐射)
!counter 0x61 指示物(命运的囚人)
#setnames, using tab for comment
!setname 0x1 正义盟军 AOJ
!setname 0x2 次世代 ジェネクス
......@@ -1140,3 +1141,4 @@
!setname 0x179 兽带斗神 セリオンズ
!setname 0x17a 肆世坏 スケアクロー
!setname 0x17b 野蛮人 バーバリアン
!setname 0x17c 漫读使灵 Libromancer
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