diff options
author | Pushkar Joshi | 2012-02-24 12:08:49 -0800 |
---|---|---|
committer | Pushkar Joshi | 2012-02-24 12:08:49 -0800 |
commit | 03ca7a5ed13c25faaa9100bb666e062fd15335e6 (patch) | |
tree | c51112223ceb9121cd595a60335eb2795215590f /assets/descriptor.json | |
parent | fcb12cc09eb3cd3b42bd215877ba18f449275b75 (diff) | |
parent | 053fc63a2950c7a5ee4ebf98033b64d474a3c46e (diff) | |
download | ninja-03ca7a5ed13c25faaa9100bb666e062fd15335e6.tar.gz |
Merge branch 'pentool' into brushtool
Conflicts:
imports/codemirror/mode/scheme/scheme.js
js/tools/BrushTool.js
Diffstat (limited to 'assets/descriptor.json')
-rw-r--r-- | assets/descriptor.json | 35 |
1 files changed, 35 insertions, 0 deletions
diff --git a/assets/descriptor.json b/assets/descriptor.json new file mode 100644 index 00000000..ef21b8b8 --- /dev/null +++ b/assets/descriptor.json | |||
@@ -0,0 +1,35 @@ | |||
1 | { | ||
2 | "copyright": "This file contains proprietary software owned by Motorola Mobility, Inc. No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder. (c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved.", | ||
3 | "version": "0.0.0.0", | ||
4 | "root": "/assets/", | ||
5 | "directories": [{"name": "images"}, {"name": "shaders"}], | ||
6 | "files": [ | ||
7 | "rdge-compiled.js", | ||
8 | "images/black.png", | ||
9 | "images/blue.png", | ||
10 | "images/BoxB2_AO.png", | ||
11 | "images/BoxB2_DM.png", | ||
12 | "images/cubelight.png", | ||
13 | "images/grey.png", | ||
14 | "images/material_paint.png", | ||
15 | "images/metal.png", | ||
16 | "images/normalMap.png", | ||
17 | "images/random_normal.png", | ||
18 | "images/rocky-diffuse.jpg", | ||
19 | "images/rocky-normal.jpg", | ||
20 | "images/rocky-spec.jpg", | ||
21 | "images/silver.png", | ||
22 | "images/white.png", | ||
23 | "shaders/Basic.frag.glsl", | ||
24 | "shaders/Basic.vert.glsl", | ||
25 | "shaders/linearGradient.frag.glsl", | ||
26 | "shaders/linearGradient.vert.glsl", | ||
27 | "shaders/radialGradient.frag.glsl", | ||
28 | "shaders/radialGradient.vert.glsl", | ||
29 | "shaders/test_fshader.glsl", | ||
30 | "shaders/test_fshader_full.glsl", | ||
31 | "shaders/test_vshader.glsl", | ||
32 | "shaders/ub_fshader.glsl", | ||
33 | "shaders/ub_vshader.glsl" | ||
34 | ] | ||
35 | } \ No newline at end of file | ||