Commit Graph

556 Commits

Author SHA1 Message Date
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 a095cd6324 Allow rotating levers 2020-08-28 21:57:29 +02:00
tobspr 5459e6470b Add 1x1 compact splitters 2020-08-28 21:28:29 +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 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
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 7279b75187 Improve information when hovering wires 2020-08-15 17:51:28 +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 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 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 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
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
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
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
Bjorn Stromberg cb1ff53338 Add TSLint to github actions, fix existing type errors 2020-07-22 11:15:16 +09: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 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
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
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 a41a7099e6 Fix color mixing 2020-07-07 13:17:25 +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 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 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 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 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
tobspr a1007591e5 Fix multiple bugs, 2 2020-07-05 18:33:46 +02:00
tobspr 65337f90fc Fix multiple bugs 2020-07-05 18:33:41 +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
tobspr 34ef26b289 Fix multiple issues regarding saving / restoring games 2020-07-05 16:56:01 +02:00
tobspr 04839b1956 Unlock energy generator from the beginning 2020-07-05 12:59:40 +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
Dimava af1893ba08 find a more meaningful name and make it const 2020-07-04 19:28:10 +03:00
Dimava 35f427da82 remove moving on min/max zoom 2020-07-04 19:28:07 +03:00
Dimava 785f20c35f fix jumps with desiredCenter 2020-07-04 19:28:04 +03:00
Dimava 2f6b3afbab Wheel zoom saves world mouse position 2020-07-04 19:28:02 +03: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
tobspr a77911263d Implement concept of energy consumption 2020-07-02 17:43:47 +02:00
tobspr a977d4f9f4 Update sounds 2020-07-02 14:04:25 +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
tobspr bd899df5fe Further progress on the energy generator / wires, fix translations 2020-07-01 17:51:11 +02: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 8667739e5e MInor wires adjustment 2020-06-30 12:42:37 +02: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 18fb9cb04f Speed up belt rendering 2020-06-30 09:39:09 +02:00
tobspr 755f4bd2ea Update artwork and minor fixes 2020-06-30 09:27:30 +02:00
tobspr ea868fd750 Fix issues with blueprints 2020-06-30 08:24:56 +02:00
tobspr 989ed2db87 Fix wires placement not snapping 2020-06-30 08:23:05 +02:00