Permalink
Browse files

Merge branch 'master' into gh-pages

  • Loading branch information...
2 parents 681c382 + f12668a commit 59a3d76f33ee9269f95d286743720e31f67fde5e @mmn80 committed Nov 18, 2012
Showing with 4 additions and 4 deletions.
  1. +1 −1 data/data.json
  2. +1 −1 data/datafile_alliances.xml
  3. +1 −1 data/datafile_towns.xml
  4. +1 −1 index.html
View

Large diffs are not rendered by default.

Oops, something went wrong.

Large diffs are not rendered by default.

Oops, something went wrong.
View

Large diffs are not rendered by default.

Oops, something went wrong.
View
@@ -36,7 +36,7 @@
void main(void) {
vec4 col = vec4(0., 0., 0., 1.);
- if (show_towns && texture2D(sampler_towns, tex_pos) != 0.) {
+ if (show_towns && texture2D(sampler_towns, tex_pos) != vec4(0.)) {
gl_FragColor = vec4(0., 1., 0., 1.);
return;
}

0 comments on commit 59a3d76

Please sign in to comment.