Archives/tobspr_shapez.io
1
0
Fork 0
mirror of https://github.com/tobspr/shapez.io.git synced 2024-10-27 20:34:29 +00:00
Code Issues Projects Releases Wiki Activity
1,333 Commits 6 Branches 26 Tags 670 MiB
235c380de1
Commit Graph

598 Commits

Author SHA1 Message Date
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
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
tobspr
867b55ca38 Update changelog 2020-07-05 12:14:55 +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
1837e72952 Merge branch 'master' of https://github.com/tobspr/shapez.io 2020-07-04 18:34:04 +02:00
tobspr
85bb280326 Update changelog & artwork 2020-07-04 18:34:02 +02: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
f0a75a8255 Minor changes, update changelog with latest contributions 2020-07-04 16:46:01 +02: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
720c288a44 Merge branch 'master' of https://github.com/tobspr/shapez.io 2020-06-30 08:23:07 +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
Menai Ala Eddine
5dca71fa3f
refactor • line 15 : replace log by error 
1• Remove `console.log()`
2• Add `console.error()`
Because the message content is an error.
 2020-06-28 20:56:47 -07:00
tobspr
64c4816194 Remove some todos 2020-06-28 20:31:22 +02: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
97858b6eab Fix time formatting, again 2020-06-28 10:49:26 +02:00
tobspr
eea02bf571 Merge branch 'master' of https://github.com/tobspr/shapez.io 2020-06-28 10:48:49 +02:00
tobspr
c4d328c1cd Fix bad time formatting and update changelog 2020-06-28 10:48:47 +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
tobspr
4a56c3ccba
Merge pull request #327 from hexagonhexagon/b-key-dev-fix 
Fix issue where pressing B just after loading crashes the game.
 2020-06-28 10:31:12 +02:00
tobspr
542cc89f94
Merge pull request #325 from jakobhellermann/master 
press alt key in belt planner to reverse direction
 2020-06-28 10:28:48 +02:00
tobspr
3672f52619 Add 120hz refresh rate 2020-06-28 10:24:11 +02:00
hexagonhexagon
4c5043378f Fix issue where pressing B just after loading crashes the game. 2020-06-28 01:18:49 -04: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
84417b60a5 Fix items being stuck on belts 2020-06-27 12:50:35 +02:00
tobspr
fa3d516913 Update changelog 2020-06-27 12:05:13 +02:00
tobspr
54f06762d7 Update changelog 2020-06-27 11:57:12 +02:00
tobspr
f4e4b6d027 Update story goals 2020-06-27 11:54:14 +02:00
tobspr
5dab3508cd Improve tunnel performance by caching receivers 2020-06-27 11:39:32 +02:00
tobspr
a057d68a8e Micro optimization for item acceptor 2020-06-27 11:03:34 +02:00
tobspr
6d2afb992c Update local config to latest version 2020-06-27 10:52:10 +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
14246929b3 Fix item ejector bug 2020-06-27 10:44:23 +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
d8bf4f9cd8 fix belt animation seeming to go 'backwards' on high belt speeds 2020-06-27 09:59:48 +02:00
tobspr
c844dd4798 Improve performance by only updating belt ejectors on the end of paths 2020-06-27 09:52:26 +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
8ba0a36ee1 Re-Enable automatic belt placement 2 2020-06-27 09:34:09 +02:00
tobspr
ceb9b81cf9 Re-Enable automatic belt placement 2020-06-27 09:33:58 +02:00
tobspr
8e10864f05
Merge pull request #316 from mordof/master 
Fix tunnel incorrect delete bug
 2020-06-27 08:54:49 +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
Mike Winger
a96b4a290d Fix tunnel incorrect delete bug 2020-06-26 20:00:44 -06:00