Anuken
2b2a12267a
Long-range 4x4 turret (wip) / Java 14 language upgrade
2020-09-29 23:55:55 -04:00
Thomas Widyantoko
d86813bbb3
Merge branch 'master' into patch-1
2020-09-30 07:12:28 +07:00
slava0135
fb53abe593
Final? design
2020-09-29 21:27:41 +03:00
slava0135
cbc2205347
Merge branch 'master' of https://github.com/Anuken/Mindustry into tsunami
...
Conflicts:
core/assets/sprites/block_colors.png
core/assets/sprites/fallback/sprites.atlas
core/assets/sprites/fallback/sprites.png
core/assets/sprites/fallback/sprites2.png
core/assets/sprites/fallback/sprites3.png
core/assets/sprites/fallback/sprites4.png
core/assets/sprites/fallback/sprites5.png
core/assets/sprites/fallback/sprites7.png
core/assets/sprites/fallback/sprites8.png
core/assets/sprites/sprites.atlas
core/assets/sprites/sprites.png
core/assets/sprites/sprites2.png
core/assets/sprites/sprites4.png
core/assets/sprites/sprites5.png
2020-09-29 18:31:42 +03:00
Petr Gašparík
de459df26b
Merge branch 'master' of https://github.com/Anuken/Mindustry into v106-alpha
2020-09-29 13:43:13 +02:00
Anuken
c89d6f6b74
Re-packed sprites from PR
2020-09-28 18:42:09 -04:00
ballgamer56
49df949967
Update bundle_th.properties
2020-09-28 16:33:34 +07:00
Petr Gašparík
250150a30c
Czech cleanup
2020-09-28 10:24:50 +02:00
ballgamer56
6d163e45ac
Update bundle_th.properties
2020-09-28 14:11:15 +07:00
ballgamer56
ced29f3d7b
Update bundle_th.properties
2020-09-28 07:28:22 +07:00
Petr Gašparík
8ce6520fca
Czech translation . update up to commit 9e0b29b
2020-09-28 00:03:51 +02:00
Petr Gašparík
53b556941c
Merge branch 'master' of https://github.com/Anuken/Mindustry into v106-alpha
2020-09-27 23:50:48 +02:00
ballgamer56
6f36724280
[WIP] Update Thai translation
2020-09-27 21:02:22 +07:00
Anuken
ff84d72e20
Cleaner wall sprites
2020-09-27 00:43:00 -04:00
Anuken
ae46535365
Sprite cleanup
2020-09-26 22:31:49 -04:00
Anuken
0c7ce94b13
Sprite cleanup
2020-09-26 22:29:15 -04:00
Anuken
7b98628084
Unbroke wave sprite
2020-09-26 22:20:02 -04:00
Anuken
d4d3b71d7d
Fixed #2735
2020-09-26 09:46:16 -04:00
Prosta4okua
52a610a957
Update bundle_uk_UA.properties
2020-09-25 14:13:06 +03:00
Prosta4okua
13ff69cbca
Update bundle_uk_UA.properties
2020-09-25 14:10:55 +03:00
slava0135
3e81d194cb
New liquid turret - Tsunami
2020-09-25 11:49:04 +03:00
YellOw139
08e6b4f2d7
Multiplayer note and the latest cleanup
2020-09-25 10:48:52 +03:00
老滑稽
8132cd9ba7
Update bundle_zh_CN.properties
2020-09-25 12:29:37 +08:00
Felix Corvus
54ce446a7f
nothing
2020-09-25 03:17:32 +03:00
Felix Corvus
38718ddc1d
Update bundle_ru.properties
2020-09-25 03:12:59 +03:00
Anuken
9e0b29b3dd
Cleanup
2020-09-24 18:11:10 -04:00
Anuken
504334999d
Campaign multiplayer note
2020-09-24 16:49:04 -04:00
Anuken
0a07458186
Power-based ammo / Refactoring / IP kicks / Fixes
2020-09-24 13:05:39 -04:00
老滑稽
1607a96a6a
Update bundle_zh_CN.properties
2020-09-25 00:17:43 +08:00
老滑稽
f5c8d0bf52
Update bundle_zh_CN.properties
2020-09-25 00:12:45 +08:00
老滑稽
f95f6d8c7b
Update bundle_zh_CN.properties
2020-09-25 00:07:24 +08:00
老滑稽
db558672cb
Update bundle_zh_CN.properties
2020-09-24 23:54:52 +08:00
Anuken
db94acdb83
Merge remote-tracking branch 'origin/master'
2020-09-24 09:23:42 -04:00
Anuken
68e708cf9a
d
2020-09-24 09:23:38 -04:00
YellOw139
0b4caec004
[Bundle][RO] Translation Update
...
This PR was tested in-game and is ready to merge at any time (unless marked as draft).
Changelog:
- Changes up until commit 35460f0b5f
2020-09-24 11:43:16 +03:00
Petr Gašparík
c08875498f
Czech update upto commit 35460f0
2020-09-24 07:38:26 +02:00
老滑稽
c2348f9019
Update bundle_zh_CN.properties
2020-09-24 13:10:06 +08:00
Anuken
35460f0b5f
Merge pull request #2692 from Prosta4okua/master
...
immediate RU L10n update
2020-09-23 23:03:54 -04:00
Felix Corvus
90fe7d7e59
immediate RU L10n update
2020-09-24 05:34:37 +03:00
Anuken
75ebaab3a3
Merge pull request #2660 from J-VdS/schematic
...
Server disable schematic option (fix #2382 )
2020-09-23 22:01:06 -04:00
Anuken
ada664a2ca
Fixed #2690
2020-09-23 21:46:40 -04:00
Anuken
764b93154e
Turret sprite tweaks
2020-09-23 19:16:33 -04:00
Anuken
28b7ef53bb
Updated bundle contents
2020-09-23 18:28:25 -04:00
Anuken
8efba6ada7
Merge pull request #2564 from Prosta4okua/master
...
[Bundle][RU] actual L10n
2020-09-23 18:25:36 -04:00
Anuken
fcff922370
Merge branch 'master' into patch-2
2020-09-23 18:25:12 -04:00
Anuken
14627dbbf7
Merge pull request #2639 from PetrGasparik/6.0-aplha-2
...
Czech translation track for 6.0 aplha 2
2020-09-23 18:24:48 -04:00
Anuken
5df5a6e39f
tweak
2020-09-23 18:01:12 -04:00
Anuken
3db2ffb843
Launch pad destination selection
2020-09-23 18:00:24 -04:00
Anuken
1cc8d7e3f4
Balance
2020-09-23 15:21:06 -04:00
J-VdS
d0c6f3274b
Merge branch 'master' into schematic
2020-09-23 16:29:41 +02:00
