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

1660 Commits

Author SHA1 Message Date
EmeraldBlock
a99dfacb52
Merge branch 'master' into patch-1 2020-09-29 11:04:13 -05:00
dengr1065
9aff7f9f6d
Rename delta to scale in camera.js (#705) 2020-09-29 17:44:22 +02:00
tobspr
69a3ae39bd proper sandbox flags 2020-09-29 17:06:31 +02:00
tobspr
d629eebcb6 Merge branch 'master' of https://github.com/tobspr/shapez.io 2020-09-29 16:51:12 +02:00
tobspr
5a5164880f Synchronize translations 2020-09-29 16:51:10 +02:00
EmeraldBlock
7f6c1187b8
Make zoom in and zoom out equal (#704)
* Make zoom in and zoom out equal

Makes zooming out zoom an amount equal to zooming in.

* format things better

* Made zoom keys also equal

Made zoom out equal to zoom in

* Actually made arrow keys equal

hope this actually works
2020-09-29 16:48:41 +02:00
tobspr
5a3807883e Update demo hint and lock demo to lvl 14 2020-09-29 16:46:29 +02:00
tobspr
9b7225bf44 Limit throughput 2020-09-29 13:16:37 +02:00
tobspr
1fc9efcd5d Minor translation change 2020-09-29 12:58:53 +02:00
tobspr
3e85938e16 Merge branch 'master' of https://github.com/tobspr/shapez.io 2020-09-29 12:58:18 +02:00
tobspr
e96821b555 Fix throughput goals and add layer preview to producer 2020-09-29 12:58:16 +02:00
Bzucak12
a320a35fa4
Update base-cz.yaml (#701)
I translated some things from the new wire update
2020-09-29 12:31:31 +02:00
tobspr
8ec2a90ae3 Do not send stats in sandbox 2020-09-29 11:19:16 +02:00
tobspr
e93b475f72 Rebalance, again 2020-09-29 11:14:27 +02:00
tobspr
db6db7caca Add sandbox building, restructure levels, show pinned shapes in constant signal dialog 2020-09-29 10:52:25 +02:00
EmeraldBlock
633a772b72
Merge pull request #3 from EmeraldBlock/patch-1
Undo unrelated thing
2020-09-28 16:04:42 -05:00
EmeraldBlock
f2ab8c153d
undo that 2020-09-28 16:00:10 -05:00
EmeraldBlock
1d65a7302a
Merge pull request #2 from EmeraldBlock/master
make things make sense
2020-09-28 15:54:30 -05:00
EmeraldBlock
a51c82b463
Merge branch 'patch-1' into master 2020-09-28 15:54:13 -05:00
EmeraldBlock
ef4626db99
Make zoom in and zoom out equal
Makes zooming out zoom an amount equal to zooming in.
2020-09-28 15:49:42 -05:00
tobspr
fd3bbcdc20 Enable beta overlay again 2020-09-28 18:24:18 +02:00
tobspr
25135056f7 update beta overlay 2020-09-28 18:20:57 +02:00
EmeraldBlock
1952695819
Merge pull request #1 from EmeraldBlock/patch-2
Update hub.js
2020-09-28 11:11:57 -05:00
EmeraldBlock
602f61acde
Merge branch 'master' into patch-2 2020-09-28 11:11:29 -05:00
EmeraldBlock
bf96ca0b02
Update hub.js 2020-09-28 11:06:44 -05:00
EmeraldBlock
1de6bdcf16
Merge branch 'master' into master 2020-09-28 11:04:58 -05:00
tobspr
07ac928717 Show warning when placing too many buildings 2020-09-28 15:01:28 +02:00
tobspr
9c75e1777d Show secondary toolbar on wires layer too 2020-09-28 14:50:55 +02:00
tobspr
31641bedad Skip fade on low fps 2020-09-28 14:47:23 +02:00
tobspr
d5f7a78386 Allow copying wire values 2020-09-28 14:45:53 +02:00
tobspr
7ed36daac0 Re-add sounds 2020-09-28 14:33:26 +02:00
tobspr
01b26b9713 Test: See if lfs is still annoying 2020-09-28 14:32:38 +02:00
tobspr
c32133f460 Get rid of remaining gitattributes 2020-09-28 14:31:57 +02:00
tobspr
9ed28c9b48 Update readme 2020-09-28 14:31:26 +02:00
tobspr
5b8887102a Add gitignore to sounds/ dir 2020-09-28 14:29:35 +02:00
tobspr
42262ed5f5 Get rid of remaining lfs file 2020-09-28 14:27:22 +02:00
tobspr
c40e28e4c4 Move sounds 2020-09-28 14:26:52 +02:00
tobspr
162cfe0455 Update readme 2020-09-28 13:54:22 +02:00
tobspr
e5310275d5 Re add lfs 2020-09-28 13:53:45 +02:00
tobspr
1dbb7820d0 get rid of gitattributes 2020-09-28 13:53:02 +02:00
tobspr
f12cae7bd3 Get rid of lfs files 2020-09-28 13:52:23 +02:00
tobspr
028b4ee8e4 Fix pipette in wires layer 2020-09-28 13:19:13 +02:00
tobspr
bf1ce919ec Merge branch 'master' of https://github.com/tobspr/shapez.io 2020-09-28 13:17:22 +02:00
tobspr
d11642e402 Update beta overlay 2020-09-28 13:17:21 +02:00
Bzucak12
56b29f1f9e
Update base-cz.yaml (#692) 2020-09-28 13:08:21 +02:00
tobspr
124a0162f6 Update all translations to the latest version 2020-09-28 13:08:01 +02:00
tobspr
b238b32fb9 Fix translation script 2020-09-28 13:07:30 +02:00
tobspr
1a91963732 Update translation script 2020-09-28 13:07:14 +02:00
Bzucak12
a0fb5b861c
Update base-cz.yaml (#699)
I updated some translations
2020-09-28 12:43:45 +02:00
CFWarfare
22baa5ba34
Update base-pt-BR.yaml (#691)
Fixed some phrases that wouldn't be used in the language regularly (like 'Código Aberto')
2020-09-28 12:43:33 +02:00