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,467 Commits 6 Branches 26 Tags 670 MiB
78fe34840a
Commit Graph

724 Commits

Author SHA1 Message Date
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
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
b3c9c186d3
debug info - use "detailed" instead of "full" 
i'm retarded pls help
 2020-07-06 14:17:58 +03: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
dengr1065
6546c023a6
debug info css - prepare for attribute usage 2020-07-06 12:00:40 +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
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
9a6029279d Disable some logging 2020-06-26 17:46:12 +02:00
tobspr
857b79cac0 Improve rendering performance by caching bounds of paths 2020-06-26 17:44:11 +02:00
tobspr
e594b6a4a7 Add belt rendering (very slow for now) 2020-06-26 17:28:19 +02:00
tobspr
a71c0b8039 Take 3 on the belt performance (+ tslint fixes) 2020-06-26 17:02:52 +02:00
tobspr
9ce912dbdd Second take on belt performance 2020-06-26 16:31:36 +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
7ca425c8f3 Fix belt rendering bug 2020-06-25 12:53:59 +02:00
tobspr
182b62d604 Add method to debug changed areas 2020-06-25 12:42:48 +02:00
tobspr
77ddef0170 Add more FPS to belt animation 2020-06-25 12:18: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
tobspr
8416562016 Update changelog 2020-06-24 20:37:51 +02:00
tobspr
7b15a256b5 Further improve belt placement performance 2020-06-24 20:36:15 +02:00
tobspr
12927ec0ff
Merge pull request #198 from Phlosioneer/remove-belt-cache 
Optimize belt cache
 2020-06-24 20:26:22 +02:00
tobspr
9789468c2d Improve performance by caching area of changed ejectors 2020-06-24 20:25:43 +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
tobspr
b575bc4f41
Merge pull request #200 from Phlosioneer/ejector-cache-opt 
Optimize ejector cache
 2020-06-24 19:41:49 +02:00
tobspr
15a4e0c580 Fix settings version 2020-06-24 19:01:19 +02:00
tobspr
1fade52c20 Merge branch 'master' of https://github.com/tobspr/shapez.io 2020-06-24 18:57:46 +02:00
tobspr
98a117a965 Update changelog 2020-06-24 18:57:43 +02:00
tobspr
1717c25bd0
Merge pull request #227 from Magos/rotationByBuilding 
Rotation remembered by building type
 2020-06-24 18:57:08 +02:00
tobspr
24694f7f23 Bump version 2020-06-24 18:01:14 +02:00
tobspr
b3de1f9207 Re-enable analytics 2020-06-24 17:59:43 +02:00
tobspr
25cf1ea93b Change spanish (latin america) to spanish 2020-06-24 16:41:31 +02:00
Magnus Grimstvedt Saltnes
fbc543cf3f Corrects some code style issues. 2020-06-24 16:28:01 +02:00
Magnus Grimstvedt Saltnes
8ec646a8f6 Guards against undefined values/keys in base rotation logic. 
One-lines setting check per tobspr's recommendation.
 2020-06-24 14:20:16 +02:00
tobspr
a125ceede9 Update language names 2020-06-24 08:35:31 +02:00
Gerdon Abbink
8ec83144ad Q-ing when on an ore- or shape-patch will show the miner silhouette 2020-06-23 21:59:30 +02:00
tobspr
62303ce8e3 Enable traditional chinese 2020-06-23 19:02:08 +02:00
Magnus Grimstvedt Saltnes
553ebb5ef6 Switches to using ES6 get/set for currentBaseRotation. 2020-06-23 12:22:24 +02:00
Magnus Grimstvedt Saltnes
e18a888210 Attempts to fix some whitespace differences. 2020-06-23 12:16:06 +02:00
Magnus Grimstvedt Saltnes
9a00931c3f Implements some linter recommendations for CI check. 2020-06-23 12:15:59 +02:00
Magnus Grimstvedt Saltnes
c7f8b50d13 Adds tracking for rotation per building type. 
Adds a setting to go back to one global base rotation.
 2020-06-23 12:13:29 +02:00
tobspr
0f9e6445d2 Set release date 2020-06-22 16:06:27 +02:00
tobspr
56f7e8b7f6 Enable swedish translation 2020-06-22 15:37:03 +02:00
tobspr
cd0b43d4ff Fix placement mode staying active 2020-06-22 15:34:36 +02:00
tobspr
0b95f3b208 Fix crash 2020-06-22 15:26:49 +02:00
tobspr
d5b9a5b562 Main menu dark mode fixes 2020-06-22 15:25:08 +02:00
tobspr
28b2dc008c Add more links to main menu 2020-06-22 15:21:47 +02:00
tobspr
e9581c653f Fix main menu rendering 2020-06-22 14:55:43 +02:00
tobspr
c5613f6eee Regression 2020-06-22 14:46:33 +02:00
tobspr
231a3c81f4 Fix typo 2020-06-22 14:44:47 +02:00
tobspr
9a67115ba7 Color blind mode 2020-06-22 14:32:24 +02:00
tobspr
f204189fdb Refactor smart underground belt logic 2020-06-22 12:48:35 +02:00
tobspr
d452234c72 Fix keybinding for pipette showing while pasting blueprints 2020-06-22 12:38:14 +02:00
tobspr
e5d4fad64b Update changelog, minor adjustments 2020-06-22 12:36:02 +02:00
tobspr
3dca35ded4
Merge pull request #159 from hexagonhexagon/better-mouse-drag 
Fix camera inertia problem with mouse movement
 2020-06-22 12:34:34 +02:00
tobspr
e1bbe2de17 Prevent all default keybindings, closes #254 2020-06-22 12:33:28 +02:00
tobspr
cfed1631aa Increase maximum concurrent ui sounds 2020-06-22 12:10:17 +02:00
tobspr
a8b37792e4 Allow configuring autosave interval 2020-06-22 12:09:02 +02:00
hexagonhexagon
46a5bdb76c Make changes requested by tobspr. 2020-06-22 02:19:52 -04:00
hexagonhexagon
d793817170 The camera will not have extra velocity when the camera is held still. 2020-06-22 02:11:23 -04:00
tobspr
8381100317
Merge pull request #162 from hexagonhexagon/fix-blueprint-bug 
Fix bug where belts in blueprints don't orient correctly.
 2020-06-22 08:05:17 +02:00
hexagonhexagon
5d601a94be Add setting to disable cut/delete dialogs. 2020-06-21 19:11:20 -04:00
hexagonhexagon
bef7d823cd Cut/Delete dialogs can be interacted with by Esc/Enter. 2020-06-21 18:53:49 -04:00
hexagonhexagon
54653cf28e Make edge case where building is replaceable but unremovable an assertAlways. 2020-06-21 18:11:55 -04:00
hexagonhexagon
c7e0703c45 Fix bug where belts in blueprints don't orient correctly. 2020-06-21 17:52:12 -04:00
tobspr
969b7a74d4 Fix belt planner shortcut being shown always 2020-06-21 23:01:42 +02:00
tobspr
e660fd2caf Update changelog 2020-06-21 22:54:50 +02:00
tobspr
597eefe968 Deselect blueprint on pipette 2020-06-21 22:51:42 +02:00
tobspr
d907dbb191 Improve pipette 2020-06-21 22:29:23 +02:00
tobspr
5b2df00cc7 Fix pipetting belts 2020-06-21 22:05:41 +02:00
tobspr
ba52edf7a4 Fixes for the pipette 2020-06-21 21:59:35 +02:00
tobspr
76b619e4e7 Allow deselecting with pipette 2020-06-21 21:46:20 +02:00
tobspr
0b31ad0c7b Pipette 2020-06-21 21:44:53 +02:00
tobspr
38114ff3f6 Fix right click to delete not working 2020-06-21 21:22:33 +02:00
tobspr
2ca5dc9715 Fix hub marker being hidden by building info panel 2020-06-21 21:05:51 +02:00
tobspr
47b3ed5cbf Add option to render info boxes compact 2020-06-21 20:47:37 +02:00
tobspr
1f136ba892 Minor fixes for dark mode 2020-06-21 20:27:39 +02:00
tobspr
d198fcad4f
Merge pull request #197 from dengr1065/dark-theme-is-cool 
Dark Theme - slowly for everything
 2020-06-21 20:19:01 +02:00
tobspr
d1fe231bcb Remove unused keybindings 2020-06-21 20:17:03 +02:00
tobspr
1458e1aad0 Update changelog 2020-06-21 19:58:54 +02:00
tobspr
7cd0054c55
Merge pull request #223 from Joker-vD/labels-are-way-too-short 
Map markers' labels are way too short.
 2020-06-21 19:42:01 +02:00
tobspr
061815c7ed
Merge pull request #219 from findaldudu/master 
Add simplified Chinese translation
 2020-06-21 19:39:04 +02:00
tobspr
51bd87a970
Merge pull request #218 from davidburhans/left-then-right-click-button-fix 
Clumsy clicker fix
 2020-06-21 19:37:31 +02:00
tobspr
cd36e9084a Minor code style adjustments 2020-06-21 19:33:58 +02:00
tobspr
ece02e7545 Update changelog 2020-06-21 19:33:28 +02:00
tobspr
e4b2c51484
Merge pull request #212 from xSparfuchs/master 
fix for screenshots larger than 16,384 x 16,384
 2020-06-21 19:32:57 +02:00
tobspr
daef0f1e4e Refactor keybindings overlay to show more appropriate keybindings 2020-06-21 19:30:44 +02:00
tobspr
ecda498cac Merge branch 'master' of https://github.com/tobspr/shapez.io 2020-06-21 18:11:43 +02:00
tobspr
2dec257dd9 Cleanup click detector code 2020-06-21 18:11:41 +02:00
tobspr
fd70130ec4 Update artwork and sound 2020-06-21 18:11:10 +02:00
tobspr
cbdc302760
Merge pull request #193 from Phlosioneer/miner-optimization 
[Minor Opt] Make miners cache mined item
 2020-06-21 18:10:46 +02:00
Joker_vD
2b6a8e49d1 Only 14 characters for labels? That's 1/10 of a twit! 2020-06-18 22:26:15 +03:00