6a279923e3
If cost is low, copy instead of cut
2020-07-05 09:51:45 +09:00
1837e72952
Merge branch 'master' of https://github.com/tobspr/shapez.io
2020-07-04 18:34:04 +02:00
85bb280326
Update changelog & artwork
2020-07-04 18:34:02 +02:00
7cf467f4c3
Merge pull request #386 from Dimava/feature/scroll-center
...
Center zoom on mouse
2020-07-04 18:32:47 +02:00
e0f57788a6
Update base-ro.yaml
2020-07-04 19:30:40 +03:00
af1893ba08
find a more meaningful name and make it const
2020-07-04 19:28:10 +03:00
35f427da82
remove moving on min/max zoom
2020-07-04 19:28:07 +03:00
785f20c35f
fix jumps with desiredCenter
2020-07-04 19:28:04 +03:00
2f6b3afbab
Wheel zoom saves world mouse position
2020-07-04 19:28:02 +03:00
f0a75a8255
Minor changes, update changelog with latest contributions
2020-07-04 16:46:01 +02:00
db5b2e5870
Merge pull request #384 from Jaeyoon07031/patch-1
...
Super minor changes
2020-07-04 16:37:18 +02:00
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
3a1ef1ec5f
Merge pull request #381 from RisenAlex/patch-4
...
Update base-ro.yaml
2020-07-04 16:35:10 +02:00
eeed8dd991
Merge pull request #380 from isaisstillalive/patch-2
...
Close-shop-and-stats key mapping doesn't seem to exist
2020-07-04 16:34:35 +02:00
ed74c4be6e
Add first version of Croatian translation.
...
This is still incomplete, I still have some things left to translate. However, should be good enough for a first version.
2020-07-04 16:26:49 +02:00
c4f7d69864
Update base-ro.yaml
2020-07-04 00:37:46 +03:00
9d69bc87f2
Update base-ro.yaml
2020-07-03 18:35:08 +03:00
0d433d0460
Update base-cat.yaml
...
Changed mostra => mostrant (To show that it's whatever is happening at the moment rather than what it does, since it's a status, not a button)
Translated rewards section
Canviat Fem => Paperera (més directe) (incluïnt la variant central "brossa")
2020-07-03 16:35:47 +02:00
cea6692e2a
Super minor changes
...
Just found small changes i can make, not really big.
Someone was probably using google translate for the new parts and they could be replaced with better words so thats just what i did.
These changes are really small so you can wait for me to make more changes later on and then merge it.
2020-07-03 22:21:29 +09:00
7f6584297e
Fixed Fill blueprint shapes of SandboxController may not work
2020-07-03 19:53:09 +09:00
23119f9a1f
Update base-ro.yaml
2020-07-03 13:05:45 +03:00
50c53ec1f2
Close-shop-and-stats key mapping doesn't seem to exist
2020-07-03 17:31:19 +09:00
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
e822552a60
Refactoring obscure variable name
2020-07-03 16:29:29 +09:00
689980f819
Merge pull request #379 from RisenAlex/patch-2
...
Update base-ro.yaml
2020-07-03 08:53:20 +02:00
df3121aca2
Merge pull request #378 from JeremyMeissner/patchfr-1
...
Update base-fr.yaml
2020-07-03 08:53:04 +02:00
a99d12a7ff
Merge pull request #377 from EnderDoom77/patch-2
...
Made minor adaptations for consistency or grammar
2020-07-03 08:52:45 +02:00
4ca867d346
Merge pull request #364 from rogeriocamorim/patch-1
...
Update base-pt-BR.yaml
2020-07-03 08:48:05 +02:00
c8fd9b8789
Merge pull request #362 from Gumball73/patch-4
...
Update base-pt-PT.yaml
2020-07-03 08:47:46 +02:00
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
31fa93bbe6
Merge pull request #359 from Jaeyoon07031/patch-3
...
A few small changes
2020-07-03 08:46:57 +02:00
b584a206ae
Merge pull request #349 from EnderDoom77/patch-1
...
Correcting spelling and translated missing section
2020-07-03 08:44:53 +02:00
3c994c16d8
Update base-cat.yaml
2020-07-03 00:51:55 +02:00
4031ad526e
Update base-ro.yaml
2020-07-03 01:31:18 +03:00
2aa4673d69
Update base-fr.yaml
...
Fix the marker demo description text misspelling
2020-07-02 22:44:19 +02:00
d8c88fcb3c
Halfs => Halves
2020-07-02 22:28:05 +02:00
33f6c570c2
Translated up to Energy Generator
2020-07-02 22:22:45 +02:00
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
6f72ca7d95
Update base-cat.yaml
2020-07-02 20:45:05 +02:00
b02c7560ab
Merge branch 'master' into patch-1
2020-07-02 19:58:45 +02:00
d75fb184a4
Implement color inverter building
2020-07-02 18:16:04 +02:00
a77911263d
Implement concept of energy consumption
2020-07-02 17:43:47 +02:00
a977d4f9f4
Update sounds
2020-07-02 14:04:25 +02:00
ada63459aa
fix cycle building bug
2020-07-02 20:49:46 +09:00
30509be6b7
Add catalan language prefab
2020-07-02 09:48:15 +02:00
c29b505ef0
Add consistent enum comment
2020-07-02 01:05:25 +03:00
4bbbdafbb9
Fix copy-pasted code
...
i hate myself
2020-07-02 00:41:01 +03:00
133c66ebaf
Added more texts.
2020-07-01 16:00:35 -05:00
6769e9c9b8
Use enum for debug overlay
2020-07-01 23:53:51 +03:00
8a06cc2ac0
Add more translated texts
...
Add more translated texts
2020-07-01 14:52:40 -05:00
isaisstillalive
tobspr
tobspr
RisenAlex
Dimava
Ivan Bratović
EnderDoom77
Jaeyoon07031
ArnauGomar
Jeremy Meissner
dengr1065
Rogerio Camorim