Merge pull request #717 from sgrenier/next

Fixes terrain fragment shader compile error on GL ES

gameplay/res/shaders/terrain.frag

@@ -48,7 +48,7 @@ void main()
     // Set base diffuse color
     vec2 uvCoord = mod(v_texCoord0 * TEXTURE_REPEAT_0, vec2(1,1));
 	_baseColor.rgb = texture2D(u_samplers[TEXTURE_INDEX_0], uvCoord).rgb;
-    _baseColor.a = 1;
+    _baseColor.a = 1.0;
 #else
     // If no layers are defined, simple use a white color
     _baseColor = vec4(1,1,1,1);