aboutsummaryrefslogtreecommitdiff
path: root/js/preloader
diff options
context:
space:
mode:
authorValerio Virgillito2012-02-13 21:43:51 -0800
committerValerio Virgillito2012-02-13 21:43:51 -0800
commit081f17954c735fc8b946d72a25b0ee60d370ef9b (patch)
treede7b50f2d02365df897ef4356f953d3833c9cabd /js/preloader
parent47df0aff81c25334b129047bb227ea5015357eda (diff)
parent1d82f1a041612f32bbf6c9f20d9fb14e2d11fcc7 (diff)
downloadninja-081f17954c735fc8b946d72a25b0ee60d370ef9b.tar.gz
Merge branch 'refs/heads/master' into components
Conflicts: js/components/treeview/ninja-leaf.reel/ninja-leaf.js Signed-off-by: Valerio Virgillito <valerio@motorola.com>
Diffstat (limited to 'js/preloader')
-rwxr-xr-xjs/preloader/Preloader.js16
1 files changed, 3 insertions, 13 deletions
diff --git a/js/preloader/Preloader.js b/js/preloader/Preloader.js
index d735af0b..929e4ef4 100755
--- a/js/preloader/Preloader.js
+++ b/js/preloader/Preloader.js
@@ -17,10 +17,10 @@ exports.Preloader = Montage.create(Component, {
17 {"type":"js", "url":"js/helper-classes/3D/GLMatrix/gl-matrix.js"}, 17 {"type":"js", "url":"js/helper-classes/3D/GLMatrix/gl-matrix.js"},
18 {"type":"js", "url":"js/codemirror/lib/codemirror.js"}, 18 {"type":"js", "url":"js/codemirror/lib/codemirror.js"},
19 19
20 //{"type":"js", "url":"js/helper-classes/RDGE/rdge-compiled.js"}, 20 {"type":"js", "url":"js/helper-classes/RDGE/rdge-compiled.js"},
21 21
22 // source RDGE 22 // source RDGE
23 /* */ 23 /*
24 {"type":"js", "url":"js/helper-classes/RDGE/src/core/script/math/vec2.js"}, 24 {"type":"js", "url":"js/helper-classes/RDGE/src/core/script/math/vec2.js"},
25 {"type":"js", "url":"js/helper-classes/RDGE/src/core/script/math/vec3.js"}, 25 {"type":"js", "url":"js/helper-classes/RDGE/src/core/script/math/vec3.js"},
26 {"type":"js", "url":"js/helper-classes/RDGE/src/core/script/math/vec4.js"}, 26 {"type":"js", "url":"js/helper-classes/RDGE/src/core/script/math/vec4.js"},
@@ -58,7 +58,7 @@ exports.Preloader = Montage.create(Component, {
58 {"type":"js", "url":"js/helper-classes/RDGE/src/core/script/init_state.js"}, 58 {"type":"js", "url":"js/helper-classes/RDGE/src/core/script/init_state.js"},
59 {"type":"js", "url":"js/helper-classes/RDGE/src/core/script/runtime.js"}, 59 {"type":"js", "url":"js/helper-classes/RDGE/src/core/script/runtime.js"},
60 {"type":"js", "url":"js/helper-classes/RDGE/src/core/script/util/dbgpanel.js"}, 60 {"type":"js", "url":"js/helper-classes/RDGE/src/core/script/util/dbgpanel.js"},
61 /* */ 61 */
62 62
63 {"type":"js", "url":"js/helper-classes/3D/ParseUtils.js"}, 63 {"type":"js", "url":"js/helper-classes/3D/ParseUtils.js"},
64 {"type":"js", "url":"js/helper-classes/RDGE/GLLine.js"}, 64 {"type":"js", "url":"js/helper-classes/RDGE/GLLine.js"},
@@ -66,17 +66,7 @@ exports.Preloader = Montage.create(Component, {
66 {"type":"js", "url":"js/helper-classes/RDGE/GLLight.js"}, 66 {"type":"js", "url":"js/helper-classes/RDGE/GLLight.js"},
67 {"type":"js", "url":"js/helper-classes/RDGE/Materials/FlatMaterial.js"}, 67 {"type":"js", "url":"js/helper-classes/RDGE/Materials/FlatMaterial.js"},
68 {"type":"js", "url":"js/helper-classes/RDGE/Materials/UberMaterial.js"}, 68 {"type":"js", "url":"js/helper-classes/RDGE/Materials/UberMaterial.js"},
69 {"type":"js", "url":"js/helper-classes/RDGE/Materials/PlasmaMaterial.js"},
70 {"type":"js", "url":"js/helper-classes/RDGE/Materials/RadialGradientMaterial.js"}, 69 {"type":"js", "url":"js/helper-classes/RDGE/Materials/RadialGradientMaterial.js"},
71 {"type":"js", "url":"js/helper-classes/RDGE/Materials/RadialBlurMaterial.js"},
72 {"type":"js", "url":"js/helper-classes/RDGE/Materials/PulseMaterial.js"},
73 {"type":"js", "url":"js/helper-classes/RDGE/Materials/TunnelMaterial.js"},
74 {"type":"js", "url":"js/helper-classes/RDGE/Materials/TwistMaterial.js"},
75 {"type":"js", "url":"js/helper-classes/RDGE/Materials/KeleidoscopeMaterial.js"},
76 {"type":"js", "url":"js/helper-classes/RDGE/Materials/JuliaMaterial.js"},
77 {"type":"js", "url":"js/helper-classes/RDGE/Materials/MandelMaterial.js"},
78 {"type":"js", "url":"js/helper-classes/RDGE/Materials/IridescentScalesMaterial.js"},
79 {"type":"js", "url":"js/helper-classes/RDGE/Materials/PlasmaMaterial.js"},
80 {"type":"js", "url":"js/helper-classes/RDGE/Materials/LinearGradientMaterial.js"}, 70 {"type":"js", "url":"js/helper-classes/RDGE/Materials/LinearGradientMaterial.js"},
81 {"type":"js", "url":"js/helper-classes/RDGE/Materials/BumpMetalMaterial.js"}, 71 {"type":"js", "url":"js/helper-classes/RDGE/Materials/BumpMetalMaterial.js"},
82 {"type":"js", "url":"js/helper-classes/RDGE/GLWorld.js"}, 72 {"type":"js", "url":"js/helper-classes/RDGE/GLWorld.js"},