Commit Graph

704 Commits

Author SHA1 Message Date
tobspr f65b3728ed Improve wire auto-connect 2020-08-12 20:11:24 +02:00
tobspr f16ab2389a initial take on wire auto-rotation 2020-08-11 20:02:59 +02:00
tobspr a32c0530bb Refactor rotation overview matrices 2020-08-11 18:50:43 +02:00
tobspr 850461df8f Further take on logic wires 2020-08-11 18:40:09 +02:00
tobspr 5708ef385c Fix entities being incorrectly restored 2020-08-11 13:31:27 +02:00
tobspr 20718ca05c Fix tslint 2020-08-11 13:29:47 +02:00
tobspr b19b87a6c8 Improve map overlay rendering and raise zoom limit 2020-08-11 13:17:39 +02:00
tobspr c1b1564d76 Fix crc generation 2020-08-10 23:34:30 +02:00
tobspr 2203d5fc6a Improve saving speed by using crc32 instead of sha1 for checksum 2020-08-10 23:31:02 +02:00
tobspr 9701a143ec Only store changed properties for all components 2020-08-10 22:53:02 +02:00
tobspr bb431b8490 Reduce savegame size by not storing the tileSize in the static entity 2020-08-10 22:13:26 +02:00
tobspr 8d329990ef Fix item filters being ignored 2020-08-10 22:04:38 +02:00
tobspr d2077f5009 Fix building placer not showing slots properly 2020-08-10 21:36:46 +02:00
tobspr 93975df4d5 Get rid of item ejector / acceptor layers and new wires buildings for now 2020-08-10 21:24:58 +02:00
tobspr 89294c7072 Remove instant eject flag 2020-08-10 20:32:45 +02:00
tobspr b3b8da04a1 Refactor belt underlay feature into seperate component 2020-08-10 20:26:47 +02:00
tobspr f91e677f2e Fix item animations not working for belts 2020-08-10 20:17:18 +02:00
tobspr 08a5b9070d Simplify hub component 2020-08-10 20:09:04 +02:00
tobspr b3fffe340d Cleanup worker 2020-08-10 19:56:56 +02:00
tobspr ecbf9d7e78 Revert worker loader change 2020-08-10 19:54:11 +02:00
tobspr 64b983b94e Try to fix webworker bug - Attempt 2 2020-08-10 19:46:41 +02:00
tobspr 0d555e22c7 Add further logging to worker 2020-08-10 19:42:10 +02:00
tobspr 1802e545d4 Minor syntax change 2020-08-10 15:27:40 +02:00
tobspr 2ee4f2efc7 Add more logging 2020-08-10 15:22:02 +02:00
tobspr e0ba1452b2 Start to work on logical pins 2020-08-10 15:02:49 +02:00
tobspr 6f28aff78f Vastly improve belt performance 2020-08-10 15:02:14 +02:00
asquared31415 868cd7baf5
Mock V1000 StaticMapEntity (#550) 2020-08-10 07:38:05 +02:00
Bjorn Stromberg 79158e2b56
Remove unused code (#526) 2020-08-06 11:28:28 +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
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
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
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
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
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
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
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