aboutsummaryrefslogtreecommitdiff
path: root/js/preloader
diff options
context:
space:
mode:
authorJose Antonio Marquez2012-02-11 22:33:26 -0800
committerJose Antonio Marquez2012-02-11 22:33:26 -0800
commitc6ed3331e88eb01a52ac533e5449df3af2fb5965 (patch)
tree2b660dc94a98bad02b46ba44a28424d692435fb3 /js/preloader
parent5d38e575b2bafeae9bd676247fce15ec5f78fa32 (diff)
parente142611e22718b1f1d1696902ad9161ec5f33f98 (diff)
downloadninja-c6ed3331e88eb01a52ac533e5449df3af2fb5965.tar.gz
Merge branch 'refs/heads/NinjaInternal' into Color
Diffstat (limited to 'js/preloader')
-rwxr-xr-xjs/preloader/Preloader.js17
1 files changed, 3 insertions, 14 deletions
diff --git a/js/preloader/Preloader.js b/js/preloader/Preloader.js
index 42460093..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,26 +58,15 @@ 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"},
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 {"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/BrickMaterial.js"},
69 {"type":"js", "url":"js/helper-classes/RDGE/Materials/UberMaterial.js"}, 68 {"type":"js", "url":"js/helper-classes/RDGE/Materials/UberMaterial.js"},
70 {"type":"js", "url":"js/helper-classes/RDGE/Materials/PlasmaMaterial.js"},
71 {"type":"js", "url":"js/helper-classes/RDGE/Materials/RadialGradientMaterial.js"}, 69 {"type":"js", "url":"js/helper-classes/RDGE/Materials/RadialGradientMaterial.js"},
72 {"type":"js", "url":"js/helper-classes/RDGE/Materials/RadialBlurMaterial.js"},
73 {"type":"js", "url":"js/helper-classes/RDGE/Materials/PulseMaterial.js"},
74 {"type":"js", "url":"js/helper-classes/RDGE/Materials/TunnelMaterial.js"},
75 {"type":"js", "url":"js/helper-classes/RDGE/Materials/TwistMaterial.js"},
76 {"type":"js", "url":"js/helper-classes/RDGE/Materials/KeleidoscopeMaterial.js"},
77 {"type":"js", "url":"js/helper-classes/RDGE/Materials/JuliaMaterial.js"},
78 {"type":"js", "url":"js/helper-classes/RDGE/Materials/MandelMaterial.js"},
79 {"type":"js", "url":"js/helper-classes/RDGE/Materials/IridescentScalesMaterial.js"},
80 {"type":"js", "url":"js/helper-classes/RDGE/Materials/PlasmaMaterial.js"},
81 {"type":"js", "url":"js/helper-classes/RDGE/Materials/LinearGradientMaterial.js"}, 70 {"type":"js", "url":"js/helper-classes/RDGE/Materials/LinearGradientMaterial.js"},
82 {"type":"js", "url":"js/helper-classes/RDGE/Materials/BumpMetalMaterial.js"}, 71 {"type":"js", "url":"js/helper-classes/RDGE/Materials/BumpMetalMaterial.js"},
83 {"type":"js", "url":"js/helper-classes/RDGE/GLWorld.js"}, 72 {"type":"js", "url":"js/helper-classes/RDGE/GLWorld.js"},