Skip to content

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

Merge branch 'server' into server-develop

parents 2ece2dc1 2231771d
Hide whitespace changes
Inline Side-by-side
Showing with 5 additions and 3 deletions
.gitlab-ci.yml
View file @ 5f989ca5
...@@ -47,6 +47,7 @@ mat_linux: ...@@ -47,6 +47,7 @@ mat_linux:
stage: prepare stage: prepare
tags: tags:
- linux - linux
image: git-registry.myard.moe/mycard/docker-runner-base:debian11
script: script:
- apt update; apt -y install git wget tar - apt update; apt -y install git wget tar
- git clone --depth=1 https://code.mycard.moe/mycard/irrlicht-new irrlicht - git clone --depth=1 https://code.mycard.moe/mycard/irrlicht-new irrlicht
...@@ -109,6 +110,7 @@ exec_linux: ...@@ -109,6 +110,7 @@ exec_linux:
extends: ._exec_build extends: ._exec_build
tags: tags:
- linux - linux
image: git-registry.myard.moe/mycard/docker-runner-base:debian11
dependencies: dependencies:
- mat_common - mat_common
- mat_linux - mat_linux
......
cards.cdb
View file @ 5f989ca5
No preview for this file type
gframe/game.cpp
View file @ 5f989ca5
...@@ -275,7 +275,7 @@ bool Game::Initialize() { ...@@ -275,7 +275,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 GIGALODOON", PRO_VERSION >> 12, (PRO_VERSION >> 4) & 0xff, PRO_VERSION & 0xf); myswprintf(strbuf, L"KoishiPro %X.0%X.%X DADADADA", 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 @ 53940410
Subproject commit 81c18bf41cf70d6d93fef43cdae0688c55815b6e Subproject commit 53940410bcb65ab5834fbdf0f0fa981a8b8cfa2a
script @ d586ed33
Subproject commit 1d2d1103800b77b7e17ccfcd207ce6fb7321ddf3 Subproject commit d586ed33029906f56e07084a72e25b5a8b195d57
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