1
0
mirror of https://github.com/tobspr/shapez.io.git synced 2025-06-13 13:04:03 +00:00
Commit Graph

231 Commits

Author SHA1 Message Date
Exund
3741934b39
Add a setting to disable picking the miner when on a resource patch (#649)
* Add a setting to disable picking the miner when on a  resource patch

* Fix that one space :D

Linter go brrrr

Co-authored-by: dengr1065 <dengr1065@gmail.com>
2020-09-13 09:19:53 +02:00
Scott Miller
9a93021497
Update base-en.yaml (#641)
Fix tooltip grammar
2020-09-13 09:18:28 +02:00
tobspr
6042fcba62 Properly implement sound and music volumes, debounce writes 2020-09-13 08:40:56 +02:00
Yoshie2000
50e40888fd
Music & Sound volume sliders in the settings menu (#611)
* Added music & sound volume sliders in the settings menu

* Changed the order of the sound options in the settings menu

* Fixed the formatting, removed extra semicolon

* Removed a bad character

* Update base-en.yaml

* Updated base-en.yaml

* Removed trailing spaces

* Type safety fixes

* Replaced logical XOR (^) with !==
2020-08-31 15:46:21 +02:00
tobspr
bca379ee89 Add setting to show chunk borders 2020-08-29 22:52:52 +02:00
tobspr
cf0f02826b Make comparer compare shapes, colors and booleans 2020-08-29 21:40:57 +02:00
tobspr
06e276f021 Add belt reader building 2020-08-29 10:38:23 +02:00
tobspr
e92b32184c Rename purple -> magenta 2020-08-28 22:41:43 +02:00
tobspr
5336467838 statistics are now shown in shapes / second instead of shapes / minute 2020-08-28 22:41:13 +02:00
tobspr
728f4ae253 Allow naming savegames 2020-08-28 22:15:12 +02:00
TrapperHell
3f497c5b47
- Minor adjustments in English translation of game and adjust casing of product names (#593)
- Fix comment typo
2020-08-28 21:37:15 +02:00
tobspr
5459e6470b Add 1x1 compact splitters 2020-08-28 21:28:29 +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
296b76bf11 Add virtual shape processing buildings 2020-08-18 20:02:39 +02:00
tobspr
61e7481c8f Change coating -> insulation 2020-08-15 16:19:28 +02:00
tobspr
5a0d3dcbe8 Add wire coating 2020-08-15 16:16:17 +02:00
tobspr
390c4ce1a5 Add display 2020-08-14 14:55:37 +02:00
tobspr
9085f32ec3 Add multiple performance settings 2020-08-14 09:38:48 +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
f4ac6dfe03 Add constant signal emitters 2020-08-12 21:05:32 +02:00
tobspr
850461df8f Further take on logic wires 2020-08-11 18:40:09 +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
Bjorn Stromberg
3e43fef6c4
Fix YAML Lint Failures (#548)
* Copy/paste en back over ar, there were no translations

* Sync cat with en

* Coffee hadn't kicked in and I fixed a bunch of warnings instead of errors, oh well.

* Fix base-uk.yaml

* Fix base-hu

* Fix base-da
2020-08-10 07:35:32 +02:00
Julian Simioni
a44ec7182a
Minor English wording improvements (#510)
* Minor English wording improvements

* Update translations/base-en.yaml

Co-authored-by: Bjorn Stromberg <bjorn@bjornstar.com>

Co-authored-by: tobspr <tobspr@users.noreply.github.com>
Co-authored-by: Bjorn Stromberg <bjorn@bjornstar.com>
2020-08-07 09:14:24 +02:00
dengr1065
2df1b8d014
Major ui changes (#482)
* "discord" -> "Discord", sync most translations

* that major settings update you'll like

* Finish new settings, add logo to about page

* sync & format translations
2020-07-23 08:48:23 +02:00
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
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
RogiJAG
150bf718f7 Merge branch 'master' into 180_deg_rotater 2020-07-19 11:15:30 -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
e32926fa08 Add Yaml config and fif all errors 2020-07-19 09:40:52 +01:00
Moppler
27e282b354 Added new setting allowing for middle mouse scrolling. 2020-07-18 23:58:38 +01: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
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
ba4ca7f50b Update store translation 2020-07-07 19:33:45 +02:00
Astavie
0caaa055aa decimal separator 2020-07-07 16:19:26 +02:00
tobspr
35f77416ba Update translations to latest version 2020-07-07 13:34:49 +02:00
tobspr
f69caa9f1a Change uncolored -> gray 2020-07-07 09:35:23 +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
0d6b855253 Allow color inverter to process colors as well 2020-07-07 09:06:17 +02:00
tobspr
2e66c12122 Add ukrainian language prefab 2020-07-07 07:11:39 +02:00
isaisstillalive
f1bcec65ad Refactor dialog title 2020-07-07 09:15:32 +09:00
isaisstillalive
8acefda778 Show edit marker dialog instead deleting marker 2020-07-07 08:22:51 +09:00
tobspr
04ea105584 Fix lots of bugs, add wire splitters / mergers 2020-07-06 21:33:37 +02:00
tobspr
6c6ad6af22 Update standalone build script 2020-07-06 08:14:44 +02:00
tobspr
34ef26b289 Fix multiple issues regarding saving / restoring games 2020-07-05 16:56:01 +02:00
tobspr
0b9b35b79e Update store page, again 2020-07-05 13:13:58 +02:00
tobspr
23df0cf1e0 Update store page text 2020-07-05 13:08:13 +02:00
tobspr
5e67ae8548 Update store page 2020-07-05 12:52:33 +02:00
tobspr
c87b87c572 Minor phrasing change 2020-07-05 12:14:29 +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
isaisstillalive
50c53ec1f2 Close-shop-and-stats key mapping doesn't seem to exist 2020-07-03 17:31:19 +09:00
EnderDoom77
d8c88fcb3c
Halfs => Halves 2020-07-02 22:28:05 +02:00
EnderDoom77
f6f583b4f4
Made minor adaptations for consistency or normativity.
Raise is transitive, use rise when there's no object.
Made capitalisation more consistent
Allow/enable followed by either: gerund or noun. Use infinitive when the subject (who is allowed/able) is explicitly stated. (more natural)
Commas must be used around non-determining relative clauses.
Added hyphens to counter-clockwise (counterclockwise also valid), user-contributed, and auto-orientation (prefix can't be left alone).
Added a few objects (shapes / belts) to make the text more explicit where objects should naturally be stated.
2020-07-02 21:05:37 +02:00
tobspr
d75fb184a4 Implement color inverter building 2020-07-02 18:16:04 +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
17123fd7b9 Further work on the energy generator 2020-06-28 11:44:30 +02:00
tobspr
498088e678 Update store page description 2020-06-28 10:27:32 +02:00
tobspr
6677ff0a44 Initial take on wires 2020-06-24 22:23:10 +02:00
tobspr
de94c6ea82 Add 'copy key' button to shape viewer 2020-06-24 21:03:46 +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
bae6b702bb Update translations 2020-06-24 12:50:51 +02:00
Magnus Grimstvedt Saltnes
efdaf74659 Adds English strings for rotationByBuilding. 2020-06-23 12:14:11 +02:00
tobspr
28b2dc008c Add more links to main menu 2020-06-22 15:21:47 +02:00
tobspr
9a67115ba7 Color blind mode 2020-06-22 14:32:24 +02:00
tobspr
2a7058c384 Update translations 2020-06-22 12:10:22 +02:00
hexagonhexagon
8b6ad43ce0 Change "Confirm Mass Delete" to "Delete area", change "Destroy" keybind overlay to "Delete". 2020-06-21 19:18:24 -04:00
hexagonhexagon
5d601a94be Add setting to disable cut/delete dialogs. 2020-06-21 19:11:20 -04:00
tobspr
0b31ad0c7b Pipette 2020-06-21 21:44:53 +02:00
tobspr
47b3ed5cbf Add option to render info boxes compact 2020-06-21 20:47:37 +02:00
tobspr
daef0f1e4e Refactor keybindings overlay to show more appropriate keybindings 2020-06-21 19:30:44 +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
d0dc116cc7 Update translations to latest version 2020-06-17 14:02:28 +02:00
tobspr
317b7d72ff Add setting to disable vignette 2020-06-17 13:58:59 +02:00
Andifaind
d371726861 Translation for "Made by" text in the main menu 2020-06-16 23:11:10 -03:00
tobspr
09bfb4cf89 Update wording to be more accurate 2020-06-16 20:05:27 +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
3c3c5acc8e
Merge pull request #85 from jaysc/continue
Added continue button
2020-06-16 17:48:43 +02:00
tobspr
1af564e816 Add mirrored painter variant 2020-06-16 11:57:17 +02:00
tobspr
5c12c605f5 Reworked waypoints 2020-06-16 10:25:31 +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
8a726f99b6 Changed fastpan to mapMoveFaster and translation 2020-06-13 14:14:35 +01:00
tobspr
33fce36f30 Improve spacing 2020-06-13 11:43:53 +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
7e745fd0ce Allow exporting whole bases, closes #137 2020-06-13 10:57:29 +02:00
mini-bomba
a4060ad484
Made About this game translatable 2020-06-12 21:19:13 +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
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
7c4008cd94 Fix misleading phrase 2020-06-12 01:23:46 +02:00
mini-bomba
107a3ef69c
Added movement speed setting 2020-06-12 00:47:59 +02:00