Mascali
/
shapez.io
Archived
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
1,750 Commits 2 Branches 0 Tags 543 MiB
Commit Graph

1750 Commits

Author SHA1 Message Date
Bjorn Stromberg 3e43fef6c4
Fix YAML Lint Failures (#548) 
* Copy/paste en back over ar, there were no translations

* Sync cat with en

* Coffee hadn't kicked in and I fixed a bunch of warnings instead of errors, oh well.

* Fix base-uk.yaml

* Fix base-hu

* Fix base-da
 2020-08-10 07:35:32 +02:00
Bjorn Stromberg 41c2cdeb81
There's no need to use npx in npm scripts (#555) 2020-08-10 07:33:25 +02:00
Roland Szabó a074d2ae24
Hungarian Translation (#546) 
* Hungarian translation #1

* Hungarian translation #2

* Trying to please TSLint

Fixing Linter issues
 2020-08-07 09:22:28 +02:00
LucasLista 9088aa5f65
Danish translations (#543) 2020-08-07 09:19:28 +02:00
Prosta4okua 6a0897e1cf
[Translation] Update base-uk.yaml (#536) 
* Update base-uk.yaml

* Update base-uk.yaml
 2020-08-07 09:18:01 +02:00
Bjorn Stromberg 997fabd52c
Remove more unused dependencies (#527) 
* Remove more unused dependencies

* Remove gulp-jsbeautifier
 2020-08-07 09:16:23 +02:00
Julian Simioni a44ec7182a
Minor English wording improvements (#510) 
* Minor English wording improvements

* Update translations/base-en.yaml

Co-authored-by: Bjorn Stromberg <bjorn@bjornstar.com>

Co-authored-by: tobspr <tobspr@users.noreply.github.com>
Co-authored-by: Bjorn Stromberg <bjorn@bjornstar.com>
 2020-08-07 09:14:24 +02:00
Bjorn Stromberg 79158e2b56
Remove unused code (#526) 2020-08-06 11:28:28 +02:00
Rowlet be79766cdd
Added spaces, corrected punctuation (#525) 
- Added spaces when Chinese characters surround English Characters.

e.g.
按住CTRL键
becomes
按住 CTRL 键

- Capitalised proper nouns in English.
- Changed English punctuation marks (halfwidth) to Chinese punctuation marks (fullwidth)

e.g.
! becomes ！
 2020-08-06 11:25:41 +02:00
Oblivo c7f95791af
Update base-ja.yaml (#523) 
Added some translations for the upcomming wire update:
(414) black -> 黒
(494) Rotate (180) -> 回転機（180）
(495) Rotates shapes by 180 degrees. -> 形を180度回転します。
(536) Accepts a color or shape and inverts it. -> 入力された色や形の色を反転します。
(541) Energy generator -> エネルギー発電機
(542) Generates energy by consuming shapes.　-> 入力された形を使って、エネルギーを発電します。
(545) Wire Splitter -> ワイヤー分配機
(546) Splits a energy wire into two. -> 1つのワイヤーを２つのワイヤーに分配します。
(548) Wire Merger -> ワイヤー合流機
(549) Merges two energy wires into one. -> 2つのワイヤーを1つのワイヤーに合流します。
 2020-08-06 11:24:19 +02:00
Matheus Protzen ab11dc1ffe
Update base-pt-BR.yaml (#520) 
* Update base-pt-BR.yaml

* Update base-pt-BR.yaml

* Update base-pt-BR.yaml
 2020-08-06 11:24:06 +02:00
GwenaelleH 731262e11a
Update base-fr.yaml (#519) 
Changed the translation of "language" by "langue" instead of "langage"
 2020-08-06 11:23:49 +02:00
Pandarkricci 1127a2c50e
Update base-fr.yaml (#518) 2020-08-06 11:23:32 +02:00
moonheart08 c0b905b74a
Add support for a 75hz simulation target (#517) 
Entirely untested, I just wanted to avoid having it sit as an issue forever and as such just quickly added it with the github editor. Someone actually check it please. 😅
 2020-08-06 11:21:26 +02:00
Bjorn Stromberg f79578a993
Make CI green by hiding the problem behind a sign that says FIXME (#515) 2020-08-06 11:21:12 +02:00
Killgaru 9ca0b45bf9
Russian translation updated (#507) 2020-08-06 11:16:46 +02:00
dedi400 19b0531b5a
Update base-hu.yaml (#505) 
* Update base-hu.yaml

* Update base-hu.yaml
 2020-08-06 11:16:33 +02:00
Dimava 235c380de1
fix pippete throws on empty hand (#512) 2020-07-29 09:17:45 +02:00
tobspr baf5c83b34 Merge branch 'master' of https://github.com/tobspr/shapez.io 2020-07-27 17:14:32 +02:00
tobspr bf2eee908f Refactor static map entity component to store building metaclass 2020-07-27 17:14:29 +02:00
tobspr 567db72538 Update ui artwork 2020-07-27 17:10:18 +02:00
Bjorn Stromberg d2f9fd6ec8
Improve types for web workers (#502) 
* Improve types for web workers

* Move worker-loader config inline

* Remove trailing spaces in translations
 2020-07-27 17:06:12 +02:00
Bjorn Stromberg bcc094e480
Remove trailing spaces in translations (#504) 2020-07-27 17:05:31 +02:00
tobspr 75be9796f9 Update artwork 2020-07-27 14:32:15 +02:00
tobspr 7341321d97 Redo wire splitter / mergers 2020-07-27 14:25:22 +02:00
tobspr 94c59e0e33 Revert "Fix layer handling in cutter (#352)" 
This reverts commit 97870da048.
 2020-07-27 13:49:46 +02:00
tobspr 2d54b72882 Add checks to stacking logic 2020-07-27 13:49:40 +02:00
oguz523 58a4543c29
Translating Game to Turkish (#498) 
* Translating Game to Turkish

- Adding "tr" object in language.js for setting appereance in game.
- Updating base-tr.yaml

* Minor Translation Fix
 2020-07-27 11:19:23 +02:00
Gumball73 bcf75e152e
Updated pt-pt translation to the latest version (#495) 
Co-authored-by: tobspr <tobspr@users.noreply.github.com>
 2020-07-27 11:18:05 +02:00
chaow108 c4f6c8285f
Update simplified Chinese translation (#493) 
* Simplified Chinese translation

Cover some missed text that I already played.

* Minor fix
 2020-07-27 11:16:49 +02:00
nukuuu 1509d4994b
Updated PT-PT translation to the latest version (#488) 2020-07-27 11:16:30 +02:00
Bjorn Stromberg c47c7e0329
Let's explicitly list yarn as a devDependency (#487) 2020-07-27 11:16:16 +02:00
Bjorn Stromberg 6d01c482d8
[Perf] Avoid iterating over keys to generate assert message (#486) 
* Avoid iterating over keys to generate assert message

* Move assertion call behind guard

* Shorten line by using string template
 2020-07-27 11:15:59 +02:00
Prosta4okua 2be3eae2aa
[WIP] Update base-uk.yaml (#418) 
* Update base-uk.yaml

* Updating

* Update base-uk.yaml

* Update base-uk.yaml

* Update base-uk.yaml

* Update base-uk.yaml

* Update base-uk.yaml

* Update base-uk.yaml

* Update base-uk.yaml
 2020-07-27 11:14:08 +02:00
Rodrigo Neves 52baa773db
Readme small typo :) (#500) 2020-07-27 11:12:36 +02:00
Bjorn Stromberg 3bae1c8ec3
Remove sloc, it appears to be unused. (#503) 2020-07-27 11:07:25 +02:00
cyantree 97870da048
Fix layer handling in cutter (#352) 
* Fix layer handling in cutter

* Remove unused variable in `cloneFilteredByquadrants()`

* Rework check in `isValidShortKeyInternal()` to being an early return

* Support empty layers in `isValidShortKeyInternal()` which aren't the topmost layer
 2020-07-26 23:11:06 +02:00
hexagonhexagon ef574c0bfe
Redo stacking algorithm (#138) 
* Change stacking algorithm to keep shapes whole rather than splitting by layer.

* Ensure that layerToMergeAt is not less than 0.
 2020-07-26 23:09:50 +02:00
tobspr 209fc76fc7 Update ui design 2020-07-23 09:07:51 +02:00
dengr1065 2df1b8d014
Major ui changes (#482) 
* "discord" -> "Discord", sync most translations

* that major settings update you'll like

* Finish new settings, add logo to about page

* sync & format translations
 2020-07-23 08:48:23 +02:00
PascalGrosse db52e0400b
Updated french translation + fixed typos (#483) 
* Updated french translation

* Fixed small typo

* Added missing space between words

Co-authored-by: Pascal Grossé <pascal.grosse@gmail.com>
 2020-07-23 08:39:28 +02:00
tobspr d73c07a804
Merge pull request #481 from bjornstar/fix-ts 
Add TSLint to github actions, fix existing type errors
 2020-07-23 08:36:35 +02:00
tobspr 230b953326
Merge pull request #480 from FilipZhong/patch-1 
Update base-sv.yaml
 2020-07-23 08:35:16 +02:00
tobspr 720e26a9a0
Merge pull request #479 from bjornstar/update-webpack 
Update webpack from v4.31.0 to v4.43.0
 2020-07-23 08:34:50 +02:00
Bjorn Stromberg ebedb9c227 Build translations before linting 2020-07-22 13:23:49 +09:00
Bjorn Stromberg cb1ff53338 Add TSLint to github actions, fix existing type errors 2020-07-22 11:15:16 +09:00
FilipZhong b01488b110
Update base-sv.yaml 
Fixed some Swedish grammar, may fix more in the future
 2020-07-21 18:04:15 +02:00
Bjorn Stromberg 3af36c5948 - Update webpack from v4.31.0 to v4.43.0 
- Update webpack-stream from v5.1.0 to v5.2.1
- Remove webpack-stream from shapez.io
 2020-07-21 21:41:13 +09:00
tobspr 79e7fb31b9 Merge branch 'master' of https://github.com/tobspr/shapez.io 2020-07-21 10:14:08 +02:00
tobspr 35018d2778 Minor css improvements 2020-07-21 10:14:06 +02:00