diff options
| author | Pushkar Joshi | 2012-02-28 14:19:25 -0800 |
|---|---|---|
| committer | Pushkar Joshi | 2012-02-28 14:19:25 -0800 |
| commit | 16d6a90579cdafede931a9c818689fad2e622d8b (patch) | |
| tree | e87f5d4a131d3574ef06cff1c46373d5b1046956 /js/preloader/Preloader.js | |
| parent | 03ca7a5ed13c25faaa9100bb666e062fd15335e6 (diff) | |
| parent | 63307c9abf120985d979a40a53a0598d3f0d5c5a (diff) | |
| download | ninja-16d6a90579cdafede931a9c818689fad2e622d8b.tar.gz | |
Merge branch 'pentool' into brushtool
Diffstat (limited to 'js/preloader/Preloader.js')
| -rwxr-xr-x | js/preloader/Preloader.js | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/js/preloader/Preloader.js b/js/preloader/Preloader.js index 21d7fcee..5b806909 100755 --- a/js/preloader/Preloader.js +++ b/js/preloader/Preloader.js | |||
| @@ -65,6 +65,9 @@ exports.Preloader = Montage.create(Component, { | |||
| 65 | {"type":"js", "url":"js/helper-classes/RDGE/GLMaterial.js"}, | 65 | {"type":"js", "url":"js/helper-classes/RDGE/GLMaterial.js"}, |
| 66 | {"type":"js", "url":"js/helper-classes/RDGE/GLLight.js"}, | 66 | {"type":"js", "url":"js/helper-classes/RDGE/GLLight.js"}, |
| 67 | 67 | ||
| 68 | {"type":"js", "url":"js/helper-classes/RDGE/runtime/CanvasDataManager.js"}, | ||
| 69 | {"type":"js", "url":"js/helper-classes/RDGE/runtime/GLRuntime.js"}, | ||
| 70 | |||
| 68 | {"type":"js", "url":"js/helper-classes/RDGE/Materials/FlatMaterial.js"}, | 71 | {"type":"js", "url":"js/helper-classes/RDGE/Materials/FlatMaterial.js"}, |
| 69 | {"type":"js", "url":"js/helper-classes/RDGE/Materials/TaperMaterial.js"}, | 72 | {"type":"js", "url":"js/helper-classes/RDGE/Materials/TaperMaterial.js"}, |
| 70 | {"type":"js", "url":"js/helper-classes/RDGE/Materials/TwistVertMaterial.js"}, | 73 | {"type":"js", "url":"js/helper-classes/RDGE/Materials/TwistVertMaterial.js"}, |