New UI palette

core/assets/shaders/menu.fragment

@@ -3,6 +3,11 @@ precision mediump float;
 precision mediump int;
 #endif
 
+#define p1 vec3(255.0,211.0,127.0)/255.0
+#define p2 vec3(234.0,182.0,120.0)/255.0
+#define p3 vec3(212.0,129.0,107.0)/255.0
+#define p4 vec3(142.0,77.0,72.0)/255.0
+
 uniform sampler2D u_texture;
 uniform vec2 u_resolution;
 uniform int u_time;
@@ -26,8 +31,12 @@ void main() {
 	float d = (abs(float(coords.x)) - abs(float(coords.y)));
 
 	float m = abs(sin(-float(u_time)/50.0 + d/120.0));
-	m = float(int(m / roundm)) * roundm + roundm;
 
-    gl_FragColor.rgb = mix(v_color.rgb, vec3(0.0), m);
+	if(m > 0.95) gl_FragColor.rgb = p1;
+	else if(m > 0.75) gl_FragColor.rgb = p2;
+	else if(m > 0.55) gl_FragColor.rgb = p3;
+	else if(m > 0.35) gl_FragColor.rgb = p4;
+	else gl_FragColor.rgb = vec3(0.0);
+
     gl_FragColor.a = mod(abs(float(coords.x)) + abs(float(coords.y)), 110.0) < 35.0 ? 1.0 : 0.0;
 }

core/assets/ui/uiskin.json

@@ -71,12 +71,12 @@ ImageButtonStyle: {
 ScrollPaneStyle: {
 	default: {background: border, vScroll: scroll, vScrollKnob: scroll-knob-vertical-black},
 	horizontal: {background: border, vScroll: scroll, vScrollKnob: scroll-knob-vertical, hScroll: scroll-horizontal, hScrollKnob: scroll-knob-horizontal},
-	volume: {background: button-map, vScroll: scroll, vScrollKnob: scroll-knob-vertical-black},
+	volume: {background: button, vScroll: scroll, vScrollKnob: scroll-knob-vertical-black},
 	clear: {vScroll: scroll, vScrollKnob: scroll-knob-vertical-black},
 	clear-black: {vScroll: scroll, vScrollKnob: scroll-knob-vertical-black}
 },
 WindowStyle: {
-	default: {titleFont: default-font, background: window, titleFontColor: accent },
+	default: {titleFont: default-font, titleFontColor: accent },
 	dialog: {stageBackground: dialogDim, titleFont: default-font, background: window-empty, titleFontColor: accent }
 },
 KeybindDialogStyle: {

core/src/io/anuke/mindustry/graphics/Palette.java

@@ -43,8 +43,8 @@ public class Palette{
 
     heal = Color.valueOf("98ffa9"),
     bar = Color.SLATE,
-    accent = Color.valueOf("f4ba6e"),
-    accentBack = Color.valueOf("d58c4b"),
+    accent = Color.valueOf("ffd37f"),
+    accentBack = Color.valueOf("d4816b"),
     place = Color.valueOf("6335f8"),
     remove = Color.valueOf("e55454"),
     removeBack = Color.valueOf("a73e3e"),