From c746df3a06f4d832c715f35bcf9dbc5564843f72 Mon Sep 17 00:00:00 2001 From: tobspr Date: Mon, 30 May 2022 06:41:43 +0200 Subject: [PATCH 1/3] Update standalone status --- src/js/platform/browser/game_analytics.js | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/js/platform/browser/game_analytics.js b/src/js/platform/browser/game_analytics.js index aa0ac796..39ad6ee0 100644 --- a/src/js/platform/browser/game_analytics.js +++ b/src/js/platform/browser/game_analytics.js @@ -5,6 +5,7 @@ import { StaticMapEntityComponent } from "../../game/components/static_map_entit import { RegularGameMode } from "../../game/modes/regular"; import { GameRoot } from "../../game/root"; import { InGameState } from "../../states/ingame"; +import { SteamAchievementProvider } from "../electron/steam_achievement_provider"; import { GameAnalyticsInterface } from "../game_analytics"; import { FILE_NOT_FOUND } from "../storage"; @@ -63,6 +64,9 @@ export class ShapezGameAnalytics extends GameAnalyticsInterface { // Perform call to get a new key from the API this.sendToApi("/v1/register", { environment: this.environment, + standalone: + G_IS_STANDALONE && + this.app.achievementProvider instanceof SteamAchievementProvider, }) .then(res => { // Try to read and parse the key from the api From 7734cefc65b540ba878ed0994cd7804042171122 Mon Sep 17 00:00:00 2001 From: Norbiros <89837724+Norbiros@users.noreply.github.com> Date: Mon, 30 May 2022 06:43:12 +0200 Subject: [PATCH 2/3] Some new polish translations (#1421) --- translations/base-pl.yaml | 90 +++++++++++++++++++-------------------- 1 file changed, 45 insertions(+), 45 deletions(-) diff --git a/translations/base-pl.yaml b/translations/base-pl.yaml index e8c73a55..7362e607 100644 --- a/translations/base-pl.yaml +++ b/translations/base-pl.yaml @@ -1230,33 +1230,33 @@ tips: - Naciśnij F4 dwa razy, by zobaczyć kratkę twojej myszy i kamery. - Możesz kliknąć przypięty kształt po lewej stronie, by go odpiąć. puzzleMenu: - play: Play - edit: Edit - title: Puzzle Mode - createPuzzle: Create Puzzle - loadPuzzle: Load - reviewPuzzle: Review & Publish - validatingPuzzle: Validating Puzzle - submittingPuzzle: Submitting Puzzle - noPuzzles: There are currently no puzzles in this section. + play: Graj + edit: Edytuj + title: Tryb Puzli + createPuzzle: Stwórz zagadkę + loadPuzzle: Załaduj + reviewPuzzle: Oceń i opublikuj + validatingPuzzle: Sprawdzanie Puzzli + submittingPuzzle: Publikowanie Puzzli + noPuzzles: Nie ma żadnych puzli w tej kategori. categories: - levels: Levels - new: New - top-rated: Top Rated - mine: My Puzzles - easy: Easy - hard: Hard - completed: Completed - medium: Medium - official: Official - trending: Trending today - trending-weekly: Trending weekly - categories: Categories - difficulties: By Difficulty - account: My Puzzles - search: Search + levels: Levele + new: Nowe + top-rated: Najlepiej Ocenianie + mine: Moje Puzle + easy: Łatwe + hard: Trudne + completed: Skończone + medium: Średnie + official: Oficiale + trending: Popularne dzisiaj + trending-weekly: Popularne w tym tygodni + categories: Kategorie + difficulties: Po Trudności + account: Moje Puzle + search: Szukaj validation: - title: Invalid Puzzle + title: Niepoprawny Puzel noProducers: Please place a Constant Producer! noGoalAcceptors: Please place a Goal Acceptor! goalAcceptorNoItem: One or more Goal Acceptors have not yet assigned an item. @@ -1268,26 +1268,26 @@ puzzleMenu: autoComplete: Your puzzle autocompletes itself! Please make sure your constant producers are not directly delivering to your goal acceptors. difficulties: - easy: Easy - medium: Medium - hard: Hard - unknown: Unrated + easy: Łatwy + medium: Średni + hard: Trudny + unknown: Nieznany dlcHint: Purchased the DLC already? Make sure it is activated by right clicking shapez.io in your library, selecting Properties > DLCs. search: - action: Search - placeholder: Enter a puzzle or author name + action: Szukaj + placeholder: Podaj nazwę zagadki lub autora includeCompleted: Include Completed difficulties: - any: Any Difficulty - easy: Easy - medium: Medium - hard: Hard + any: Dowolna trudność + easy: Łatwy + medium: Średni + hard: Długi durations: - any: Any Duration - short: Short (< 2 min) - medium: Normal - long: Long (> 10 min) + any: Dowolna długość + short: Krótki (< 2 min) + medium: Normalny + long: Długi (> 10 min) backendErrors: ratelimit: You are performing your actions too frequent. Please wait a bit. invalid-api-key: Failed to communicate with the backend, please try to @@ -1315,13 +1315,13 @@ backendErrors: to remove it, please contact support@shapez.io! no-permission: You do not have the permission to perform this action. mods: - title: Mods - author: Author - version: Version - modWebsite: Website - openFolder: Open Mods Folder + title: Mody + author: Autor + version: Wersja + modWebsite: Strona + openFolder: Otwórz folder modów folderOnlyStandalone: Opening the mod folder is only possible when running the standalone. - browseMods: Browse Mods + browseMods: Szukaj Modów modsInfo: To install and manage mods, copy them to the mods folder within the game directory. You can also use the 'Open Mods Folder' button on the top right. From 50e92bb42f8ee11d64f61e49520507bb70704ac1 Mon Sep 17 00:00:00 2001 From: tobspr Date: Mon, 30 May 2022 07:00:14 +0200 Subject: [PATCH 3/3] Fix tobspr-osx-sign issues --- gulp/package.json | 4 +++- gulp/standalone.js | 8 +++++++- gulp/yarn.lock | 1 - 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/gulp/package.json b/gulp/package.json index 73f21c52..a212f3f6 100644 --- a/gulp/package.json +++ b/gulp/package.json @@ -112,9 +112,11 @@ "postcss-unprefix": "^2.1.3", "sass-unused": "^0.3.0", "strip-json-comments": "^3.0.1", - "tobspr-osx-sign": "^1.0.1", "trim": "^0.0.1", "webpack-stream": "^5.2.1", "yaml-loader": "^0.6.0" + }, + "optionalDependencies": { + "tobspr-osx-sign": "^1.0.1" } } diff --git a/gulp/standalone.js b/gulp/standalone.js index 54a07a11..ecd393a2 100644 --- a/gulp/standalone.js +++ b/gulp/standalone.js @@ -8,7 +8,13 @@ const fse = require("fs-extra"); const buildutils = require("./buildutils"); const execSync = require("child_process").execSync; const electronNotarize = require("electron-notarize"); -const { signAsync } = require("tobspr-osx-sign"); + +let signAsync; +try { + signAsync = require("tobspr-osx-sign").signAsync; +} catch (ex) { + console.warn("tobspr-osx-sign not installed, can not create osx builds"); +} function gulptasksStandalone($, gulp) { const targets = [ diff --git a/gulp/yarn.lock b/gulp/yarn.lock index 22d619a3..f82b3204 100644 --- a/gulp/yarn.lock +++ b/gulp/yarn.lock @@ -12342,7 +12342,6 @@ to-through@^2.0.0: through2 "^2.0.3" tobspr-osx-sign@^1.0.1: - name electron-osx-sign version "1.0.1" resolved "https://registry.yarnpkg.com/tobspr-osx-sign/-/tobspr-osx-sign-1.0.1.tgz#5cca32185d813357b556a6a839305558656c45d5" integrity sha512-jXSw9n/ivAnHwwpImvHnTkhbeI06ZDvLKLP3rryZLBoAt1nfljoIEgdPz7vNlOUBGwVEYOl2VauViNOmZPNZ7A==