Mascali
/
shapez
1
0
Fork 0
Code Issues Pull Requests Actions Projects Releases Wiki Activity

Merge branch 'master' into 180_deg_rotater

This commit is contained in:
RogiJAG 2020-07-19 11:15:30 -05:00
parent 9258a49010 c111d88dc9
commit 150bf718f7
36 changed files with 196 additions and 226 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
.github/workflows/ci.yml vendored
View File

@ -39,3 +39,8 @@ jobs:
- name: Lint
run: |
yarn lint
- name: YAML Lint
uses: ibiqlik/action-yamllint@v1.0.0
with:
file_or_dir: translations/*.yaml

4
.gitignore vendored
View File

@ -109,10 +109,6 @@ build
tmp_standalone_files
# Github Actions files
.github/workflows
# Local config
config.local.js
.DS_Store

185
.travis.yml
View File

@ -3,125 +3,124 @@ os: linux
dist: xenial
language: node_js
node_js:
- "10"
- "12"
cache: yarn
# platform specific configuration
jobs:
# jobs which have to succeed
include:
# OS: MAC
## -> build darwin
- name: "Standalone MacOS on MacOS"
os: osx
osx_image: xcode11.3
before_install:
- HOMEBREW_NO_AUTO_UPDATE=1 brew install git-lfs
- HOMEBREW_NO_AUTO_UPDATE=1 brew install ffmpeg
script:
- cd gulp
- yarn gulp build.standalone-prod || travis_terminate 1
- yarn gulp standalone.prepare
- yarn gulp standalone.package.prod.darwin64
- cd ..
# - name: "Standalone MacOS on MacOS"
# os: osx
# osx_image: xcode11.3
# before_install:
# - HOMEBREW_NO_AUTO_UPDATE=1 brew install git-lfs
# - HOMEBREW_NO_AUTO_UPDATE=1 brew install ffmpeg
# script:
# - cd gulp
# - yarn gulp build.standalone-prod || travis_terminate 1
# - yarn gulp standalone.prepare
# - yarn gulp standalone.package.prod.darwin64
# - cd ..
## -> build win
- name: "Standalone Windows on MacOS"
os: osx
osx_image: xcode11.3
before_install:
- HOMEBREW_NO_AUTO_UPDATE=1 brew install git-lfs
- HOMEBREW_NO_AUTO_UPDATE=1 brew install ffmpeg
- HOMEBREW_NO_AUTO_UPDATE=1 brew cask install wine-stable
# prevent Wine popup dialogs about installing additional packages
- export WINEDLLOVERRIDES="mscoree,mshtml="
- export WINEDEBUG="-all"
script:
- cd gulp
- yarn gulp build.standalone-prod || travis_terminate 1
- yarn gulp standalone.prepare
- yarn gulp standalone.package.prod.win64
- yarn gulp standalone.package.prod.win32
- cd ..
# - name: "Standalone Windows on MacOS"
# os: osx
# osx_image: xcode11.3
# before_install:
# - HOMEBREW_NO_AUTO_UPDATE=1 brew install git-lfs
# - HOMEBREW_NO_AUTO_UPDATE=1 brew install ffmpeg
# - HOMEBREW_NO_AUTO_UPDATE=1 brew cask install wine-stable
# # prevent Wine popup dialogs about installing additional packages
# - export WINEDLLOVERRIDES="mscoree,mshtml="
# - export WINEDEBUG="-all"
# script:
# - cd gulp
# - yarn gulp build.standalone-prod || travis_terminate 1
# - yarn gulp standalone.prepare
# - yarn gulp standalone.package.prod.win64
# - yarn gulp standalone.package.prod.win32
# - cd ..
## -> build linux
- name: "Standalone Linux on MacOS"
os: osx
osx_image: xcode11.3
before_install:
- HOMEBREW_NO_AUTO_UPDATE=1 brew install git-lfs
- HOMEBREW_NO_AUTO_UPDATE=1 brew install ffmpeg
script:
- cd gulp
- yarn gulp build.standalone-prod || travis_terminate 1
- yarn gulp standalone.prepare
- yarn gulp standalone.package.prod.linux64
- yarn gulp standalone.package.prod.linux32
- cd ..
# - name: "Standalone Linux on MacOS"
# os: osx
# osx_image: xcode11.3
# before_install:
# - HOMEBREW_NO_AUTO_UPDATE=1 brew install git-lfs
# - HOMEBREW_NO_AUTO_UPDATE=1 brew install ffmpeg
# script:
# - cd gulp
# - yarn gulp build.standalone-prod || travis_terminate 1
# - yarn gulp standalone.prepare
# - yarn gulp standalone.package.prod.linux64
# - yarn gulp standalone.package.prod.linux32
# - cd ..
# OS: LINUX
## -> build darwin
## not possible
## -> build win
- name: "Standalone Windows on Linux"
os: linux
addons:
apt:
packages:
- libavformat-dev
- libavfilter-dev
- libavdevice-dev
- ffmpeg
- wine
script:
- cd gulp
- yarn gulp build.standalone-prod || travis_terminate 1
- yarn gulp standalone.prepare
- yarn gulp standalone.package.prod.win64
- yarn gulp standalone.package.prod.win32
- cd ..
# - name: "Standalone Windows on Linux"
# os: linux
# addons:
# apt:
# packages:
# - libavformat-dev
# - libavfilter-dev
# - libavdevice-dev
# - ffmpeg
# - wine
# script:
# - cd gulp
# - yarn gulp build.standalone-prod || travis_terminate 1
# - yarn gulp standalone.prepare
# - yarn gulp standalone.package.prod.win64
# - yarn gulp standalone.package.prod.win32
# - cd ..
## -> build linux
- name: "Standalone Linux on Linux"
os: linux
addons:
apt:
packages:
- libavformat-dev
- libavfilter-dev
- libavdevice-dev
- ffmpeg
script:
- cd gulp
- yarn gulp build.standalone-prod || travis_terminate 1
- yarn gulp standalone.prepare
- yarn gulp standalone.package.prod.linux64
- yarn gulp standalone.package.prod.linux32
- cd ..
# - name: "Standalone Linux on Linux"
# os: linux
# addons:
# apt:
# packages:
# - libavformat-dev
# - libavfilter-dev
# - libavdevice-dev
# - ffmpeg
# script:
# - cd gulp
# - yarn gulp build.standalone-prod || travis_terminate 1
# - yarn gulp standalone.prepare
# - yarn gulp standalone.package.prod.linux64
# - yarn gulp standalone.package.prod.linux32
# - cd ..
# OS: WINDOWS
## -> build darwin
## not possible
## -> build linux
- name: "Standalone Linux on Windows"
os: windows
env: YARN_GPG=no
before_install:
- choco install git-lfs -y -f || echo "0" # choco fails but git-lfs is still installed
- choco install ffmpeg --version=4.2.3
- export PATH=/C/ProgramData/chocolatey/lib/ffmpeg/tools/ffmpeg/bin:$PATH
- wget https://github.com/moiamond/docker-ffmpeg-base-windowsservercore/raw/master/System32/avicap32.dll -P /C/Windows/System32/
- wget https://github.com/moiamond/docker-ffmpeg-base-windowsservercore/raw/master/System32/msvfw32.dll -P /C/Windows/System32/
script:
- cd gulp
- yarn gulp build.standalone-prod || travis_terminate 1
- yarn gulp standalone.prepare
- yarn gulp standalone.package.prod.linux64
- yarn gulp standalone.package.prod.linux32
- cd ..
# - name: "Standalone Linux on Windows"
# os: windows
# env: YARN_GPG=no
# before_install:
# - choco install git-lfs -y -f || echo "0" # choco fails but git-lfs is still installed
# - choco install ffmpeg --version=4.2.3
# - export PATH=/C/ProgramData/chocolatey/lib/ffmpeg/tools/ffmpeg/bin:$PATH
# - wget https://github.com/moiamond/docker-ffmpeg-base-windowsservercore/raw/master/System32/avicap32.dll -P /C/Windows/System32/
# - wget https://github.com/moiamond/docker-ffmpeg-base-windowsservercore/raw/master/System32/msvfw32.dll -P /C/Windows/System32/
# script:
# - cd gulp
# - yarn gulp build.standalone-prod || travis_terminate 1
# - yarn gulp standalone.prepare
# - yarn gulp standalone.package.prod.linux64
# - yarn gulp standalone.package.prod.linux32
# - cd ..
## -> build win
- name: "Standalone Windows on Windows"

6
.yamllint Normal file
View File

@ -0,0 +1,6 @@
extends: default
rules:
line-length:
level: warning
max: 200

1
src/js/changelog.js
View File

@ -6,7 +6,6 @@ export const CHANGELOG = [
"WIRES",
"Allow holding ALT in belt planner to reverse direction (by jakobhellermann)",
"Clear cursor when trying to pipette the same building twice (by hexy)",
"Allow binding TAB (by swtw7466)",
"Added keybinding to close menus (by isaisstillalive / Sandwichs-del)",
"Fix rare crash regarding the buildings toolbar (by isaisstillalive)",
"Fixed some phrases (by EnderDoom77)",

1
translations/base-ar.yaml
View File

@ -151,7 +151,6 @@ mainMenu:
savegameLevel: Level <x>
savegameLevelUnknown: Unknown Level
continue: Continue
newGame: New Game
madeBy: Made by <author-link>

2
translations/base-cat.yaml
View File

@ -154,8 +154,6 @@ mainMenu:
savegameLevel: Nivell <x>
savegameLevelUnknown: Nivell desconegut
dialogs:
buttons:
ok: OK

1
translations/base-cz.yaml
View File

@ -132,7 +132,6 @@ mainMenu:
savegameLevel: Úroveň <x>
savegameLevelUnknown: Neznámá úroveň
continue: Pokračovat
newGame: Nová hra
madeBy: Vytvořil <author-link>

2
translations/base-da.yaml
View File

@ -155,8 +155,6 @@ mainMenu:
savegameLevel: Level <x>
savegameLevelUnknown: Unknown Level
dialogs:
buttons:
ok: OK

1
translations/base-de.yaml
View File

@ -150,7 +150,6 @@ mainMenu:
savegameLevel: Level <x>
savegameLevelUnknown: Unbekanntes Level
helpTranslate: Hilf beim Übersetzen!
continue: Fortsetzen
newGame: Neues Spiel

1
translations/base-el.yaml
View File

@ -151,7 +151,6 @@ mainMenu:
savegameLevel: Level <x>
savegameLevelUnknown: Unknown Level
continue: Continue
newGame: New Game
madeBy: Made by <author-link>

2
translations/base-fi.yaml
View File

@ -155,8 +155,6 @@ mainMenu:
savegameLevel: Taso <x>
savegameLevelUnknown: Tuntematon Taso
dialogs:
buttons:
ok: OK

3
translations/base-fr.yaml
View File

@ -83,9 +83,6 @@ steamPage:
discordLink: Discord officiel - Parlez avec moi!
global:
loading: Chargement
error: Erreur

1
translations/base-hr.yaml
View File

@ -189,7 +189,6 @@ mainMenu:
# TODO
dialogs:
buttons:
ok: OK

1
translations/base-hu.yaml
View File

@ -151,7 +151,6 @@ mainMenu:
savegameLevel: <x>. szint
savegameLevelUnknown: Ismeretlen szint
continue: Continue
newGame: New Game
madeBy: Made by <author-link>

1
translations/base-it.yaml
View File

@ -151,7 +151,6 @@ mainMenu:
savegameLevel: Livello <x>
savegameLevelUnknown: Livello sconosciuto
continue: Continua
newGame: Nuova partita
madeBy: Creato da <author-link>

1
translations/base-ja.yaml
View File

@ -151,7 +151,6 @@ mainMenu:
savegameLevel: レベル <x>
savegameLevelUnknown: 不明なレベル
continue: 続きから
newGame: 新規ゲーム
madeBy: 制作者 <author-link>

1
translations/base-kor.yaml
View File

@ -150,7 +150,6 @@ mainMenu:
savegameLevel: 레벨 <x>
savegameLevelUnknown: 레벨 모름
continue: 계속하기
newGame: 새 게임
madeBy: 제작 <author-link>

1
translations/base-lt.yaml
View File

@ -151,7 +151,6 @@ mainMenu:
savegameLevel: Level <x>
savegameLevelUnknown: Unknown Level
continue: Continue
newGame: New Game
madeBy: Made by <author-link>

1
translations/base-nl.yaml
View File

@ -151,7 +151,6 @@ mainMenu:
savegameLevel: Level <x>
savegameLevelUnknown: Onbekend Level
continue: Verder
newGame: Nieuw Spel
madeBy: Gemaakt door <author-link>

1
translations/base-no.yaml
View File

@ -151,7 +151,6 @@ mainMenu:
savegameLevel: Nivå <x>
savegameLevelUnknown: Ukjent Nivå
continue: Fortsett
newGame: Nytt Spill
madeBy: Laget av <author-link>

1
translations/base-pl.yaml
View File

@ -156,7 +156,6 @@ mainMenu:
savegameLevel: Poziom <x>
savegameLevelUnknown: Nieznany poziom
madeBy: Gra wykonana przez <author-link>
subreddit: Reddit

3
translations/base-pt-BR.yaml
View File

@ -150,7 +150,6 @@ mainMenu:
savegameLevel: Nível <x>
savegameLevelUnknown: Nível desconhecido
helpTranslate: Ajude a traduzir!
continue: Continuar
newGame: Novo jogo
@ -300,7 +299,6 @@ ingame:
pipette: Conta-Gotas
switchLayers: Trocar Camadas
# Everything related to placing buildings (I.e. as soon as you selected a building
# from the toolbar)
buildingPlacement:
@ -551,7 +549,6 @@ buildings:
name: Misturador de Fios
description: Une dois fios de energia em um.
storyRewards:
# Those are the rewards gained from completing the store
reward_cutter_and_trash:

1
translations/base-pt-PT.yaml
View File

@ -151,7 +151,6 @@ mainMenu:
savegameLevel: Nível <x>
savegameLevelUnknown: Nível desconhecido
continue: Continuar
newGame: Novo Jogo
madeBy: Criado por <author-link>

1
translations/base-ro.yaml
View File

@ -151,7 +151,6 @@ mainMenu:
savegameLevel: Nivelul <x>
savegameLevelUnknown: Nivel necunoscut
continue: Continuă
newGame: Joc nou
madeBy: Făcut de <author-link>

1
translations/base-ru.yaml
View File

@ -152,7 +152,6 @@ mainMenu:
savegameLevel: Уровень <x>
savegameLevelUnknown: Неизвестный уровень
continue: Продолжить
newGame: Новая Игра
madeBy: Создал <author-link>

4
translations/base-sr.yaml
View File

@ -566,7 +566,7 @@ buildings:
default:
name: &energy_generator Generator
description: Pretvara oblike u energiju.
#TODO
#TODO
wire_crossings:
default:
name: &wire_crossings Razdelnik žica
@ -869,7 +869,7 @@ about:
title: O Igri
body: >-
Ova igra je otvorenog koda i napravljena je od strane <a href="https://github.com/tobspr" target="_blank">Tobias Springer</a> (to sam ja).<br><br>
#TODO
Ako želite da doprinesete razvoju, bacite pogled na <a href="<githublink>" target="_blank">shapez.io github</a>.<br><br>
Bez odlične discord zajednice ova igra, kao ni druge, ne bi postojala - Pridružite se <a href="<discordlink>" target="_blank">discord serveru</a>!<br><br>

1
translations/base-sv.yaml
View File

@ -151,7 +151,6 @@ mainMenu:
savegameLevel: Nivå <x>
savegameLevelUnknown: Okänd Nivå
continue: Fortsätt
newGame: Nytt spel
madeBy: Skapad av <author-link>

1
translations/base-tr.yaml
View File

@ -151,7 +151,6 @@ mainMenu:
savegameLevel: Seviye <x>
savegameLevelUnknown: Bilinmeyen seviye
continue: Devam et
newGame: Yeni Oyun
madeBy: Made by <author-link>

4
translations/base-uk.yaml
View File

@ -156,8 +156,6 @@ mainMenu:
savegameLevel: Level <x>
savegameLevelUnknown: Unknown Level
dialogs:
buttons:
ok: OK
@ -637,8 +635,6 @@ storyRewards:
desc: >-
This level gave you no reward, but the next one will! <br><br> PS: Better don't destroy your existing factory - You need <strong>all</strong> those shapes later again to <strong>unlock upgrades</strong>!
no_reward_freeplay:
title: Next level
desc: >-

6
translations/base-zh-CN.yaml
View File

@ -45,6 +45,7 @@
# Painter：上色机
# Trash：垃圾桶
---
steamPage:
# This is the short text appearing on the steam page
shortText: shapez.io 是一款在无边际的地图上建造工厂、自动化生产与组合愈加复杂的图形的游戏。
@ -178,9 +179,8 @@ mainMenu:
很抱歉, 本游戏在当前浏览器上可能运行缓慢! 使用chrome或者获取独立版以得到更好的体验。
savegameLevel: 第<x>关
savegameLevelUnknown: 未知关卡
savegameLevelUnknown:
未知关卡
# contestOver: This contest has ended - Join the discord to get noticed about new contests!
continue: 继续游戏
newGame: 新游戏

1
translations/base-zh-TW.yaml
View File

@ -178,7 +178,6 @@ mainMenu:
savegameLevel: Level <x>
savegameLevelUnknown: 未知關卡
continue: 繼續
newGame: 新遊戲
madeBy: 作者：<author-link>