diff options
| author | Jonathan Duran | 2012-02-27 11:22:51 -0800 |
|---|---|---|
| committer | Jonathan Duran | 2012-02-27 11:22:51 -0800 |
| commit | ab10898c78f2bd5d765d9c915848ed8c8e08c5a3 (patch) | |
| tree | b1ebb87e9c101c558108e1cec043d64a03cc50a1 /js/preloader | |
| parent | fb8aacbadba8dffb9619eb16e4626c197dc9264d (diff) | |
| parent | da60be29baab67440535b6b2b71fe7de989dfed0 (diff) | |
| download | ninja-ab10898c78f2bd5d765d9c915848ed8c8e08c5a3.tar.gz | |
Merge branch 'refs/heads/integration-candidate' into Timeline
Diffstat (limited to 'js/preloader')
| -rwxr-xr-x | js/preloader/Preloader.js | 3 |
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"}, |