aboutsummaryrefslogtreecommitdiff
path: root/js/preloader
diff options
context:
space:
mode:
authorValerio Virgillito2012-02-28 12:44:31 -0800
committerValerio Virgillito2012-02-28 12:44:31 -0800
commit7c9291a5bab4abd849547f8878f6fb962fc88250 (patch)
treed5dd4ee6ff901c00b40f3e89c3cfb620e60a5051 /js/preloader
parent6054d13cf1254447d2396889eafc6a953f0b8d4a (diff)
parent700611c9aaee6093bbf4e86503c1decb5ac65c83 (diff)
downloadninja-7c9291a5bab4abd849547f8878f6fb962fc88250.tar.gz
Merge branch 'refs/heads/integration-candidate'
Diffstat (limited to 'js/preloader')
-rwxr-xr-xjs/preloader/Preloader.js3
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"},