Commit Graph

8556 Commits

Author SHA1 Message Date
Catchears
cff957feaf Merge branch 'master' into german-v6 2020-11-28 16:53:33 +01:00
Wiki Updater
4deb8fd626 resolve merge conflict 2020-11-28 16:49:24 +01:00
Anuken
2816aeb6e9 Merge pull request #3451 from Angel-24/patch-2
[Bundle][ES] Translation update
2020-11-28 09:46:30 -05:00
Anuken
f40e523764 Merge pull request #3567 from CPXMC/patch-6
Update bundle_zh_CN.properties
2020-11-28 09:46:23 -05:00
Anuken
8a424111f0 Fixed #3633 2020-11-28 09:43:35 -05:00
Wiki Updater
7a81fde64e changes from Shawak 2020-11-28 14:36:55 +01:00
Wiki Updater
1d8fbf7aa9 final changes 2020-11-28 10:50:35 +01:00
Anuken
2a6b0fd0ce Fixed vaults not counting withdrawn items 2020-11-27 18:09:47 -05:00
Anuken
47e622dee3 (more) Campaign balancing 2020-11-27 18:07:10 -05:00
Anuken
99125e9218 Merge remote-tracking branch 'origin/master' 2020-11-27 17:37:28 -05:00
Anuken
66918f0322 Campaign balancing 2020-11-27 17:37:22 -05:00
Wiki Updater
6634e6f8a5 ...
I think that it would be fair to add me into the list of translators and contributors as I've somehow editied over 800 lines of the german translation. If you don't think I should be added to the list, say that in a comment.
2020-11-27 23:19:56 +01:00
Wiki Updater
525643cb17 unit descriptions 2020-11-27 23:10:58 +01:00
Anuken
b8a2c609cb Merge pull request #3629 from Catchears/typo
typo
2020-11-27 16:19:16 -05:00
Wiki Updater
968277477a typo 2020-11-27 22:18:08 +01:00
Wiki Updater
4fbfb50380 more translations 2020-11-27 21:43:58 +01: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
Angel_24
7e5c69a107 Update bundle_es.properties 2020-11-27 13:07:38 +01:00
Angel_24
40dd3d5677 Update bundle_es.properties 2020-11-27 10:07:38 +01: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
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
Anuken
3fe4ae38b6 Misc cleanup 2020-11-26 12:53:19 -05: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
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