diff options
| author | Eric Guzman | 2012-06-20 19:42:03 -0700 |
|---|---|---|
| committer | Eric Guzman | 2012-06-20 19:42:03 -0700 |
| commit | 3270aac4980c908f305fb53abadda5121ff6b9cb (patch) | |
| tree | 6255aaab239fde71b1f4862dd70de7be62f48b85 /assets/descriptor.json | |
| parent | a5d93daf6fdccbfee160d6a8ba08f6b6d4b9d7cc (diff) | |
| parent | 87377c81da06abf6d656017859830a3ab2902f0e (diff) | |
| download | ninja-3270aac4980c908f305fb53abadda5121ff6b9cb.tar.gz | |
Merge branch 'binding' of github.com:dhg637/ninja-internal into binding
Diffstat (limited to 'assets/descriptor.json')
| -rw-r--r-- | assets/descriptor.json | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/assets/descriptor.json b/assets/descriptor.json index 85fbc996..2873205f 100644 --- a/assets/descriptor.json +++ b/assets/descriptor.json | |||
| @@ -24,6 +24,7 @@ | |||
| 24 | "images/paris.png", | 24 | "images/paris.png", |
| 25 | "images/powderblue.png", | 25 | "images/powderblue.png", |
| 26 | "images/raiders.png", | 26 | "images/raiders.png", |
| 27 | "images/us_flag.png", | ||
| 27 | "shaders/Basic.frag.glsl", | 28 | "shaders/Basic.frag.glsl", |
| 28 | "shaders/TwistVert.vert.glsl", | 29 | "shaders/TwistVert.vert.glsl", |
| 29 | "shaders/Basic.vert.glsl", | 30 | "shaders/Basic.vert.glsl", |
| @@ -31,6 +32,7 @@ | |||
| 31 | "shaders/Deform.frag.glsl", | 32 | "shaders/Deform.frag.glsl", |
| 32 | "shaders/Water2.frag.glsl", | 33 | "shaders/Water2.frag.glsl", |
| 33 | "shaders/Flag.vert.glsl", | 34 | "shaders/Flag.vert.glsl", |
| 35 | "shaders/Flag.frag.glsl", | ||
| 34 | "shaders/ZInvert.frag.glsl", | 36 | "shaders/ZInvert.frag.glsl", |
| 35 | "shaders/Fly.frag.glsl", | 37 | "shaders/Fly.frag.glsl", |
| 36 | "shaders/linearGradient.frag.glsl", | 38 | "shaders/linearGradient.frag.glsl", |