diff options
author | Jose Antonio Marquez | 2012-02-23 10:37:04 -0800 |
---|---|---|
committer | Jose Antonio Marquez | 2012-02-23 10:37:04 -0800 |
commit | 287a0bad5b774a380ec6c8b3ddf24dc03234e248 (patch) | |
tree | edffa1dd9df53f26da4135068686997ccfbdf083 /js/preloader | |
parent | 14a8f4c4e373db213b3d42d30edaea8354ae57e3 (diff) | |
parent | cc295dd0fb873505eed01c232bd987cf6e2dcdd9 (diff) | |
download | ninja-287a0bad5b774a380ec6c8b3ddf24dc03234e248.tar.gz |
Merge branch 'refs/heads/NinjaInternal' into FileIO
Diffstat (limited to 'js/preloader')
-rwxr-xr-x | js/preloader/Preloader.js | 21 |
1 files changed, 20 insertions, 1 deletions
diff --git a/js/preloader/Preloader.js b/js/preloader/Preloader.js index 13ebbdbd..21d7fcee 100755 --- a/js/preloader/Preloader.js +++ b/js/preloader/Preloader.js | |||
@@ -64,11 +64,30 @@ exports.Preloader = Montage.create(Component, { | |||
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 | |||
67 | {"type":"js", "url":"js/helper-classes/RDGE/Materials/FlatMaterial.js"}, | 68 | {"type":"js", "url":"js/helper-classes/RDGE/Materials/FlatMaterial.js"}, |
69 | {"type":"js", "url":"js/helper-classes/RDGE/Materials/TaperMaterial.js"}, | ||
70 | {"type":"js", "url":"js/helper-classes/RDGE/Materials/TwistVertMaterial.js"}, | ||
68 | {"type":"js", "url":"js/helper-classes/RDGE/Materials/UberMaterial.js"}, | 71 | {"type":"js", "url":"js/helper-classes/RDGE/Materials/UberMaterial.js"}, |
69 | {"type":"js", "url":"js/helper-classes/RDGE/Materials/RadialGradientMaterial.js"}, | 72 | {"type":"js", "url":"js/helper-classes/RDGE/Materials/PlasmaMaterial.js"}, |
70 | {"type":"js", "url":"js/helper-classes/RDGE/Materials/LinearGradientMaterial.js"}, | 73 | {"type":"js", "url":"js/helper-classes/RDGE/Materials/LinearGradientMaterial.js"}, |
74 | {"type":"js", "url":"js/helper-classes/RDGE/Materials/RadialGradientMaterial.js"}, | ||
75 | {"type":"js", "url":"js/helper-classes/RDGE/Materials/RadialBlurMaterial.js"}, | ||
76 | {"type":"js", "url":"js/helper-classes/RDGE/Materials/PulseMaterial.js"}, | ||
77 | {"type":"js", "url":"js/helper-classes/RDGE/Materials/TunnelMaterial.js"}, | ||
78 | {"type":"js", "url":"js/helper-classes/RDGE/Materials/ReliefTunnelMaterial.js"}, | ||
79 | {"type":"js", "url":"js/helper-classes/RDGE/Materials/SquareTunnelMaterial.js"}, | ||
80 | {"type":"js", "url":"js/helper-classes/RDGE/Materials/FlyMaterial.js"}, | ||
81 | {"type":"js", "url":"js/helper-classes/RDGE/Materials/WaterMaterial.js"}, | ||
82 | {"type":"js", "url":"js/helper-classes/RDGE/Materials/ZInvertMaterial.js"}, | ||
83 | {"type":"js", "url":"js/helper-classes/RDGE/Materials/DeformMaterial.js"}, | ||
84 | {"type":"js", "url":"js/helper-classes/RDGE/Materials/StarMaterial.js"}, | ||
85 | {"type":"js", "url":"js/helper-classes/RDGE/Materials/TwistMaterial.js"}, | ||
86 | {"type":"js", "url":"js/helper-classes/RDGE/Materials/KeleidoscopeMaterial.js"}, | ||
87 | {"type":"js", "url":"js/helper-classes/RDGE/Materials/JuliaMaterial.js"}, | ||
88 | {"type":"js", "url":"js/helper-classes/RDGE/Materials/MandelMaterial.js"}, | ||
71 | {"type":"js", "url":"js/helper-classes/RDGE/Materials/BumpMetalMaterial.js"}, | 89 | {"type":"js", "url":"js/helper-classes/RDGE/Materials/BumpMetalMaterial.js"}, |
90 | |||
72 | {"type":"js", "url":"js/helper-classes/RDGE/GLWorld.js"}, | 91 | {"type":"js", "url":"js/helper-classes/RDGE/GLWorld.js"}, |
73 | {"type":"js", "url":"js/helper-classes/RDGE/GLGeomObj.js"}, | 92 | {"type":"js", "url":"js/helper-classes/RDGE/GLGeomObj.js"}, |
74 | {"type":"js", "url":"js/helper-classes/RDGE/GLCircle.js"}, | 93 | {"type":"js", "url":"js/helper-classes/RDGE/GLCircle.js"}, |