Commit Graph

9124 Commits

Author SHA1 Message Date
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
Felix Corvus
ef62bb49bc 5 new lines; 1 line changed; 1 line removed
New:

- available
- research.legacy
- research.load
- research.discard
- reconnecting

Changed:

- indev.campaign

Removed:

- indev.popup
2020-11-27 03:13:28 +03: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
Wiki Updater
ed89a70cbc hints + sector descriptions in german 2020-11-26 21:39:14 +01: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
YellOw139
ef63c5073a Legacy prompts 2020-11-26 21:11:55 +02:00
Anuken
3fe4ae38b6 Misc cleanup 2020-11-26 12:53:19 -05:00
Petr Gašparík
0b515395e8 Merge branch 'master' of https://github.com/Anuken/Mindustry into v117 2020-11-26 17:48:24 +01:00
AmateurPotion
22116314c5 1st translation bundle
Please do not merge yet. Not all translated.
2020-11-27 01:32:31 +09:00
Wiki Updater
35da950986 german translation 2020-11-26 16:41:46 +01:00
Anuken
465219540c Added prompt for loading legacy research data 2020-11-26 10:22:01 -05:00
Angel_24
d1563ee55e Merge branch 'master' into patch-2 2020-11-26 10:43:13 +01:00
EzLam
49f4b1fd67 Merge branch 'master' of https://github.com/NgLamVN/Mindustry 2020-11-26 15:47:55 +07:00
EzLam
ba6d40cc22 to be continued ... 2020-11-26 15:47:30 +07:00
NgLamVN
dc15c9a7e4 To be continued ... 2020-11-26 15:42:27 +07:00
EzLam
27e22a84d3 to be continued ... 2020-11-26 15:40:35 +07:00
Petr Gašparík
33c3d587dd Merge branch 'master' of https://github.com/Anuken/Mindustry into v117 2020-11-26 09:11:09 +01:00
Angel_24
fa3a19d766 Update bundle_es.properties 2020-11-26 08:52:46 +01:00
Angel_24
0d4add667f Update bundle_es.properties 2020-11-26 08:49:44 +01:00
Angel_24
7f214f1343 Update bundle_es.properties 2020-11-26 08:47:11 +01: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
Sunny Kim
dd9c3fc8d6 Update bundle_ko.properties 2020-11-26 10:01:15 +09:00
Sunny Kim
a70e29127b [KO]quick patch 2020-11-26 09:59:07 +09: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
Angel_24
245e5d515a Update contributors 2020-11-25 23:22:17 +01:00
Leonwang4234
2b8c11c451 projectors blockgroup 2020-11-25 14:19:56 -08:00
Anuken
58acc0a970 Merge remote-tracking branch 'origin/master' 2020-11-25 15:42:56 -05:00
Anuken
c874089f27 Bugfixes 2020-11-25 15:42:51 -05:00
YellOw139
91b05e4789 Reconnecting 2020-11-25 22:29:32 +02:00
Angel_24
1cc73a4077 Finished Spanish Translation, for now... 2020-11-25 21:26:24 +01:00
Antsiferov Andrew
4ac26d86f5 Remove unused imports 2020-11-25 20:04:32 +00:00
Angel_24
a693289867 Update bundle_es.properties 2020-11-25 20:57:32 +01:00
Wiki Updater
51790e0bf9 fix ai schematics with power weapons and steam gens 2020-11-25 19:52:36 +01:00
Petr Gašparík
fd80cbcae5 Update up to b002d8b 2020-11-25 18:42:20 +01:00
Petr Gašparík
45bb6fa2ee Merge branch 'master' of https://github.com/Anuken/Mindustry into v117 2020-11-25 18:20:42 +01: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