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 |
|
Anuken
|
6e62859d0e
|
Fixed #3644
|
2020-11-28 11:31:07 -05: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 |
|
Anuken
|
8a424111f0
|
Fixed #3633
|
2020-11-28 09:43:35 -05:00 |
|
Leonwang4234
|
4cda52caf7
|
size >= other.size
|
2020-11-27 21:15:33 -08:00 |
|
Anuken
|
2a6b0fd0ce
|
Fixed vaults not counting withdrawn items
|
2020-11-27 18:09:47 -05:00 |
|
Anuken
|
66918f0322
|
Campaign balancing
|
2020-11-27 17:37:22 -05:00 |
|
Anuken
|
d06b32c20b
|
Added boss to sector damage calculations
|
2020-11-27 14:18:09 -05:00 |
|
Anuken
|
525dc0cd7e
|
Added bosses for sectors missing them
|
2020-11-27 12:35:20 -05:00 |
|
Anuken
|
8b6fc7f3ac
|
Fixed #3628
|
2020-11-27 12:27:56 -05:00 |
|
Anuken
|
8dd66fb942
|
Campaign tweaks
|
2020-11-27 11:56:01 -05:00 |
|
Leonwang4234
|
ab8a381ad9
|
Lol how did it compile without the @Override
|
2020-11-26 23:33:18 -08:00 |
|
Leonwang4234
|
ced6369b25
|
Update Router.java
|
2020-11-26 23:28:05 -08:00 |
|
Anuken
|
e39eceee28
|
Allow research even if sector was attacked after capture
|
2020-11-26 21:48:45 -05:00 |
|
Anuken
|
869c329fbf
|
Fixed Nuclear Complex gen / Increased damage simulation harshness
|
2020-11-26 21:29:22 -05:00 |
|
Anuken
|
c8b425116e
|
Fixed Impact0078 ore gen / Misc campaign fixes
|
2020-11-26 20:46:17 -05:00 |
|
Anuken
|
0a290d2e10
|
Auto-rebuilding of broken attack sector blocks on restart
|
2020-11-26 20:19:13 -05:00 |
|
Anuken
|
9863cbc991
|
Disabled unit explosion team damage
|
2020-11-26 19:30:49 -05:00 |
|
Anuken
|
91c50ae126
|
Disabled explosion fires for item flammability <= 1
coming soon: spore bombing?
|
2020-11-26 19:25:26 -05:00 |
|
Anuken
|
dae46ceb6d
|
Campaign bugfixes / Balancing
|
2020-11-26 18:53:20 -05:00 |
|
Anuken
|
6b3919e8f7
|
Added Call#setItem
|
2020-11-26 16:49:01 -05:00 |
|
Anuken
|
1d8ec9abd9
|
Campaign bugfixes
|
2020-11-26 15:31:58 -05:00 |
|
Anuken
|
84474040c0
|
Fungal Pass map fixes
|
2020-11-26 14:24:35 -05:00 |
|
Anuken
|
3fe4ae38b6
|
Misc cleanup
|
2020-11-26 12:53:19 -05:00 |
|
Anuken
|
465219540c
|
Added prompt for loading legacy research data
|
2020-11-26 10:22:01 -05:00 |
|
Anuken
|
e1ddf115e0
|
Merged turret types
|
2020-11-25 20:41:38 -05:00 |
|
Anuken
|
56f1d0548e
|
Merge remote-tracking branch 'origin/master'
|
2020-11-25 20:23:24 -05:00 |
|
Anuken
|
38471d68d7
|
Fixed Salt Flats being deadlocked
|
2020-11-25 20:23:17 -05:00 |
|
Anuken
|
6be2b6021b
|
Merge pull request #3603 from skykatik/patch-12
Some typos
|
2020-11-25 18:28:30 -05:00 |
|
Skat
|
488147759a
|
Some typos
|
2020-11-26 02:04:08 +03:00 |
|
Anuken
|
9a7d359626
|
Merge pull request #3579 from Quezler/patch-68
Remove stray newline
|
2020-11-25 17:49:40 -05:00 |
|
Anuken
|
0437d50a5c
|
Merge pull request #3598 from summetdev/patch-8
Remove unused imports
|
2020-11-25 17:49:24 -05:00 |
|
Leonwang4234
|
2b8c11c451
|
projectors blockgroup
|
2020-11-25 14:19:56 -08:00 |
|
Anuken
|
c874089f27
|
Bugfixes
|
2020-11-25 15:42:51 -05:00 |
|
Antsiferov Andrew
|
4ac26d86f5
|
Remove unused imports
|
2020-11-25 20:04:32 +00:00 |
|
Anuken
|
40b67349d9
|
Fixed quotes
|
2020-11-25 11:56:10 -05:00 |
|
Anuken
|
735cb74483
|
Merge remote-tracking branch 'origin/master'
|
2020-11-25 11:15:50 -05:00 |
|
Anuken
|
bc55e43def
|
Fixed #3591
|
2020-11-25 11:15:46 -05:00 |
|
Anuken
|
084d7e8355
|
Merge pull request #3583 from Quezler/patch-69
automatic reconnect
|
2020-11-25 11:14:04 -05:00 |
|
Patrick 'Quezler' Mounier
|
f26b3358ef
|
Update core/src/mindustry/ui/dialogs/JoinDialog.java
Co-authored-by: Anuken <arnukren@gmail.com>
|
2020-11-25 17:08:03 +01:00 |
|
Patrick 'Quezler' Mounier
|
3d6390a76a
|
Set the ping to null when canceling manually as well
|
2020-11-25 16:51:57 +01:00 |
|
Patrick 'Quezler' Mounier
|
ff20928bec
|
Anukify reconnect logic
|
2020-11-25 16:49:36 +01:00 |
|
Anuken
|
8418770bbf
|
Merge remote-tracking branch 'origin/master'
|
2020-11-25 10:15:22 -05:00 |
|
Anuken
|
eaa7b04c3d
|
Fixed CI / Fixed exponentially increasing broken blocks
|
2020-11-25 10:15:14 -05:00 |
|
Patrick 'Quezler' Mounier
|
f5e06cca54
|
Update NetClient.java
|
2020-11-25 10:41:41 +01:00 |
|
Patrick 'Quezler' Mounier
|
642b877ab0
|
Update JoinDialog.java
|
2020-11-25 10:40:42 +01:00 |
|
Patrick 'Quezler' Mounier
|
8ee3f2b2e6
|
Remove stray newline
|
2020-11-25 09:38:04 +01:00 |
|
Patrick 'Quezler' Mounier
|
40bf0741f0
|
Remove unused import
|
2020-11-25 09:36:12 +01:00 |
|
Anuken
|
5fd66d38bb
|
Fixed #3573
|
2020-11-24 18:15:40 -05:00 |
|