diff options
| author | Jose Antonio Marquez | 2012-02-11 22:37:34 -0800 |
|---|---|---|
| committer | Jose Antonio Marquez | 2012-02-11 22:37:34 -0800 |
| commit | 9f2356c48b831d32d7278648656fe44b98bc4a1f (patch) | |
| tree | 58459a2e2e45ff2f4ffa9042740040ee17d91dfb /assets | |
| parent | 5eb38b8bd779c7fb6e59b966135f8d306378f034 (diff) | |
| parent | e142611e22718b1f1d1696902ad9161ec5f33f98 (diff) | |
| download | ninja-9f2356c48b831d32d7278648656fe44b98bc4a1f.tar.gz | |
Merge branch 'refs/heads/NinjaInternal' into FileIO
Conflicts:
js/ninja.reel/ninja.html
Diffstat (limited to 'assets')
| -rwxr-xr-x | assets/images/irredecentENV.png | bin | 103121 -> 0 bytes | |||
| -rwxr-xr-x | assets/images/scales_normal.png | bin | 113789 -> 0 bytes | |||
| -rwxr-xr-x | assets/images/stitchStroke.png | bin | 8054 -> 0 bytes | |||
| -rwxr-xr-x | assets/images/stitchStroke_N.png | bin | 2868 -> 0 bytes | |||
| -rwxr-xr-x | assets/shaders/Basic.vert.glsl | 2 |
5 files changed, 1 insertions, 1 deletions
diff --git a/assets/images/irredecentENV.png b/assets/images/irredecentENV.png deleted file mode 100755 index 21c1c9ce..00000000 --- a/assets/images/irredecentENV.png +++ /dev/null | |||
| Binary files differ | |||
diff --git a/assets/images/scales_normal.png b/assets/images/scales_normal.png deleted file mode 100755 index 87cc77dc..00000000 --- a/assets/images/scales_normal.png +++ /dev/null | |||
| Binary files differ | |||
diff --git a/assets/images/stitchStroke.png b/assets/images/stitchStroke.png deleted file mode 100755 index 7808e81f..00000000 --- a/assets/images/stitchStroke.png +++ /dev/null | |||
| Binary files differ | |||
diff --git a/assets/images/stitchStroke_N.png b/assets/images/stitchStroke_N.png deleted file mode 100755 index 34fa97d4..00000000 --- a/assets/images/stitchStroke_N.png +++ /dev/null | |||
| Binary files differ | |||
diff --git a/assets/shaders/Basic.vert.glsl b/assets/shaders/Basic.vert.glsl index 028786d1..0d5b8d63 100755 --- a/assets/shaders/Basic.vert.glsl +++ b/assets/shaders/Basic.vert.glsl | |||
| @@ -12,7 +12,7 @@ precision highp float; | |||
| 12 | 12 | ||
| 13 | // attributes | 13 | // attributes |
| 14 | attribute vec3 a_pos; | 14 | attribute vec3 a_pos; |
| 15 | 15 | attribute vec2 texcoord; | |
| 16 | 16 | ||
| 17 | 17 | ||
| 18 | // matrix uniforms | 18 | // matrix uniforms |
