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,527 Commits 6 Branches 26 Tags 670 MiB
245734c905
Commit Graph

1527 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Exund
245734c905 Removed monkey-patching 2020-09-16 17:52:18 +02:00
Exund
9ee7b642bc Merge remote-tracking branch 'origin/master' into GeoZ 2020-09-13 22:49:45 +02:00
tobspr
0377c6d58f Highlight connected miners, improve miner performance 2020-09-13 18:39:06 +02:00
tobspr
3529a5d77f Fix tslint 2020-09-13 11:19:16 +02:00
tobspr
d4b6a2b34e Make waypoint list scrollable 2020-09-13 09:31:41 +02:00
tobspr
10507b735a Update settings version and changelog 2020-09-13 09:22:17 +02:00
Exund
3741934b39
Add a setting to disable picking the miner when on a resource patch (#649) 
* Add a setting to disable picking the miner when on a  resource patch

* Fix that one space :D

Linter go brrrr

Co-authored-by: dengr1065 <dengr1065@gmail.com>
 2020-09-13 09:19:53 +02:00
TheSlaylord
9c0512318f
Update base-ru.yaml (#647) 2020-09-13 09:19:22 +02:00
Yuto Tanaka
973e0776e7
Fix typo (#640) 2020-09-13 09:18:56 +02:00
Scott Miller
9a93021497
Update base-en.yaml (#641) 
Fix tooltip grammar
 2020-09-13 09:18:28 +02:00
Prosta4okua
c54a27be60
Update Ukrainian translation (#635) 
* Update base-uk.yaml

* Update base-uk.yaml
 2020-09-13 09:17:40 +02:00
mini-bomba
8fb191f7bb
Polished the polish translation. (#634) 2020-09-13 09:17:25 +02:00
LordJakson
7fc0232498
Update base-de.yaml (#624) 
* Update base-de.yaml

Unklare Tastenbelegungen besser beschrieben

* Update base-de.yaml

Großschreibung angepasst
 2020-09-13 09:15:32 +02:00
tobspr
3fd2fe9f6b Fix french translation 2020-09-13 09:14:46 +02:00
Withers001-1
c0a5ae14a3
Performance settings section translation (#622) 
Added the translation for the new settings performance-related in the Alpha, and made part of the file look cleaner.
 2020-09-13 09:14:01 +02:00
tobspr
0e1e595531 Update changelog 2020-09-13 09:13:15 +02:00
tobspr
4219f5062b Replaced level completion sound to be less distracting 2020-09-13 09:13:10 +02:00
tobspr
2740674053 Update changelog 2020-09-13 09:05:13 +02:00
tobspr
a24e7b8d33 Properly hide some hud elements when hovering 2020-09-13 09:05:05 +02:00
Matthew Bonsall
87f79a6c25
Change opacity on hover (#621) 
* Change opacity on hover

* Modify Tutorial
 2020-09-13 08:44:15 +02:00
Der Feldspatz
4b45cce74d
Update base-de.yaml (#617) 
* Update base-de.yaml

Typos, Grammar. Alternative translation for new volume feature.

* Update base-de.yaml

* Update base-de.yaml

* Update base-de.yaml

Purple got changed to Magenta, so it get's changed here as well
 2020-09-13 08:43:34 +02:00
CandyCrystal
4058d19aa8
Update base-no.yaml (#616) 
Fixed spelling errors and translated missing strings!
 2020-09-13 08:43:05 +02:00
Oein
5228130ce7
Update base-kor.yaml (#614) 2020-09-13 08:42:49 +02:00
tobspr
05d819ef93 Move comment 2020-09-13 08:42:29 +02:00
Andrea Nardecchia
fbd478af93
Update base-it.yaml (#618) 
* Update base-it.yaml

Completed the italian translation.
SHOULD be free of typos
Made some changes to some choices made by other translator to make everything uniform (mainly fixing stuff having different names in different sections or changing the name of some machines to be feminine to flow better)
Notable things to check:
Line 329 Not sure if ":" breaks the sintax
Line 412 Should purple be changed to magenta?
Line 526 Not completely satisfied with this, might need rephrasing

* Update base-it.yaml

Fixed yaml errors, same changes as previous commit

* Update base-it.yaml

Fixed more yaml errors and adressed issues from the review.

* Update base-it.yaml

* Update base-it.yaml

Catched a missed translation.
Noticed a translation error from a previous translation
 2020-09-13 08:41:56 +02:00
jakob753951
ef16813dc3
Update base-da.yaml (#615) 2020-09-13 08:41:25 +02:00
tobspr
6042fcba62 Properly implement sound and music volumes, debounce writes 2020-09-13 08:40:56 +02:00
Exund
bf2d5f333c Custom wire processor + building variants fixes 2020-09-12 22:11:25 +02:00
Exund
d887c8dcd8 Entity debugger style changes 2020-09-12 13:49:46 +02:00
Exund
64b2cea19f Internal test mod update 2020-09-12 00:50:24 +02:00
Exund
7eee790ec5 Debug sprite fix 2020-09-12 00:50:01 +02:00
Exund
7261bddf4c Fix loading order 2020-09-12 00:49:36 +02:00
Exund
b87b642627 Main menu styling 2020-09-10 01:50:17 +02:00
Exund
6a28fa3b66 Loading fixes 2020-09-10 01:45:55 +02:00
Exund
dcda551233 Internal test mod update 2020-09-10 00:05:54 +02:00
Exund
4899651ebd Processors speed upgrades 2020-09-10 00:05:08 +02:00
Exund
6612a58ff5 Shapes support (taken from Dimava's MODZ with slight modifications) 2020-09-10 00:04:25 +02:00
Exund
ee0770ec0b Better buildings support 2020-09-10 00:01:23 +02:00
Exund
3b4417ba0b GeoZ base 
Working Buildings base
 2020-09-09 02:30:35 +02:00
Exund
76a05a5776 Changes to allow more flexibility 2020-09-09 02:03:23 +02:00
Exund
96c5915660 Changes to allow more flexibility 2020-09-08 19:32:33 +02:00
Exund
f0cf3a2fda Keybindings as Setting state + webpack/gulp watch 2020-09-07 21:42:32 +02:00
Exund
c61dd2f9c2 Merge remote-tracking branch 'Dimava/fix/debug-settings' into GeoZ 2020-09-07 20:01:00 +02:00
Yoshie2000
50e40888fd
Music & Sound volume sliders in the settings menu (#611) 
* Added music & sound volume sliders in the settings menu

* Changed the order of the sound options in the settings menu

* Fixed the formatting, removed extra semicolon

* Removed a bad character

* Update base-en.yaml

* Updated base-en.yaml

* Removed trailing spaces

* Type safety fixes

* Replaced logical XOR (^) with !==
 2020-08-31 15:46:21 +02:00
tobspr
05cedc965a Merge branch 'master' of https://github.com/tobspr/shapez.io 2020-08-31 12:00:08 +02:00
tobspr
04b8b62045 Update local config 2020-08-31 12:00:06 +02:00
Ryan Liptak
bdb08f67d8
Show that chainable miners can connect to eachother during placement (#613) 
Removes the red X when placing a chainable miner feeding into another chainable miner, and instead shows it as a green arrow.
 2020-08-31 11:57:51 +02:00
Der Feldspatz
5c105d8096
Update base-de.yaml (#609) 
The store description got changed back to an older version in the last PR. That one included various mistakes, so I fixed them. There is also some rearrangement in the shortcut section, so it matches the english base again. Also changed the `noShapesProduced` translation so the message makes at least some sense for all 3 tabs in statistics window. (You could implement different messages for them, so they make sense). Feel free to review and discuss!
 2020-08-31 08:18:59 +02:00
tobspr
244cede010 Make logic gates output empty if there is a conflict 2020-08-30 16:12:01 +02:00
tobspr
f667329572 Fix savegame serialization 2020-08-30 15:56:30 +02:00