Merge branch 'develop' into server-develop

.github/workflows/build.yml

@@ -437,8 +437,8 @@ jobs:
 
     - name: Copy premake files
       run: |
-        cp -r premake/* .
-        cp -r resource/* .
+        cp -pr premake/* .
+        cp -pr resource/* .
 
     - name: Use premake to generate make files (apt packages)
       if: matrix.static-link != true
@@ -664,8 +664,8 @@ jobs:
 
     - name: Copy premake files
       run: |
-        cp -r premake/* .
-        cp -r resource/* .
+        cp -pr premake/* .
+        cp -pr resource/* .
 
     - name: Use premake to generate make files (Homebrew packages)
       if: matrix.static-link != true

.gitlab-ci.yml

@@ -93,8 +93,9 @@ mat_windows:
 
 ._exec_build:
   stage: build
-  #variables:
-  #  NO_LUA_SAFE: '1' # on client no lua safe
+  variables:
+    # NO_LUA_SAFE: '1' # on client no lua safe
+    GIT_STRATEGY: clone
   #cache:
   #  key: "$CI_JOB_NAME-$CI_COMMIT_REF_SLUG"
   #  paths:

gframe/deck_manager.cpp

@@ -353,7 +353,7 @@ bool DeckManager::SaveDeck(const Deck& deck, const wchar_t* file) {
 		return false;
 	std::stringstream deckStream;
 	SaveDeck(deck, deckStream);
-	std::fwrite(deckStream.str().c_str(), 1, deckStream.str().length(), fp);
+	std::fputs(deckStream.str().c_str(), fp);
 	std::fclose(fp);
 	return true;
 }

gframe/game.cpp

@@ -273,7 +273,7 @@ bool Game::Initialize() {
 	SetWindowsIcon();
 	//main menu
 	wchar_t strbuf[256];
-	myswprintf(strbuf, L"KoishiPro %X.0%X.%X Manjushage", (PRO_VERSION & 0xf000U) >> 12, (PRO_VERSION & 0x0ff0U) >> 4, PRO_VERSION & 0x000fU);
+	myswprintf(strbuf, L"KoishiPro %X.0%X.%X Memes", (PRO_VERSION & 0xf000U) >> 12, (PRO_VERSION & 0x0ff0U) >> 4, PRO_VERSION & 0x000fU);
 	wMainMenu = env->addWindow(irr::core::rect<irr::s32>(370, 200, 650, 415), false, strbuf);
 	wMainMenu->getCloseButton()->setVisible(false);
 	btnLanMode = env->addButton(irr::core::rect<irr::s32>(10, 30, 270, 60), wMainMenu, BUTTON_LAN_MODE, dataManager.GetSysString(1200));

ocgcore @ ce8c6540

-Subproject commit d3deef2919e1d05c8e42303fb3aedbf256c91f3f
+Subproject commit ce8c654094247120ee83ed7f753d19d20539220b

script @ cdd2dcca

-Subproject commit 8fe1fd5e7562823492a1f13606d8390b30306f3a
+Subproject commit cdd2dcca643c7c48aa253461bb2d5752e01d7a48