Archives/tobspr_shapez.io
1
0
Fork 0
mirror of https://github.com/tobspr/shapez.io.git synced 2024-10-27 20:34:29 +00:00
Code Issues Projects Releases Wiki Activity
1,303 Commits 6 Branches 26 Tags 670 MiB
cb1ff53338
Commit Graph

611 Commits

Author SHA1 Message Date
Bjorn Stromberg
cb1ff53338 Add TSLint to github actions, fix existing type errors 2020-07-22 11:15:16 +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
661746c898
Merge pull request #471 from RogiJAG/180_deg_rotater 
180 Degree Rotater Variant
 2020-07-21 09:25:36 +02: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
0a482972fd Fix build failing 2020-07-19 09:19:42 +02:00
BuildTools
c1a518f775 fix circular dependency 2020-07-18 20:46:42 -05:00
BuildTools
6dd3f2a439 add unlock on upgrade mechanic 2020-07-18 12:03:49 -05:00
Mr.Yawnie
93ac3f70be Added artwork and en translation, unlocks with CCW 2020-07-18 12:03:49 -05:00
RogiJAG
f77d47d9f7 Add fl rotater variant 2020-07-18 12:03:49 -05:00
tobspr
aed8c813c4
Merge pull request #459 from MrYawnie/patch-1 
Match belt/processor etc. level to upgrade tiers
 2020-07-18 14:42:57 +02:00
tobspr
051e04edd1 Minor css improvements 2020-07-18 14:41:34 +02:00
MrYawnie
68ebf07052
Changed "level" to "tier" for consistency 2020-07-18 17:41:16 +10:00
MrYawnie
efffa8940b
Match belt/processor etc. level to upgrade tiers 
Currently the belt (+ processor) levels do not match to the upgrade shop tiers. The tiers start from Tier 1, and once upgraded, they go to tier 2, 3, ... 7. So tier 7 is currently the highest.

However, the belt level starts from level 0, and increases to level 1 once upgraded. The maximum level is therefore 6.

This PR raises the start level of belts and other items to level 1, meaning the levels match the upgrade tiers in the shop.
 2020-07-17 16:11:22 +10:00
Blake Stephens
d81c9e80c9 Optimized some UI layers for fewer paints on interaction 2020-07-16 19:43:37 -07:00
tobspr
05716e6a74 Fix page not loading sometimes 2020-07-13 22:46:07 +02:00
tobspr
a08fef88f0
Merge pull request #416 from Astavie/master 
Add decimal separator option in translation files
 2020-07-07 19:40:27 +02:00
tobspr
9505eb8f49 Update local config 2020-07-07 19:34:00 +02:00
Astavie
900128ad32 comments and tabs 2: electric boogaloo 2020-07-07 16:51:40 +02:00
Astavie
e251a25bb7 comments and tabs 2020-07-07 16:42:39 +02:00
Astavie
fbe04c94aa linter, please like me 2020-07-07 16:38:33 +02:00
Astavie
1c2ccd3582 make the linter happy 2020-07-07 16:28:58 +02:00
Astavie
0caaa055aa decimal separator 2020-07-07 16:19:26 +02:00
tobspr
8a4edb442c Merge branch 'master' of https://github.com/tobspr/shapez.io 2020-07-07 13:17:38 +02:00
tobspr
a41a7099e6 Fix color mixing 2020-07-07 13:17:25 +02:00
tobspr
855570e74b Fix color mixing 2020-07-07 13:16:48 +02:00
tobspr
8f5c47dd49 Update themes 2020-07-07 09:18:42 +02:00
tobspr
d017362b23 Docs and update changelog 2020-07-07 09:16:45 +02:00
tobspr
e46dd4e00b
Merge pull request #403 from Danacus/master 
Fix preferred variant not getting saved when clicking on the hud
 2020-07-07 09:15:33 +02:00
tobspr
5dedb83d06 Minor fixes to the waypoints 2020-07-07 09:14:43 +02:00
tobspr
1dfbf3f780 Update changleog 2020-07-07 09:11:49 +02:00
tobspr
6f85d7c810
Merge pull request #397 from isaisstillalive/renameMarker 
Changed "Delete marker" to "Show rename (or delete) marker dialog"
 2020-07-07 09:11:28 +02:00
tobspr
7a6ebe4c9a Get rid of unused goal 2020-07-07 09:06:23 +02:00
tobspr
0d6b855253 Allow color inverter to process colors as well 2020-07-07 09:06:17 +02:00
tobspr
7257642223 Mixing white + black = gray 2020-07-07 08:47:14 +02:00
isaisstillalive
2722366d68 Commonize create and save confirm method 2020-07-07 09:15:33 +09:00
isaisstillalive
f1bcec65ad Refactor dialog title 2020-07-07 09:15:32 +09:00
isaisstillalive
1e1aa80568 Rename sort to sortWaypoints 2020-07-07 09:15:32 +09:00
isaisstillalive
b1fce1b115 Refactor dialog buttons 2020-07-07 09:15:27 +09:00
isaisstillalive
76fb637606 Adjust cancel button color 2020-07-07 08:22:53 +09:00
isaisstillalive
99c945e169 Change delete marker button to edit marker button 2020-07-07 08:22:53 +09:00
isaisstillalive
8acefda778 Show edit marker dialog instead deleting marker 2020-07-07 08:22:51 +09:00
isaisstillalive
d0d8314d81 Commonize sort method 2020-07-07 08:22:50 +09:00
isaisstillalive
1d44690482 Additional buttons can be set in Confirm dialog 2020-07-07 08:22:49 +09:00
tobspr
40674ef0d7 Fix wire splitter 2020-07-06 22:22:24 +02:00
tobspr
1f438e8c65 Minor art rework, update ratios 2020-07-06 22:14:45 +02:00
tobspr
feb10c3805 Minor fixes to mergers / splitters 2020-07-06 21:53:03 +02:00