LeoDog896
|
1c04653ffd
|
Autotiler cleanup and documentation
|
2020-09-30 09:29:57 -04:00 |
|
Voz-Duh
|
91274ae104
|
Fix
|
2020-09-30 16:19:32 +03:00 |
|
Voz-Duh
|
adf0f60abb
|
Fix
|
2020-09-30 16:08:32 +03:00 |
|
Voz-Duh
|
20e56ed3d3
|
Packed Liquid Drawer
|
2020-09-30 15:58:11 +03:00 |
|
LeoDog896
|
177aa934b6
|
Merge remote-tracking branch 'upstream/master'
|
2020-09-30 08:43:08 -04:00 |
|
Felix Corvus
|
aeaa5ac6e2
|
some trick
|
2020-09-30 15:42:07 +03:00 |
|
LeoDog896
|
a8c6c30382
|
Remove unused package
|
2020-09-30 08:41:33 -04:00 |
|
Felix Corvus
|
54d4f733ef
|
Update bundle_ru.properties
|
2020-09-30 14:35:52 +03:00 |
|
Felix Corvus
|
75d8f93dd9
|
Update bundle_ru.properties
|
2020-09-30 14:07:06 +03:00 |
|
Felix Corvus
|
3660f22d96
|
*Предвестник*
А потом из ру комьюнити приходят люди и спрашивают, почему **переводчики** испортили игру
|
2020-09-30 13:52:09 +03:00 |
|
slava0135
|
d4402ee3bb
|
Merge branch 'master' of https://github.com/Anuken/Mindustry into tsunami
Conflicts:
core/assets/icons/icons.properties
core/assets/sprites/block_colors.png
core/assets/sprites/fallback/sprites.atlas
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
core/src/mindustry/content/Blocks.java
|
2020-09-30 09:48:18 +03:00 |
|
Anuken
|
3c3c15dcf4
|
Merge branch 'master' of https://github.com/Anuken/Mindustry
|
2020-09-29 23:55:59 -04:00 |
|
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 |
|
summetdev
|
111e50c3c6
|
Safe last fileChooser's directory to settings
|
2020-09-29 22:04:27 +03:00 |
|
slava0135
|
fb53abe593
|
Final? design
|
2020-09-29 21:27:41 +03:00 |
|
slava0135
|
83a20810f7
|
recolor
|
2020-09-29 21:02:29 +03:00 |
|
slava0135
|
e5dc481d00
|
new texture
|
2020-09-29 20:40:09 +03:00 |
|
Anuken
|
c3274622b2
|
Fixed #2763
|
2020-09-29 11:53:45 -04:00 |
|
slava0135
|
d4441711a7
|
balance and size
|
2020-09-29 18:35:34 +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
|
1d0d06164b
|
Merge branch 'master' of https://github.com/Anuken/Mindustry into v106-alpha
|
2020-09-29 17:28:26 +02:00 |
|
Anuken
|
521ca1aea4
|
Fixed mechs not having animations on multiplayer
|
2020-09-29 10:57:06 -04: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
|
5523ea4752
|
Slag light
|
2020-09-28 19:37:18 -04:00 |
|
Anuken
|
c89d6f6b74
|
Re-packed sprites from PR
|
2020-09-28 18:42:09 -04:00 |
|
Anuken
|
d3863a7550
|
Merge remote-tracking branch 'origin/master'
|
2020-09-28 18:32:48 -04:00 |
|
Anuken
|
a5b1239c2b
|
Method renaming for consistency
|
2020-09-28 18:32:39 -04:00 |
|
Anuken
|
95146e032f
|
Merge pull request #2757 from Voz-Duh/cleaner-sprites
Cleaner Sprites
|
2020-09-28 17:34:40 -04:00 |
|
Voz-Duh
|
45e1700237
|
Fix
|
2020-09-28 21:58:37 +03:00 |
|
Voz-Duh
|
81ceec8d03
|
Fix
|
2020-09-28 21:47:42 +03:00 |
|
Anuken
|
6a45a965c0
|
Allow unloading non-visible blocks
|
2020-09-28 12:42:20 -04:00 |
|
Anuken
|
231902aec5
|
Fixed #2756
|
2020-09-28 11:02:53 -04:00 |
|
Voz-Duh
|
aef09a18b7
|
Fix
|
2020-09-28 17:38:11 +03:00 |
|
Voz-Duh
|
332365adc6
|
Fix
|
2020-09-28 17:36:35 +03:00 |
|
Voz-Duh
|
2c3813c94b
|
Cleaner Sprites
|
2020-09-28 17:34:05 +03:00 |
|
Anuken
|
f1d09053f3
|
Fixed #2755 / Fixed #2753
|
2020-09-28 10:26:08 -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 |
|
Petr Gašparík
|
27b1954fbf
|
Merge branch 'master' of https://github.com/Anuken/Mindustry into v106-alpha
|
2020-09-28 10:20:58 +02:00 |
|
ballgamer56
|
6d163e45ac
|
Update bundle_th.properties
|
2020-09-28 14:11:15 +07:00 |
|
Anuken
|
078a68a07d
|
Fixed cores being placeable on nothing
|
2020-09-27 23:00:38 -04: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 |
|
Anuken
|
482ec4b43c
|
Fixed #2752
|
2020-09-27 18:01:17 -04: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 |
|
Anuken
|
3bf01334c9
|
Many things
|
2020-09-27 17:15:31 -04: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
|
f46180298f
|
Merge branch 'master' of https://github.com/Anuken/Mindustry
|
2020-09-26 22:32:17 -04:00 |
|