aboutsummaryrefslogtreecommitdiff
path: root/js/preloader
diff options
context:
space:
mode:
authorJose Antonio Marquez Russo2012-02-23 15:28:23 -0800
committerJose Antonio Marquez Russo2012-02-23 15:28:23 -0800
commit9a757cbbb19bba27a86060fd2d550a81f5ec71b4 (patch)
treef18c1eed05e296a1a5b7cbf57ebd2499f11529d8 /js/preloader
parentad7ae032bc55198e16a02dc75aa15303c033ea58 (diff)
parent26bb2894c29d4608e843de01829d352dd3d00823 (diff)
downloadninja-9a757cbbb19bba27a86060fd2d550a81f5ec71b4.tar.gz
Merge pull request #17 from ericmueller/integration
Integration
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"},