aboutsummaryrefslogtreecommitdiff
path: root/js/preloader
diff options
context:
space:
mode:
authorValerio Virgillito2012-02-27 10:50:17 -0800
committerValerio Virgillito2012-02-27 10:50:17 -0800
commita5d635a29de97a7daa93b9036d7a7dce48f07670 (patch)
tree0199d2ed21ab474b88302abf57cb8b14a200f4fa /js/preloader
parentd392751242f9a4aad4199c941fd416c19c422ee1 (diff)
parentc65eb4b983e8020346cda4dc7bcb050cb1a410e1 (diff)
downloadninja-a5d635a29de97a7daa93b9036d7a7dce48f07670.tar.gz
Merge branch 'FileIO-Build-Candidate' of https://github.com/joseeight/ninja-internal into 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"},