Commit Graph

576 Commits

Author SHA1 Message Date
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
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
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
tobspr 04ea105584 Fix lots of bugs, add wire splitters / mergers 2020-07-06 21:33:37 +02:00
tobspr 54be64c0e2 Fix energy generator being not rotateable 2020-07-06 19:31:00 +02:00
Daan Vanoverloop a55172339b Merge branch 'master' of https://github.com/tobspr/shapez.io 2020-07-06 18:46:38 +02:00
Daan Vanoverloop 299b6c6302 Fix preferred variant not getting saved when clicking on the hud 2020-07-06 18:46:18 +02:00
tobspr 0bba6a9d79 Fix entity rendering bug when zooming out, add "Wires update" label to main menu 2020-07-06 18:36:10 +02:00
tobspr 989347d0ea Merge branch 'master' of https://github.com/tobspr/shapez.io 2020-07-06 14:48:11 +02:00
tobspr d87c9c9e1f Update changelog 2020-07-06 14:48:09 +02:00
tobspr f35558bb28
Merge pull request #367 from MizardX/planner-initial-direction
Initial planner direction based on cursor movement
2020-07-06 14:47:44 +02:00
tobspr 22cba96f6e Refactor debug overlay 2020-07-06 14:40:31 +02:00
tobspr c4d7e65d9f
Merge pull request #347 from dengr1065/debug-info
Improved debug info (position and version)
2020-07-06 14:21:32 +02:00
tobspr 756bcdb473 Fix tunnels entrances connecting to exits sometimes when they shouldn't 2020-07-06 14:19:46 +02:00
dengr1065 b61e0aac73
debug info - fix lint fail
github editor sucks without built-in prettier
2020-07-06 12:07:46 +03:00
dengr1065 f4c9c66354
debug info fixes 2020-07-06 12:02:31 +03:00
tobspr 4896e9b89e Clear selection when switching layers 2020-07-05 18:47:09 +02:00