diff options
| author | Valerio Virgillito | 2012-02-12 21:50:49 -0800 |
|---|---|---|
| committer | Valerio Virgillito | 2012-02-12 21:50:49 -0800 |
| commit | dcd147265ad0339448ea4466253b03b2899e0cea (patch) | |
| tree | a2afd9a3f4b4545141b21a31002d81bb5f79f44b | |
| parent | a30d76ff641ce89686cf5fbd9f04ac9ab4e9c830 (diff) | |
| parent | e142611e22718b1f1d1696902ad9161ec5f33f98 (diff) | |
| download | ninja-dcd147265ad0339448ea4466253b03b2899e0cea.tar.gz | |
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into stage-color
125 files changed, 9969 insertions, 2952 deletions
diff --git a/assets/images/irredecentENV.png b/assets/images/irredecentENV.png deleted file mode 100644 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 100644 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 100644 index 7808e81f..00000000 --- a/assets/images/stitchStroke.png +++ /dev/null | |||
| Binary files differ | |||
diff --git a/assets/shaders/Basic.vert.glsl b/assets/shaders/Basic.vert.glsl index 028786d1..0d5b8d63 100644 --- 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 |
diff --git a/credits.html b/credits.html index b2623600..1cc36c78 100644 --- a/credits.html +++ b/credits.html | |||
| @@ -7,7 +7,7 @@ | |||
| 7 | <html> | 7 | <html> |
| 8 | 8 | ||
| 9 | <head lang="en"> | ||
