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
981 Commits 6 Branches 26 Tags 670 MiB
a2992373c1
Commit Graph

494 Commits

Author SHA1 Message Date
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
findaldudu
1adf7d09f9 add simplified Chinese translation (75%) 2020-06-17 21:13:50 -05:00
David Burhans
60baf4476f clear ClickDetector.clickDownPosition on right-click to prevent detecting subsequent left-clicks as double-clicks 2020-06-17 19:35:02 -05:00
Phlosioneer
f15cd5bcff Rework to cache instead of serialize 
Using lessons from other PRs
 2020-06-17 15:38:39 -04:00
xSparfuchs
8d21c1dfaf fine 2020-06-17 20:38:11 +02:00
xSparfuchs
889e22ea69 Update screenshot_exporter.js 2020-06-17 20:33:20 +02:00
xSparfuchs
1b85c32b3b prettier 2020-06-17 20:31:39 +02:00
xSparfuchs
e63638f364 Update screenshot_exporter.js 2020-06-17 20:17:23 +02:00
xSparfuchs
8372293d5d Update screenshot_exporter.js 2020-06-17 20:16:37 +02:00
xSparfuchs
c1ef4e85af whitespaces 2020-06-17 20:11:55 +02:00
xSparfuchs
a5e5cd9e4f fix large screenshots 2020-06-17 19:44:53 +02:00
tobspr
a6ed85e9da Fix belt planner 2020-06-17 15:57:34 +02:00
tobspr
61bcc31861 Fix mouse handling 2020-06-17 14:56:21 +02:00
tobspr
4c20094878 Do not choose direction lock side automatically, instead make it toggleable 2020-06-17 14:39:12 +02:00
tobspr
fc883f1e5e Add keybinding hint for direction lock 2020-06-17 14:29:43 +02:00
tobspr
3ddc0de2c4 Improve flickering 2020-06-17 14:05:17 +02:00
tobspr
317b7d72ff Add setting to disable vignette 2020-06-17 13:58:59 +02:00
tobspr
26949d5e3d Fix flickering in direction lock 2020-06-17 13:55:44 +02:00
tobspr
6d59847153 Update changelog 2020-06-17 13:43:14 +02:00
tobspr
b6964ad1bf Improve direction lock 2020-06-17 13:42:53 +02:00
tobspr
0a35c9f5b2 Improve belt direction lock 2020-06-17 13:37:41 +02:00
tobspr
a95e69401d Improve belt direction lock 2020-06-17 13:21:34 +02:00
tobspr
84969a9205 Refactor building placer 2020-06-17 13:12:39 +02:00
tobspr
9feecb2ac3 Merge branch 'master' of https://github.com/tobspr/shapez.io 2020-06-17 11:18:45 +02:00
Phlosioneer
eb182d6e94 Fix lint issues 2020-06-16 22:48:29 -04:00
Andifaind
89a1b8bb0c Fixed lint issue 2020-06-16 23:18:12 -03:00
Andifaind
d371726861 Translation for "Made by" text in the main menu 2020-06-16 23:11:10 -03:00
Phlosioneer
da24c472d7 Fix click and drag 
Clicking and dragging can trigger up to 4 add/destroy signals, and it's
a common case.
 2020-06-16 22:08:46 -04:00
Phlosioneer
aef96cff6e Optimize ejector cache for common case 
This commit optimizes the ejector cache for clicking and dragging belts,
or adding/removing a building. It's a big performance improvement for
large maps; on average, it only has to visit 60 slots per update,
compared to 20,000+ slots.
 2020-06-16 21:50:16 -04:00
dengr1065
05ce8ff430 dark theme for game loading 2020-06-17 04:39:08 +03:00
dengr1065
59bae80ab7 dark theme for option chooser dialogs 2020-06-17 04:30:01 +03:00
Phlosioneer
36cf28029e Remove ejector cache; use slot caches instead 
This is a small refactoring that removes the main ejector cache. The
cache is now tracked by slots and ejector components.

It avoids a large array allocation and many small object allocations,
but adds many small array allocations. It's net neutral for performance.
 2020-06-16 21:11:26 -04:00
dengr1065
b9e31049b6 "Dark keybindings" 2020-06-17 03:49:50 +03:00
Phlosioneer
2341772425 Optimize belt cache for common case 
Most of the time, we're adding/removing one building at a time. We don't
need to recheck every belt, only the ones near the changed belt.
 2020-06-16 20:23:11 -04:00
dengr1065
1bee130dfe Dark theme for settings 2020-06-17 03:19:22 +03:00
Phlosioneer
8a50fdb392 Remove belt cache array; use BeltComponent instead 
Removed the belt cache array. Follow-up belts are cached in the belt's
BeltComponent instead. This change also removes the recursive follow-up
search, which could cause a stack overflow for an extremely long belt
chain.

Saves one object allocation per belt per change, two very large array
allocations per change, many function calls, and belts are only visited
exactly once per change.
 2020-06-16 19:56:09 -04:00
dengr1065
97c52169da Changelog, support for dark theme in document root 2020-06-17 02:55:13 +03:00
dengr1065
7f32216404 Main Menu dark theme 2020-06-17 02:20:09 +03:00
Phlosioneer
d4fc2e6dcd Fix lint errors 2020-06-16 16:21:45 -04:00
Phlosioneer
83a4928be5 Make miners cache mined item 
Saves two chunk+tile lookups per update, and one chunk+tile lookup per
draw.
 2020-06-16 16:02:29 -04:00
tobspr
736e5fb432 Fix crash 2020-06-16 20:13:46 +02:00
tobspr
bbd50fdce9 Update changelog 2020-06-16 20:10:22 +02:00
tobspr
31ab5f3422 Disable direction lock for everything but belts 2020-06-16 20:10:00 +02:00
tobspr
e2d6d9d51d Update changelog 2020-06-16 20:05:45 +02:00
tobspr
46ceefd0d8 Disable automatic orientation when using belt lock 2020-06-16 20:02:52 +02:00
tobspr
4fc1ff6b0d Improve belt lock 2020-06-16 19:45:16 +02:00
tobspr
3afe2eb329 Update changelog 2020-06-16 19:40:44 +02:00
tobspr
35a13a09e5 Add belt lock feature 2020-06-16 19:40:00 +02:00
tobspr
b753187cde Add setting to disable smart tunnels 2020-06-16 19:24:23 +02:00
tobspr
3693a643b4 Update css 2020-06-16 17:53:27 +02:00
tobspr
1e1224b496 Merge branch 'master' of https://github.com/tobspr/shapez.io 2020-06-16 17:50:44 +02:00
tobspr
68ec3561c9 Update changelog 2020-06-16 17:50:42 +02:00
tobspr
3c3c5acc8e
Merge pull request #85 from jaysc/continue 
Added continue button
 2020-06-16 17:48:43 +02:00
tobspr
5ddf7bbd58
Merge pull request #148 from Demivan/gulp-4 
Update gulp to version 4
 2020-06-16 16:56:56 +02:00
tobspr
c571c088e6
Merge pull request #140 from dengr1065/patch-1 
Dark theme for changelog and completed upgrades
 2020-06-16 16:54:26 +02:00
tobspr
4ed004f902
Merge pull request #186 from mini-bomba/fix-standalone-only-settings-hint 
Fixed standalone only setting hint not being translated
 2020-06-16 16:51:09 +02:00
mini-bomba
b6e03d6cd0
Fixed standalone only setting hint not being translated 2020-06-16 14:51:48 +02:00
tobspr
512a1eb0d3 Update changelog 2020-06-16 14:09:05 +02:00
tobspr
b8c3668d88 Placing underground belts now removes belts and other (unneeded) tunnels inbetween 2020-06-16 13:19:53 +02:00
tobspr
1af564e816 Add mirrored painter variant 2020-06-16 11:57:17 +02:00
tobspr
fccb30b5a5 Fix dark mode for markers 2020-06-16 10:36:32 +02:00
tobspr
5c12c605f5 Reworked waypoints 2020-06-16 10:25:31 +02:00
tobspr
2d4a67aa11 update changelog 2020-06-15 22:44:29 +02:00
tobspr
32d169b7db Bump fast pan speed from 2 to 4 2020-06-15 22:29:55 +02:00
Glenn Martin Jensen
159e2e1262
Capitalize N in "norsk" to match other languages 2020-06-15 22:24:06 +02:00
tobspr
4f37d1e3f0 Update translations & changelog 2020-06-15 22:16:29 +02:00
tobspr
c1ecc4c3e7 Further update translations 2020-06-15 22:03:28 +02:00
tobspr
ccf8e3b29e Add japanese translations 2020-06-15 21:55:24 +02:00
tobspr
ed87dfd118 Update changelog 2020-06-14 15:54:09 +02:00
tobspr
840ba60c76
Merge pull request #131 from jaysc/fastpan 
added shift modifier for faster pan
 2020-06-14 15:52:38 +02:00
Jaysc
5de2c2de94 Removed logic from application_settings 2020-06-14 14:16:37 +01:00
tobspr
d50e8d8d13 Add norwegian translations 2020-06-14 15:00:01 +02:00
tobspr
7e2669ac40 Bump version 2020-06-14 14:44:45 +02:00
tobspr
cda24ceb04 Refactor item acceptor system for huge performance improvement 2020-06-14 14:37:13 +02:00
tobspr
e95b055e10 Minor improvements to belt performance 2020-06-14 14:20:35 +02:00
Jaysc
7552d23f40 multiply by 2 logic 2020-06-13 21:40:20 +01:00
Ivan Demchuk
506193b8c8 Switch to gulp 4 2020-06-13 18:59:25 +03:00
dengr1065
59b0eef02d
Bring back green color to completed upgrades 
dark theme fix
 2020-06-13 16:44:14 +03:00
Jaysc
8a726f99b6 Changed fastpan to mapMoveFaster and translation 2020-06-13 14:14:35 +01:00
tobspr
6febaff100 Fix untranslated button 2020-06-13 13:22:20 +02:00
tobspr
a2d0024cb1 Set date for 1.1.11 2020-06-13 12:20:02 +02:00
dengr1065
31960329c6
Dark theme for changelog 
really quick fix just 3 sloc
 2020-06-13 13:17:01 +03:00
tobspr
685373f11c Update changelog 2020-06-13 11:42:34 +02:00
tobspr
4e4498ed53 Fix dialog text being hardly readable in dark theme 2020-06-13 11:36:05 +02:00
tobspr
f8362d861b
Merge pull request #134 from mini-bomba/fix-keybinds-button-label 
Fix keybindings button label text not changing with language
 2020-06-13 11:17:35 +02:00
tobspr
ae770cb39f Update changleog 2020-06-13 11:13:46 +02:00
tobspr
0985a36793 Allow higher tickrates 2020-06-13 11:13:28 +02:00
tobspr
ba6c133ece
Merge pull request #132 from mini-bomba/about-translations 
Made About this game translatable
 2020-06-13 11:12:50 +02:00
tobspr
444908d22f Fix wrong check for full version 2020-06-13 11:06:15 +02:00
tobspr
766d9e943e Add flag to enable fullVersion in beta 2020-06-13 11:01:43 +02:00
tobspr
a0305512a2 Update changelog 2020-06-13 10:59:28 +02:00
tobspr
7e745fd0ce Allow exporting whole bases, closes #137 2020-06-13 10:57:29 +02:00
tobspr
ecbcd02abc Fix app not starting when the savegames were corrupted - there is now a better error message 2020-06-13 10:11:18 +02:00
mini-bomba
70adaa28ab
Fix keybindings button label text not changing with language 2020-06-12 22:23:17 +02:00
mini-bomba
a4060ad484
Made About this game translatable 2020-06-12 21:19:13 +02:00
Jaysc
487a99bb56 added fastpan feature 2020-06-12 18:55:35 +01:00
tobspr
7fd0451ddc Minor adjustments 2020-06-12 19:12:35 +02:00
tobspr
fe378654c2 Update changelog 2020-06-12 19:09:48 +02:00
tobspr
63568ffb2c
Merge pull request #112 from mini-bomba/move-speed 
Added movement speed setting
 2020-06-12 19:09:10 +02:00
tobspr
edc0e352f7 Update changelog 2020-06-12 19:07:57 +02:00
tobspr
2f45e345fe
Merge pull request #113 from hexagonhexagon/cut-paste-blueprints 
Add cut, paste options for blueprints
 2020-06-12 19:05:53 +02:00
tobspr
a2fc246690 Merge branch 'master' of https://github.com/tobspr/shapez.io 2020-06-12 19:01:57 +02:00
tobspr
f1f53e2d5e Update changelog 2020-06-12 19:01:55 +02:00
tobspr
cc9813bf0c
Merge pull request #74 from Dimava/extract/selection-world-relative 
Make selection relative to world
 2020-06-12 19:01:00 +02:00
tobspr
3af6532d32 Refactor pinned shapes and make them smart, closes #72 2020-06-12 18:38:13 +02:00
Dimava
7653c51e1b remove currentSelectionStart (use -World instead) 2020-06-12 15:49:31 +03:00
tobspr
8c01cc23d0 Fix watermark 2020-06-12 13:49:36 +02:00
tobspr
c037f23921 Localize watermark 2020-06-12 13:47:48 +02:00
tobspr
8be6530ee4 Add Dutch to languages 2020-06-12 13:45:35 +02:00
tobspr
bd944ea758 Update german translation 2020-06-12 12:06:57 +02:00
tobspr
2c4d8e40fd Add korean translation 2020-06-12 10:38:16 +02:00
tobspr
a348ee6e45
Merge pull request #118 from Colecf/patch-1 
Fix grammatical mistake in demo watermark
 2020-06-12 10:28:50 +02:00
tobspr
b288fe2512 V 1.1.10 2020-06-12 10:03:06 +02:00
Cole Faust
eb16025598
Fix grammatical mistake in demo watermark 2020-06-12 00:26:15 -07:00
tobspr
1a7a06fce2 Move debug options to seperate file so they are not always checked in 2020-06-12 09:15:29 +02:00
tobspr
758fd2866c Fix german being default language 2020-06-12 09:03:03 +02:00
mini-bomba
107a3ef69c
Added movement speed setting 2020-06-12 00:47:59 +02:00
hexagonhexagon
1091a7affd Merge branch 'master' into cut-paste-blueprints 2020-06-11 18:05:44 -04:00
hexagonhexagon
e39a868998 Add "Paste last blueprint" keybind. Last blueprint is not preserved on save/exit. 2020-06-11 17:56:13 -04:00
tobspr
af8ba506f5 Fix typos (Thanks to wessel) 2020-06-11 22:33:27 +02:00
tobspr
e6ae354b3f Comment changelog 2020-06-11 19:34:18 +02:00
tobspr
3134f38687 Enable russian translation 2020-06-11 19:30:57 +02:00
tobspr
15877f3040 German translations, minor improvements 2020-06-11 19:17:06 +02:00
tobspr
14b7c14d24 Merge branch 'master' of https://github.com/tobspr/shapez.io 2020-06-11 18:45:41 +02:00
tobspr
c55bcdf99c update changelog 2020-06-11 18:45:39 +02:00
tobspr
25b27054ec
Merge pull request #108 from jaysc/invalidUndergroundBelt 
Prevent invalid connection if existing underground tunnel entrance exists
 2020-06-11 18:44:43 +02:00
tobspr
3b0286cd99
Merge pull request #107 from mini-bomba/polish-translation 
Adding new translation keys for theme names & Polishing the Polish Translation™ #3
 2020-06-11 18:43:57 +02:00
Jaysc
6601923bd4 stop connection if something in the way 2020-06-11 16:33:25 +01:00
mini-bomba
2196299fff
New langkeys: settings.labels.theme.themes 
Basically allows you to translate theme names to your language instead of them being hard-coded
 2020-06-11 17:18:10 +02:00
Jaysc
f4d1e5447d Reordered continue and added new game button 2020-06-11 15:17:50 +01:00
tobspr
61a0435438 Enable polish translation 2020-06-11 15:29:41 +02:00