Fixed compile errors, unitification

core/assets/shaders/hit.fragment

@@ -0,0 +1,18 @@
+#ifdef GL_ES
+precision mediump float;
+precision mediump int;
+#endif
+
+uniform sampler2D u_texture;
+
+varying vec4 v_color;
+varying vec2 v_texCoord;
+
+void main() {
+
+	vec4 c = texture2D(u_texture, v_texCoord.xy);
+
+	c = mix(c, vec4(1.0, 1.0, 1.0, c.a), v_color.a);
+
+    gl_FragColor = c * vec4(v_color.rgb, 1.0);
+}

core/assets/shaders/outline.fragment

@@ -35,9 +35,6 @@ void main() {
 	if(any){
 		gl_FragColor = u_color;
 	}else{
-	    if((c.r < 0.01 && c.g < 0.01 && c.b < 0.01)){
-            c = vec4(0.0);
-	    }
-		gl_FragColor = mix(c, vec4(1.0, 1.0, 1.0, c.a), c.a) * v_color;
+		gl_FragColor = c * v_color;
 	}
 }

core/assets/version.properties

@@ -1,7 +1,7 @@
 #Autogenerated file. Do not modify.
-#Thu Mar 15 12:56:43 EDT 2018
+#Thu Mar 15 21:41:26 EDT 2018
 version=release
-androidBuildCode=523
+androidBuildCode=524
 name=Mindustry
 code=3.4
 build=custom build