Merge

2018-11-28 22:37:49 -05:00
parent ccefa45fb0 23750bab55
commit 9ac8a4211e
89 changed files with 594 additions and 551 deletions
--- a/core/assets/shaders/menu.fragment
+++ b/core/assets/shaders/menu.fragment
@@ -38,7 +38,7 @@ void main() {
 	else if(m > 0.35) gl_FragColor.rgb = p4;
 	else gl_FragColor.rgb = vec3(0.0);

-	gl_FragColor.rgb *= 0.75;
+	gl_FragColor.rgb *= 0.5;

    gl_FragColor.a = mod(abs(float(coords.x)) + abs(float(coords.y)), 110.0) < 35.0 ? 1.0 : 0.0;
 }