Archives/tobspr_shapez.io
1
0
Fork 0
mirror of https://github.com/tobspr/shapez.io.git synced 2025-06-13 13:04:03 +00:00
Code Issues Projects Releases Wiki Activity
1,787 Commits 6 Branches 26 Tags 670 MiB
bd6fc395a1
Commit Graph

1787 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
David Triphon
8557d4523e Created helper method for getting appropriate mouse button value for camera panning as according to settings 2020-07-21 11:56:53 -07: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
tobspr
75c9d9d8fd
Merge pull request #478 from bjornstar/update-browser-sync 
Update browser-sync from v2.24.6 to v2.26.10
 2020-07-21 09:29:48 +02:00
tobspr
661746c898
Merge pull request #471 from RogiJAG/180_deg_rotater 
180 Degree Rotater Variant
 2020-07-21 09:25:36 +02:00
tobspr
b01e7c61d7
Merge pull request #470 from Moppler/bug/pipette-belts-wires 
Extend the pipette hack to work with belts and wires.
 2020-07-21 09:24:08 +02:00
Bjorn Stromberg
fa53a5d2e1 Update browser-sync from v2.24.6 to v2.26.10 2020-07-21 10:34:29 +09:00
David Triphon
0ca897bf86 Added a new setting that allows deleting while a building is selected. 2020-07-20 13:05:05 -07:00
David Triphon
958797d7c0 Fixed some mouse press/release action interaction conflicts. 2020-07-20 12:46:40 -07:00
David Triphon
0fc6e9ca2c Add the settings version updater to prevent failures when moving up versions. 2020-07-20 12:21:29 -07:00
David Triphon
a4082faea7 The middle click pan setting works! 
There are a few weird interactions, like when holding down middle click to pan, and then begin holding left click as well, the pan stops, but as soon as left click is released, as long as middle click is still held, the screen will jump as if it was still panning the same original middle click position.
middle clicking while in the middle of placing conveyors will stop the conveyor placement.
The behavior interaction between different click behaviors needs some polish.
 2020-07-20 11:57:30 -07:00
David Triphon
479c899a8e Attempted to migrate middle click to pan only and away from the main click code. Turning on setting breaks camera panning. 
Unsure about the correctness of the change. Still learning the code org.
 2020-07-19 15:02:31 -07:00
RogiJAG
150bf718f7 Merge branch 'master' into 180_deg_rotater 2020-07-19 11:15:30 -05:00
RogiJAG
9258a49010 remove debug statements 2020-07-19 11:11:58 -05:00
RogiJAG
adecb64447 Revert "add unlock on upgrade mechanic" 
This reverts commit 6dd3f2a439.

lease enter the commit message for your changes. Lines starting
 2020-07-19 10:47:47 -05:00
Moppler
ae5c33abd2 Extend the pipette hack to work with belts and wires. 2020-07-19 15:56:40 +01:00
tobspr
c111d88dc9 Merge branch 'master' of https://github.com/tobspr/shapez.io 2020-07-19 11:02:39 +02:00
tobspr
6ff26cacad Update travis 2020-07-19 11:02:37 +02:00
tobspr
aeda9ed7d0
Merge pull request #468 from Moppler/validate-translations 
Validate translations
 2020-07-19 11:00:25 +02:00
Moppler
e32926fa08 Add Yaml config and fif all errors 2020-07-19 09:40:52 +01:00
Moppler
96cde952a7 Disable strict checking as most translators work direct on github 2020-07-19 09:11:39 +01:00
Moppler
f77d31dd33 Enable strick checking 2020-07-19 08:43:23 +01:00