Commit Graph

9462 Commits

Author SHA1 Message Date
Anuken
2dfb9830a3
Merge branch 'master' into v107 2020-10-23 09:34:04 -04:00
Anuken
f8957b20c9
Merge pull request #2860 from BasedUser/patch-4
Update servers_be.json
2020-10-23 09:31:03 -04:00
Anuken
aad91cce03
Merge pull request #2826 from ActualWina/patch-7
Updates to bundle_es.properties
2020-10-23 09:30:27 -04:00
Anuken
a1de6e5288
Merge branch 'master' into patch-7 2020-10-23 09:30:23 -04:00
Anuken
b181eda196
Merge pull request #2822 from cinnx/patch-15
Update bundle_pl.properties
2020-10-23 09:28:51 -04:00
Anuken
a16b9240d6
Merge branch 'master' into patch-15 2020-10-23 09:28:47 -04:00
Anuken
e163a80ba7
Merge pull request #2748 from ballgamer56/patch-2
Update Thai translation
2020-10-23 09:25:05 -04:00
Anuken
a0f55861fe
Merge pull request #3028 from GlennFolker/master
allow mods to easily load icon region
2020-10-23 09:21:43 -04:00
Anuken
d66cf13ac6 Added buttons to clear campaign saves & research 2020-10-23 09:08:17 -04:00
Anuken
436a020c3e Fixed attack mode gamover check 2020-10-22 20:44:18 -04:00
Anuken
23673f0b11 typo 2020-10-22 20:34:02 -04:00
Anuken
bd659d2c97 Don't clear legacy unlocks after read 2020-10-22 20:33:26 -04:00
Anuken
514e2503fa Editor generation cleanup 2020-10-22 19:26:55 -04:00
MEEP of Faith
5203d17910 Comment stuff 2020-10-22 15:18:12 -07:00
Anuken
4f21ea7799 Fixed archipelago map / filters messing with block data 2020-10-22 18:11:12 -04:00
Anuken
a773edd838 (slightly) fewer polys in campaign 2020-10-22 17:12:38 -04:00
Anuken
ace9aebf2b Fixed #3068 2020-10-22 16:28:08 -04:00
Anuken
a2e75df096 Map editor tweaks & fixes / New map 2020-10-22 15:27:30 -04:00
Anuken
c2ff5a69ef Buffered map-load filter support / Spawn path filter 2020-10-22 12:27:22 -04:00
YellOw139
f4fcb8daa6
Update bundle_ro.properties 2020-10-22 19:14:48 +03:00
Anuken
46b2f4cccb Minor bugfixes & wave tweaks 2020-10-22 11:54:27 -04:00
Felix Corvus
c63b98150f
Merge branch 'master' into master 2020-10-22 18:21:52 +03:00
Vanguard
91164f659b
smol breyn 2020-10-22 18:02:39 +03:00
Vanguard
70750920fa
anuke shenanigans
a lot of them
2020-10-22 17:14:41 +03:00
Anuken
a732237005 Allowed enemy spawns on water 2020-10-22 09:43:21 -04:00
YellOw139
76d2fc0f54
Typo 2020-10-22 16:23:21 +03:00
Anuken
f2dd5ba113 Fixed #3062 / Fixed #3064 2020-10-22 09:11:48 -04:00
YellOw139
4d28b5083c
Quezler Status Fielded my mind 2020-10-22 14:27:56 +03:00
MEEP of Faith
da3c11a201 Comments 2020-10-21 23:14:54 -07:00
YellOw139
dabdf514d6
Space 2020-10-22 07:50:35 +03:00
MEEP of Faith
e7b6013d8d doot 2020-10-21 21:39:55 -07:00
MEEP of Faith
ed2825b0d9 doot 2020-10-21 21:37:52 -07:00
MEEP of Faith
50410be90a Define color instead of based on team 2020-10-21 21:33:57 -07:00
MEEP of Faith
0bd07866d8 m hm 2020-10-21 19:51:32 -07:00
MEEP of Faith
2dd234d960 oopeth 2020-10-21 19:32:29 -07:00
MEEP of Faith
43d1f363e5 Lightning Ability 2020-10-21 19:12:24 -07:00
Anuken
6c13250705 Merge remote-tracking branch 'origin/master' 2020-10-21 20:32:40 -04:00
Anuken
f0d74e2705 New map / Unit stat tweaks / FileChooser keyboard input 2020-10-21 20:32:35 -04:00
Anuken
1d65d54d9a
Merge pull request #3055 from summetdev/patch-6
[typo] Keybinds and keybinds.
2020-10-21 19:05:50 -04:00
Anuken
b71ae99301
Merge pull request #3054 from Catchears/cleanup
change surgealloy to surgeAlloy and phasefabric to phaseFabric
2020-10-21 16:34:40 -04:00
Summet
80bd1daea4
typo 2020-10-21 23:34:38 +03:00
YellOw139
21022436e8
Stats are finally consistent and up to date 2020-10-21 22:02:24 +03:00
Anuken
a80d0cc457 Fixed #3053 2020-10-21 14:10:28 -04:00
Wiki Updater
4d575364f4 change surgeAlloy and phaseFabric 2020-10-21 20:04:41 +02:00
Volas171
dec9e8d4aa
Merge branch 'master' into patch-1 2020-10-21 10:53:20 -05:00
Anuken
87dda1ba4b Merge remote-tracking branch 'origin/master' 2020-10-21 11:37:48 -04:00
Anuken
1cbcb742e9 Fixed #3052 2020-10-21 11:37:44 -04:00
Anuken
48f5be6623
Merge pull request #3051 from skykatik/patch-1
var -> let
2020-10-21 10:48:22 -04:00
Anuken
ee8f18796e Merge remote-tracking branch 'origin/master' 2020-10-21 10:37:07 -04:00
Anuken
3517da8214 Fixed #3049 2020-10-21 10:37:03 -04:00