Commit Graph

316 Commits

Author SHA1 Message Date
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 7279b75187 Improve information when hovering wires 2020-08-15 17:51:28 +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 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 efd8ba7ae9 Add wire bridges and fix Q on hub crash 2020-08-13 21:04:44 +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 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 f4ac6dfe03 Add constant signal emitters 2020-08-12 21:05:32 +02:00
tobspr 850461df8f Further take on logic wires 2020-08-11 18:40:09 +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 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 e0ba1452b2 Start to work on logical pins 2020-08-10 15:02:49 +02:00
Bjorn Stromberg 79158e2b56
Remove unused code (#526) 2020-08-06 11:28:28 +02:00
Dimava 235c380de1
fix pippete throws on empty hand (#512) 2020-07-29 09:17:45 +02:00
tobspr bf2eee908f Refactor static map entity component to store building metaclass 2020-07-27 17:14:29 +02:00
Bjorn Stromberg cb1ff53338 Add TSLint to github actions, fix existing type errors 2020-07-22 11:15:16 +09:00
Moppler ae5c33abd2 Extend the pipette hack to work with belts and wires. 2020-07-19 15:56:40 +01: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 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
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 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
tobspr 1f438e8c65 Minor art rework, update ratios 2020-07-06 22:14:45 +02:00
tobspr 04ea105584 Fix lots of bugs, add wire splitters / mergers 2020-07-06 21:33:37 +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 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
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
tobspr d09bd0bcd7 Huge refactoring of the whole placement logic 2020-07-05 17:56:54 +02:00
MizardX 322e7fbcc9 Initial planner direction based on cursor movement 2020-07-05 17:38:14 +02:00
tobspr ca8745b1c0 Fix bad rendering of item acceptors / ejector hints 2020-07-05 17:11:03 +02:00
isaisstillalive 0ba4722be6 Show confirm dialog instead of notification 2020-07-05 11:14:11 +09:00
isaisstillalive 6a279923e3 If cost is low, copy instead of cut 2020-07-05 09:51:45 +09:00
tobspr ff1c1700fe
Merge pull request #382 from isaisstillalive/patch-3
Fixed Fill blueprint shapes of SandboxController may not work
2020-07-04 16:35:23 +02:00
isaisstillalive 7f6584297e Fixed Fill blueprint shapes of SandboxController may not work 2020-07-03 19:53:09 +09:00
isaisstillalive 50c53ec1f2 Close-shop-and-stats key mapping doesn't seem to exist 2020-07-03 17:31:19 +09:00
tobspr 503f9a7fe5
Merge pull request #372 from isaisstillalive/patch-1
Fixed an issue that caused an error when pressing the tab key
2020-07-03 09:38:24 +02:00
isaisstillalive e822552a60 Refactoring obscure variable name 2020-07-03 16:29:29 +09:00
tobspr daa5cdecb4
Merge pull request #361 from Sandwichs-del/Close-shop-and-stats-by-Q-too
Close shop and stats by Q too
2020-07-03 08:47:32 +02:00
tobspr d75fb184a4 Implement color inverter building 2020-07-02 18:16:04 +02:00
isaisstillalive ada63459aa fix cycle building bug 2020-07-02 20:49:46 +09:00
dengr1065 c29b505ef0
Add consistent enum comment 2020-07-02 01:05:25 +03:00
dengr1065 4bbbdafbb9
Fix copy-pasted code
i hate myself
2020-07-02 00:41:01 +03:00
dengr1065 6769e9c9b8
Use enum for debug overlay 2020-07-01 23:53:51 +03:00
Sandwichs-del bec511d9f7
Close stats also by Q 2020-07-01 14:16:00 +00:00
Sandwichs-del 4bfbf15b30
Close shop also by Q 2020-07-01 14:14:04 +00:00
tobspr 722c8ef836 Start to rework the graphics for the wires layer, make wires cooler than belts 2020-06-30 12:38:20 +02:00
tobspr 755f4bd2ea Update artwork and minor fixes 2020-06-30 09:27:30 +02:00
tobspr 989ed2db87 Fix wires placement not snapping 2020-06-30 08:23:05 +02:00
dengr1065 2d83994771 More debug info (toggle) 2020-06-30 04:53:06 +03:00
tobspr b499760d74 Start to work on advanced shape processing 2020-06-28 20:28:46 +02:00
tobspr 0967d5114c Initial take on wires 2020-06-28 19:34:10 +02:00
tobspr b0cc9539d7 Fix sandbox controller 2020-06-28 12:48:18 +02:00
tobspr 77440a68bc Add sandbox controller 2020-06-28 12:38:48 +02:00
tobspr 17123fd7b9 Further work on the energy generator 2020-06-28 11:44:30 +02:00
tobspr f8adbcdbec
Merge pull request #328 from hexagonhexagon/better-pipette
Clear cursor when trying to pipette the same building twice.
2020-06-28 10:32:09 +02:00
hexagonhexagon bbeee11057 Pressing Q on the same building twice clears the cursor. 2020-06-27 22:52:25 -04:00
Jakob Hellermann 6da023546d press alt key in belt planner to reverse direction 2020-06-27 22:18:29 +02:00
tobspr de0b305276 Minor fixes to the throughput 2020-06-27 16:40:51 +02:00
tobspr 2e266f5f21 Get rid of 'builtins' file since its useless and causes performance issues 2020-06-27 10:51:52 +02:00
tobspr e59d94360c Minor tslint fix 2020-06-27 10:39:28 +02:00
tobspr 419401b9be Improve performance by getting rid of instanceof 2020-06-27 10:38:11 +02:00
tobspr c74843424a Disable wires content for now (so we can push a sub-update) 2020-06-27 09:38:41 +02:00
tobspr 7b813ece0a
Merge pull request #301 from hexagonhexagon/fix-double-waypoint-bug
Fix duplicate waypoints with the same shape key displaying wrong
2020-06-27 08:51:15 +02:00
Jakob Hellermann bc40fa72d3 fix crash due to missing import of STOP_PROPAGATION 2020-06-26 21:21:09 +02:00
tobspr 42c569d91f Implement saving and restoring belt paths 2020-06-26 18:24:02 +02:00
tobspr a71c0b8039 Take 3 on the belt performance (+ tslint fixes) 2020-06-26 17:02:52 +02:00
tobspr 192d1dbedb Initial take on belt optimization 2020-06-26 13:57:07 +02:00
hexagonhexagon 70f58d5584 Fix bug where waypoints with the same shape key display wrong. 2020-06-25 15:25:44 -04:00
tobspr 66eac93460 Fix sound being played too often 2020-06-25 13:12:35 +02:00
tobspr 182b62d604 Add method to debug changed areas 2020-06-25 12:42:48 +02:00
tobspr 6677ff0a44 Initial take on wires 2020-06-24 22:23:10 +02:00
tobspr 97ef46bd52 Fix deconstruct sound being played when right clicking hub 2020-06-24 21:09:09 +02:00
tobspr c0e5595a3f Allow clicking 'Q' over a shape or color patch to automatically select the miner building 2020-06-24 21:06:35 +02:00
tobspr a17316b1d7
Merge pull request #283 from Gerdon262/feature/ore-q-ing
Allow Q-ing on a ore-/shape-patch
2020-06-24 21:04:38 +02:00
tobspr de94c6ea82 Add 'copy key' button to shape viewer 2020-06-24 21:03:46 +02:00
tobspr 3a846ab3c9 Allow clicking on variants to select them 2020-06-24 20:44:41 +02:00
Gerdon Abbink 5093770329 Force user to use the chainable extractor if unlocked. 2020-06-24 19:47:21 +02:00
Gerdon Abbink f43a266fad Merge branch 'master' of git://github.com/tobspr/shapez.io into feature/ore-q-ing 2020-06-24 19:44:39 +02:00