Archives/tobspr_shapez.io
1
0
Fork 0
mirror of https://github.com/tobspr/shapez.io.git synced 2025-06-13 13:04:03 +00:00
Code Issues Projects Releases Wiki Activity
1,247 Commits 6 Branches 26 Tags 670 MiB
0ca897bf86
Commit Graph

599 Commits

Author SHA1 Message Date
David Triphon
0ca897bf86 Added a new setting that allows deleting while a building is selected. 2020-07-20 13:05:05 -07:00
David Triphon
958797d7c0 Fixed some mouse press/release action interaction conflicts. 2020-07-20 12:46:40 -07:00
David Triphon
0fc6e9ca2c Add the settings version updater to prevent failures when moving up versions. 2020-07-20 12:21:29 -07:00
David Triphon
a4082faea7 The middle click pan setting works! 
There are a few weird interactions, like when holding down middle click to pan, and then begin holding left click as well, the pan stops, but as soon as left click is released, as long as middle click is still held, the screen will jump as if it was still panning the same original middle click position.
middle clicking while in the middle of placing conveyors will stop the conveyor placement.
The behavior interaction between different click behaviors needs some polish.
 2020-07-20 11:57:30 -07:00
David Triphon
479c899a8e Attempted to migrate middle click to pan only and away from the main click code. Turning on setting breaks camera panning. 
Unsure about the correctness of the change. Still learning the code org.
 2020-07-19 15:02:31 -07:00
Moppler
27e282b354 Added new setting allowing for middle mouse scrolling. 2020-07-18 23:58:38 +01: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
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