 slava0135
|
e6078bd4f6
|
oopsie x4
|
2020-11-28 21:49:59 +03:00 |
|
|
slava0135
|
b0477394e6
|
oopsie x3
|
2020-11-28 21:45:42 +03:00 |
|
|
slava0135
|
699750762f
|
removing unnecessary stuff
|
2020-11-28 21:38:50 +03:00 |
|
|
slava0135
|
ee3348d160
|
oopsie x2
|
2020-11-28 21:10:12 +03:00 |
|
|
slava0135
|
6dc2486ce0
|
oopsie
|
2020-11-28 21:06:20 +03:00 |
|
|
slava0135
|
724a0018b8
|
unit payload improvements
|
2020-11-28 20:39:09 +03:00 |
|
|
slava0135
|
3b20c68a6f
|
Merge branch 'master' of https://github.com/Anuken/Mindustry
|
2020-11-28 19:53:04 +03:00 |
|
|
slava0135
|
815a483d2c
|
typo in Fires:
/** Start a fire on the tile. If there already is a file there, refreshes its lifetime. */
|
2020-11-28 17:49:39 +03:00 |
|
|
slava0135
|
feb8202b73
|
better stats...
|
2020-09-30 21:17:44 +03:00 |
|
|
slava0135
|
65607ba6bf
|
better stats
|
2020-09-30 21:13:14 +03:00 |
|
|
slava0135
|
a806d7c019
|
Fun fact: 1.0 is smaller than 10
|
2020-09-30 20:41:56 +03:00 |
|
|
slava0135
|
aa5b3aa756
|
balancing
|
2020-09-30 20:30:04 +03:00 |
|
|
slava0135
|
48da4933fc
|
comma
|
2020-09-30 18:52:59 +03:00 |
|
|
slava0135
|
07cdbfa423
|
New turret sprite by EyeOfDarkness
|
2020-09-30 18:47:56 +03:00 |
|
|
slava0135
|
58ff3f2ef7
|
Merge branch 'master' of https://github.com/Anuken/Mindustry into tsunami
|
2020-09-30 17:18:20 +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 |
|
|
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 |
|
|
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 |
|
|
slava0135
|
79f4608e81
|
Merge remote-tracking branch 'origin/tsunami' into tsunami
|
2020-09-25 14:22:13 +03:00 |
|
|
slava0135
|
9050cac19c
|
added to tech tree
|
2020-09-25 14:21:52 +03:00 |
|
|
slava0135
|
3e81d194cb
|
New liquid turret - Tsunami
|
2020-09-25 11:49:04 +03:00 |
|