Merge

2018-11-21 10:04:17 -05:00
parent 00706daae5 03ff33acaf
commit 1f955904a4
82 changed files with 2417 additions and 2577 deletions
--- a/core/src/io/anuke/mindustry/graphics/Palette.java
+++ b/core/src/io/anuke/mindustry/graphics/Palette.java
@@ -29,6 +29,7 @@ public class Palette{

    lightishGray = Color.valueOf("a2a2a2"),
    darkishGray = new Color(0.3f, 0.3f, 0.3f, 1f),
+    darkerGray = new Color(0.2f, 0.2f, 0.2f, 1f),

    boostTo = Color.valueOf("ffad4d"),
    boostFrom = Color.valueOf("ff7f57"),