Commit Graph

906 Commits

Author SHA1 Message Date
tobspr 1ebfafd8de Further performance improvements, show indicator while game is saving 2020-09-18 20:41:40 +02:00
tobspr bba29b8a8b Improve (rendering-) performance in DEV mode 2020-09-18 19:51:15 +02:00
tobspr 0238de1260 Minor performance improvements, improve underground belt performance 2020-09-18 19:21:12 +02:00
tobspr 746f4935ad Improve item ejector system 2020-09-18 18:32:53 +02:00
tobspr c0c624135b Fix belt underlays 2020-09-18 18:20:18 +02:00
tobspr b8f27aec44 Proper belt underlays for splitters 2020-09-18 18:18:38 +02:00
tobspr 16902bed8d Rename belt_base -> belt, minor refactorings 2020-09-18 12:55:46 +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
tobspr 0e1e595531 Update changelog 2020-09-13 09:13:15 +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
tobspr 6042fcba62 Properly implement sound and music volumes, debounce writes 2020-09-13 08:40:56 +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
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
tobspr b248c4d1f5 Show 2 digits in item processor 2020-08-30 15:44:19 +02:00
tobspr 3e0f42e47c Make belt readers store their last read item 2020-08-30 15:35:47 +02:00
tobspr 9b8745535b Refactor item processor to use charges and thus be more correct, even at low tick rates 2020-08-30 15:31:53 +02:00
tobspr 091401e52b Store wires state on save 2020-08-29 23:38:49 +02:00
tobspr b478f4be63 Store lever state 2020-08-29 23:20:03 +02:00
tobspr 5ec50678b0 Fix typo 2020-08-29 23:06:14 +02:00
tobspr 270f51d9ec Increase tier 2 tunnel range to 9 2020-08-29 23:05:34 +02:00
tobspr bca379ee89 Add setting to show chunk borders 2020-08-29 22:52:52 +02:00
tobspr 49ea6fc381 Fix typo and typings 2020-08-29 22:37:44 +02:00
tobspr 78fe34840a Fix buildings not working at their advertised speed, closes #440, closes #442, closes #437, closes #449 2020-08-29 22:35:30 +02:00
tobspr 12892dcf54 Improve visibility of color items 2020-08-29 21:45:32 +02:00
tobspr cf0f02826b Make comparer compare shapes, colors and booleans 2020-08-29 21:40:57 +02:00
tobspr 238b08d4d1 Make shapes truthy 2020-08-29 11:08:30 +02:00
tobspr b210db2361 Revert item filter behaviour 2020-08-29 10:45:38 +02:00
tobspr 06e276f021 Add belt reader building 2020-08-29 10:38:23 +02:00
tobspr bb739c80fa Rework quad painter and filter, rework logic gates 2020-08-29 09:35:14 +02:00
dengr1065 5487ec9818
"Logic pain fix" - Fixing quad painter pain... (#607)
* (wip) 4-painter accept pins

* fix everything

* finish 4-painer fix

* refactor processing requirement
2020-08-29 07:56:47 +02:00
tobspr ec830ed5bc minor refactoring 2020-08-28 23:12:12 +02:00
tobspr 7a4fcb5c99 Prevent rendering selection outline twice 2020-08-28 23:11:56 +02:00
tobspr 707323591b Fix crash on constant signal dialog 2020-08-28 23:10:07 +02:00
tobspr 807deaa705 Fix wires not showing placement indicator properly 2020-08-28 23:06:10 +02:00
tobspr e70f30ed17 Fix wires toolbar not being hidden when pressing f2 2020-08-28 23:00:09 +02:00
tobspr a67448fbdf Fix being able to create constant signals without value 2020-08-28 22:56:56 +02:00
tobspr 7cbe5bb8e7 Reverse order of shapes in shape info 2020-08-28 22:48:47 +02:00
tobspr 5336467838 statistics are now shown in shapes / second instead of shapes / minute 2020-08-28 22:41:13 +02:00
tobspr 5076c03dab Fixed rotated levers not being rendered correctly 2020-08-28 22:25:31 +02:00
tobspr e04fcceecc Fix icons in dark mode, fix long savegame names 2020-08-28 22:22:29 +02:00
tobspr 728f4ae253 Allow naming savegames 2020-08-28 22:15:12 +02:00
tobspr a095cd6324 Allow rotating levers 2020-08-28 21:57:29 +02:00
TrapperHell 3f497c5b47
- Minor adjustments in English translation of game and adjust casing of product names (#593)
- Fix comment typo
2020-08-28 21:37:15 +02:00
tobspr 5459e6470b Add 1x1 compact splitters 2020-08-28 21:28:29 +02:00
tobspr b6328cd9a0 Update changelog 2020-08-28 21:18:18 +02:00
tobspr 8ba6517591 Mark pinned shapes in statistics dialog 2020-08-28 21:17:07 +02:00
tobspr e6b5f8d2ed Added setting to be able to delete buildings while placing, closes #45 2020-08-28 21:05:20 +02:00
tobspr 389ce28e7a Minor css adjustments to the statistics dialog 2020-08-28 20:58:42 +02:00
tobspr bfe2795677 Merge branch 'master' of https://github.com/tobspr/shapez.io 2020-08-28 20:56:04 +02:00
tobspr cda31732b1 Fix rendering bug 2020-08-28 20:56:02 +02:00
Ryan Liptak 4bcef8e725
Add button to toggle sortedness of the statistics screen (#590) 2020-08-24 20:51:29 +02:00
tobspr 93f9d7ae23 Fix cutter 2020-08-18 20:12:18 +02:00
tobspr 1a6c91f4e9 Fix crash 2020-08-18 20:07:44 +02:00
tobspr 296b76bf11 Add virtual shape processing buildings 2020-08-18 20:02:39 +02:00
Bjorn Stromberg 1ff76e0b2e
[core/rectangle] Remove unused methods (#571)
* [core/rectangle] Remove unused methods

* Restore some methods
2020-08-18 14:19:25 +02:00
tobspr 1dfb5f7476 Give more blueprint shapes in sandbox controller, create wire network even if it consists of tunnels only 2020-08-15 23:19:55 +02:00
tobspr d4cbb5b124 Fix belt underlays not rendering 2020-08-15 22:52:16 +02:00
tobspr b7efda9bf6 Further performance improvements 2020-08-15 22:44:15 +02:00
tobspr b2880700e8 Huge rendering performance improvements and minor other changes, lots of refactorings 2020-08-15 22:32:55 +02:00
tobspr d1a5dd8c9e Update local config with latest variables and cleanup a bit 2020-08-15 19:55:39 +02:00
tobspr 7e139d116d Catch up with enum change / merge 2020-08-15 19:50:22 +02:00
Bjorn Stromberg 6a447e3583 Remove enumLayer and enumItemType 2020-08-15 19:47:01 +02:00
tobspr 7b40292be3 Start to optimize rendering 2020-08-15 19:43:03 +02:00
tobspr b1fb0fca7e Fix wires blueprint pasting bug, do not show wire info on unconnected wires 2020-08-15 18:14:00 +02:00
tobspr 070bce7020 Minor fixes 2020-08-15 17:55:14 +02:00
tobspr 699bb6a21e Merge branch 'master' of https://github.com/tobspr/shapez.io 2020-08-15 17:51:30 +02:00
tobspr 7279b75187 Improve information when hovering wires 2020-08-15 17:51:28 +02:00
Bjorn Stromberg 779ba8a1b8
Using reject here is uncaught, make this a single promise and resolve/reject accordingly (#556) 2020-08-15 16:26:54 +02:00
tobspr 5a0d3dcbe8 Add wire coating 2020-08-15 16:16:17 +02:00
tobspr 6a3a9c49cf Improve layer preview 2020-08-15 15:24:42 +02:00
tobspr c25428357e Remove unused code 2020-08-14 15:48:33 +02:00
tobspr 6c8a29cea6 Sneak preview to the wires layer when placing on the regular layer 2020-08-14 15:48:26 +02:00
tobspr 390c4ce1a5 Add display 2020-08-14 14:55:37 +02:00
tobspr 349657bafc Update storage to also return if its full or not 2020-08-14 13:15:26 +02:00
dengr1065 1dab9539bf
Add storage shape ejector pin (#568) 2020-08-14 13:10:57 +02:00
tobspr 8c39d31c5b Optimize performance by using singletons for items 2020-08-14 13:09:10 +02:00
tobspr 3c34227c24 Unify assets, refactor waypoints 2020-08-14 12:14:15 +02:00
tobspr 9085f32ec3 Add multiple performance settings 2020-08-14 09:38:48 +02:00
tobspr 9e76606674 Minor refactoring 2020-08-14 08:54:52 +02:00
tobspr 7fcfae747a Fix tunnels, nr. 2 2020-08-14 08:53:35 +02:00
tobspr c982827d60 New building sprites 2020-08-14 08:20:39 +02:00
tobspr f69af63aa3 Fix wires tunnel bug 2020-08-14 07:21:49 +02:00
tobspr fd7ae79971 Fix hub not accepting items 2020-08-13 21:06:54 +02:00
tobspr efd8ba7ae9 Add wire bridges and fix Q on hub crash 2020-08-13 21:04:44 +02:00
tobspr ff02508361 Add transistor building (Gate) 2020-08-13 20:47:33 +02:00
tobspr f44563fc05 Add item filter 2020-08-13 20:30:43 +02:00
tobspr 984bea1921 Add OR gate and different colors of wire based on the value 2020-08-13 20:01:54 +02:00
tobspr 49da768b73 Add NOT gate 2020-08-13 19:33:35 +02:00
tobspr 52b4d4d742 Implement wire networks, add levers 2020-08-13 19:23:00 +02:00
tobspr 75ab655998 Add basic logic gate and improve wires in general 2020-08-13 10:23:50 +02:00
tobspr 93186cbb9f Enable new buildings by default for now 2020-08-12 21:06:05 +02:00
tobspr f4ac6dfe03 Add constant signal emitters 2020-08-12 21:05:32 +02:00
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