Commit Graph

7838 Commits

Author SHA1 Message Date
d66cf13ac6 Added buttons to clear campaign saves & research 2020-10-23 09:08:17 -04:00
436a020c3e Fixed attack mode gamover check 2020-10-22 20:44:18 -04:00
23673f0b11 typo 2020-10-22 20:34:02 -04:00
bd659d2c97 Don't clear legacy unlocks after read 2020-10-22 20:33:26 -04:00
514e2503fa Editor generation cleanup 2020-10-22 19:26:55 -04:00
4f21ea7799 Fixed archipelago map / filters messing with block data 2020-10-22 18:11:12 -04:00
a773edd838 (slightly) fewer polys in campaign 2020-10-22 17:12:38 -04:00
ace9aebf2b Fixed #3068 2020-10-22 16:28:08 -04:00
a2e75df096 Map editor tweaks & fixes / New map 2020-10-22 15:27:30 -04:00
c2ff5a69ef Buffered map-load filter support / Spawn path filter 2020-10-22 12:27:22 -04:00
46b2f4cccb Minor bugfixes & wave tweaks 2020-10-22 11:54:27 -04:00
a732237005 Allowed enemy spawns on water 2020-10-22 09:43:21 -04:00
f2dd5ba113 Fixed #3062 / Fixed #3064 2020-10-22 09:11:48 -04:00
6c13250705 Merge remote-tracking branch 'origin/master' 2020-10-21 20:32:40 -04:00
f0d74e2705 New map / Unit stat tweaks / FileChooser keyboard input 2020-10-21 20:32:35 -04:00
1d65d54d9a Merge pull request #3055 from summetdev/patch-6
[typo] Keybinds and keybinds.
2020-10-21 19:05:50 -04:00
b71ae99301 Merge pull request #3054 from Catchears/cleanup
change surgealloy to surgeAlloy and phasefabric to phaseFabric
2020-10-21 16:34:40 -04:00
80bd1daea4 typo 2020-10-21 23:34:38 +03:00
a80d0cc457 Fixed #3053 2020-10-21 14:10:28 -04:00
4d575364f4 change surgeAlloy and phaseFabric 2020-10-21 20:04:41 +02:00
87dda1ba4b Merge remote-tracking branch 'origin/master' 2020-10-21 11:37:48 -04:00
1cbcb742e9 Fixed #3052 2020-10-21 11:37:44 -04:00
48f5be6623 Merge pull request #3051 from skykatik/patch-1
var -> let
2020-10-21 10:48:22 -04:00
ee8f18796e Merge remote-tracking branch 'origin/master' 2020-10-21 10:37:07 -04:00
3517da8214 Fixed #3049 2020-10-21 10:37:03 -04:00
aba001f499 var deprecated, use let or const 2020-10-21 16:05:36 +03:00
54fd2e03b4 resolve conflicts 2020-10-20 15:57:48 -07:00
df37ce3cef Merge remote-tracking branch 'upstream/master' into wall-stats 2020-10-20 15:49:46 -07:00
18e6a43a87 Added weather to some built-in maps 2020-10-20 17:24:51 -04:00
8f58228317 More base parts 2020-10-20 15:43:06 -04:00
30abfc0619 Fixed #3045 2020-10-20 14:02:10 -04:00
82fe66b931 Titanium fuse ammo 2020-10-20 12:14:53 -04:00
03c60a93f0 Merge remote-tracking branch 'origin/master' 2020-10-20 11:21:54 -04:00
9ab272a01f Better server colors 2020-10-20 11:21:47 -04:00
e68d28ef51 Merge pull request #3041 from summetdev/admin-chat
Admin chat.
2020-10-20 09:10:18 -04:00
9060a9518a Fixed #3037 2020-10-20 09:05:41 -04:00
ffb94576ac Better colors
Co-authored-by: Patrick 'Quezler' Mounier <Quezler@me.com>
2020-10-20 15:04:03 +03:00
0c1c0f9557 Admin -> A 2020-10-20 13:56:53 +03:00
9f95aa035d Indents 2020-10-20 13:56:09 +03:00
89fca49b91 Put admin color to Pal 2020-10-20 13:51:21 +03:00
d3e26c7c16 Admin chat command 2020-10-20 13:33:28 +03:00
c27251cfb0 Fog 2020-10-19 18:28:37 -04:00
d5fb0e924a Merge remote-tracking branch 'origin/master' 2020-10-19 16:26:03 -04:00
6e8732387b Better weather classes 2020-10-19 16:25:59 -04:00
3c2e12621e rainbow liquid 2020-10-20 01:01:45 +09:00
efb42296cf remove final 2020-10-20 00:57:08 +09:00
cab08de1f7 Merge remote-tracking branch 'origin/master' 2020-10-19 11:34:59 -04:00
2ff749bd17 Unified stat system 2020-10-19 11:34:52 -04:00
073b82b70f Merge pull request #3029 from abomb4/patch-mod-environment
Json in Mod should be able to define OreBlock type
2020-10-19 10:43:53 -04:00
9e79ed8a26 Json in Mod should be able to define OreBlock type
That in mindustry.world.blocks.environment package
2020-10-19 22:34:52 +08:00