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,595 Commits 6 Branches 26 Tags 670 MiB
51316782a2
Commit Graph

204 Commits

Author SHA1 Message Date
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
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
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
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
652c46ce73 Minor changes 2020-06-11 19:29:27 +02:00
tobspr
15877f3040 German translations, minor improvements 2020-06-11 19:17:06 +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
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
Vojtěch Ducháček
88e8e2718a
fixed minor inconsistency in painter description 2020-06-11 16:35:37 +02:00
Jaysc
f4d1e5447d Reordered continue and added new game button 2020-06-11 15:17:50 +01:00
Tomáš Blatný
54ddbeb8a7
Updated czech translation, reworded english text 2020-06-11 15:16:14 +02:00
tobspr
f9ce06dd5c Get rid of unused translation 2020-06-11 11:52:49 +02:00
tobspr
c434f7a59f Multiple fixes (see changelog) 2020-06-11 11:51:24 +02:00
tobspr
1c717b0f37 Change hub texture and allow translating it, update stacker texture 2020-06-11 11:29:38 +02:00
tobspr
b9c75258ff Minor fix, add hungarian translation prefab 2020-06-11 09:33:23 +02:00
hexagonhexagon
f34813392f Add Cut keybind. 2020-06-11 03:33:00 -04:00
Jaysc
ef3d492b41 Added continue button 2020-06-10 18:21:24 +01:00
tobspr
ef30a35ea4 Minor translation changes 2020-06-10 12:45:27 +02:00
tobspr
0fc1390769 Add language chooser to main menu 2020-06-10 12:29:21 +02:00
tobspr
714cd449e9 Initial support for translations 2020-06-10 12:13:38 +02:00
tobspr
89f934024b
Merge pull request #44 from hexagonhexagon/shop-ui-tweak 
Make upgrade formatting more clear
 2020-06-10 11:49:41 +02:00
tobspr
b56dd6fa7f Start working on 1.1.9 2020-06-10 11:33:16 +02:00
hexagonhexagon
d52e4c9054 Change upgrade formatting to specify the current and new multipliers to speed. 2020-06-07 19:34:47 -04:00
tobspr
a2ee16589f Switch to steam 2020-06-07 12:56:02 +02:00
tobspr
905be7a463 Update changelog 2020-06-04 18:06:25 +02:00
tobspr
be24057c27 Extend tutorial texts 2020-06-03 14:47:22 +02:00
tobspr
553442e953 Add weekly contests, bump to 1.1.5 2020-06-03 10:06:13 +02:00
tobspr
85f748566f Remove link to itch.io on update message 2020-06-02 17:16:48 +02:00