diff options
-rw-r--r-- | assets/images/BasePlatformA01_AO.png | bin | 65754 -> 0 bytes | |||
-rw-r--r-- | assets/images/BasePlatformA01_DM.png | bin | 70207 -> 0 bytes | |||
-rw-r--r-- | assets/images/BoxA01_AO.png | bin | 62516 -> 0 bytes | |||
-rw-r--r-- | assets/images/BoxA01_DM.png | bin | 54892 -> 0 bytes | |||
-rw-r--r-- | assets/images/Grunge.png | bin | 2174259 -> 0 bytes | |||
-rw-r--r-- | assets/images/LabelFrame.tga | bin | 12306 -> 0 bytes | |||
-rw-r--r-- | assets/images/MArmBaseN_DM.png | bin | 136280 -> 0 bytes | |||
-rw-r--r-- | assets/images/MArmBaseN_NM.png | bin | 109974 -> 0 bytes | |||
-rw-r--r-- | assets/images/MArmTopN_DM.png | bin | 136902 -> 0 bytes | |||
-rw-r--r-- | assets/images/MArmTopN_NM.png | bin | 97275 -> 0 bytes | |||
-rw-r--r-- | assets/images/MArm_AO.png | bin | 157336 -> 0 bytes | |||
-rw-r--r-- | assets/images/MBaseWallA01_AO.png | bin | 134056 -> 0 bytes | |||
-rw-r--r-- | assets/images/MBaseWallA01_DM.png | bin | 136022 -> 0 bytes | |||
-rw-r--r-- | assets/images/MBaseWallA01_GM.png | bin | 26051 -> 0 bytes | |||
-rw-r--r-- | assets/images/MBase_AO.png | bin | 165449 -> 0 bytes | |||
-rw-r--r-- | assets/images/MCoreBase_DM.png | bin | 130589 -> 0 bytes | |||
-rw-r--r-- | assets/images/MCoreBase_GM.png | bin | 9853 -> 0 bytes | |||
-rw-r--r-- | assets/images/MEjectorBaseN_DM.png | bin | 119768 -> 0 bytes | |||
-rw-r--r-- | assets/images/MEjectorBaseN_NM.png | bin | 57808 -> 0 bytes | |||
-rw-r--r-- | assets/images/MRingBaseN_DM.png | bin | 107671 -> 0 bytes | |||
-rw-r--r-- | assets/images/MRingBaseN_NM.png | bin | 94852 -> 0 bytes | |||
-rw-r--r-- | assets/images/MSquareBaseN_DM.png | bin | 76400 -> 0 bytes | |||
-rw-r--r-- | assets/images/MWall_AO.png | bin | 108536 -> 0 bytes | |||
-rw-r--r-- | assets/images/MWall_DM.png | bin | 133125 -> 0 bytes | |||
-rw-r--r-- | assets/images/MWall_GM.png | bin | 9294 -> 0 bytes | |||
-rw-r--r-- | assets/images/MWall_NM.png | bin | 89287 -> 0 bytes | |||
-rw-r--r-- | assets/images/Ref.png | bin | 13632 -> 0 bytes | |||
-rw-r--r-- | assets/images/Spec.png | bin | 2321526 -> 0 bytes | |||
-rw-r--r-- | assets/images/black.tga | bin | 210 -> 0 bytes | |||
-rw-r--r-- | assets/images/cube.png | bin | 34506 -> 0 bytes | |||
-rw-r--r-- | assets/images/cubelight_Glow.png | bin | 3635 -> 0 bytes | |||
-rw-r--r-- | assets/images/cubelight_spec.png | bin | 33249 -> 0 bytes | |||
-rw-r--r-- | assets/images/default_white.png | bin | 90 -> 0 bytes | |||
-rw-r--r-- | assets/images/droid.png | bin | 885 -> 0 bytes | |||
-rw-r--r-- | assets/images/env.png | bin | 85724 -> 0 bytes | |||
-rw-r--r-- | assets/images/femaleRobot.png | bin | 2857 -> 0 bytes | |||
-rw-r--r-- | assets/images/femaleRobot_Glow.png | bin | 2855 -> 0 bytes | |||
-rw-r--r-- | assets/images/lightRack.png | bin | 2857 -> 0 bytes | |||
-rw-r--r-- | assets/images/lightRack_Glow.png | bin | 2857 -> 0 bytes | |||
-rw-r--r-- | assets/images/metal.png | bin | 2366049 -> 696663 bytes | |||
-rw-r--r-- | assets/images/particle-star.png | bin | 3665 -> 0 bytes | |||
-rw-r--r-- | assets/images/quilt01.png | bin | 572888 -> 0 bytes | |||
-rw-r--r-- | assets/images/quilt01_E.png | bin | 3273 -> 0 bytes | |||
-rw-r--r-- | assets/images/quilt01_N.png | bin | 116034 -> 0 bytes | |||
-rw-r--r-- | assets/images/quilt02.png | bin | 391471 -> 0 bytes | |||
-rw-r--r-- | assets/images/quilt02_E.png | bin | 3273 -> 0 bytes | |||
-rw-r--r-- | assets/images/quilt02_N.png | bin | 34939 -> 0 bytes | |||
-rw-r--r-- | assets/images/white.tga | bin | 236 -> 0 bytes | |||
-rw-r--r-- | index.html | 22 | ||||
-rw-r--r-- | js/ninja.reel/ninja.js | 5 | ||||
-rwxr-xr-x | js/preloader/Preloader.js | 1 | ||||
-rw-r--r-- | redirect.html | 23 | ||||
-rw-r--r-- | versions.json | 8 |
53 files changed, 57 insertions, 2 deletions
diff --git a/assets/images/BasePlatformA01_AO.png b/assets/images/BasePlatformA01_AO.png deleted file mode 100644 index 11f74245..00000000 --- a/assets/images/BasePlatformA01_AO.png +++ /dev/null | |||
Binary files differ | |||
diff --git a/assets/images/BasePlatformA01_DM.png b/assets/images/BasePlatformA01_DM.png deleted file mode 100644 index f367ccb7..00000000 --- a/assets/images/BasePlatformA01_DM.png +++ /dev/null | |||
Binary files differ | |||
diff --git a/assets/images/BoxA01_AO.png b/assets/images/BoxA01_AO.png deleted file mode 100644 index 60a88883..00000000 --- a/assets/images/BoxA01_AO.png +++ /dev/null | |||
Binary files differ | |||
diff --git a/assets/images/BoxA01_DM.png b/assets/images/BoxA01_DM.png deleted file mode 100644 index cc6f6165..00000000 --- a/assets/images/BoxA01_DM.png +++ /dev/null | |||
Binary files differ | |||
diff --git a/assets/images/Grunge.png b/assets/images/Grunge.png deleted file mode 100644 index 49ff48e9..00000000 --- a/assets/images/Grunge.png +++ /dev/null | |||
Binary files differ | |||
diff --git a/assets/images/LabelFrame.tga b/assets/images/LabelFrame.tga deleted file mode 100644 index 7e3326bd..00000000 --- a/assets/images/LabelFrame.tga +++ /dev/null | |||
Binary files differ | |||
diff --git a/assets/images/MArmBaseN_DM.png b/assets/images/MArmBaseN_DM.png deleted file mode 100644 index 6845b555..00000000 --- a/assets/images/MArmBaseN_DM.png +++ /dev/null | |||
Binary files differ | |||
diff --git a/assets/images/MArmBaseN_NM.png b/assets/images/MArmBaseN_NM.png deleted file mode 100644 index 5009b0ec..00000000 --- a/assets/images/MArmBaseN_NM.png +++ /dev/null | |||
Binary files differ | |||
diff --git a/assets/images/MArmTopN_DM.png b/assets/images/MArmTopN_DM.png deleted file mode 100644 index ef3511b3..00000000 --- a/assets/images/MArmTopN_DM.png +++ /dev/null | |||
Binary files differ | |||
diff --git a/assets/images/MArmTopN_NM.png b/assets/images/MArmTopN_NM.png deleted file mode 100644 index 489c92db..00000000 --- a/assets/images/MArmTopN_NM.png +++ /dev/null | |||
Binary files differ | |||
diff --git a/assets/images/MArm_AO.png b/assets/images/MArm_AO.png deleted file mode 100644 index be27c8cb..00000000 --- a/assets/images/MArm_AO.png +++ /dev/null | |||
Binary files differ | |||
diff --git a/assets/images/MBaseWallA01_AO.png b/assets/images/MBaseWallA01_AO.png deleted file mode 100644 index d68e4209..00000000 --- a/assets/images/MBaseWallA01_AO.png +++ /dev/null | |||
Binary files differ | |||
diff --git a/assets/images/MBaseWallA01_DM.png b/assets/images/MBaseWallA01_DM.png deleted file mode 100644 index 02a31e16..00000000 --- a/assets/images/MBaseWallA01_DM.png +++ /dev/null | |||
Binary files differ | |||
diff --git a/assets/images/MBaseWallA01_GM.png b/assets/images/MBaseWallA01_GM.png deleted file mode 100644 index 726453ae..00000000 --- a/assets/images/MBaseWallA01_GM.png +++ /dev/null | |||
Binary files differ | |||
diff --git a/assets/images/MBase_AO.png b/assets/images/MBase_AO.png deleted file mode 100644 index 12d763da..00000000 --- a/assets/images/MBase_AO.png +++ /dev/null | |||
Binary files differ | |||
diff --git a/assets/images/MCoreBase_DM.png b/assets/images/MCoreBase_DM.png deleted file mode 100644 index 4d0ec6dd..00000000 --- a/assets/images/MCoreBase_DM.png +++ /dev/null | |||
Binary files differ | |||
diff --git a/assets/images/MCoreBase_GM.png b/assets/images/MCoreBase_GM.png deleted file mode 100644 index 81d464ec..00000000 --- a/assets/images/MCoreBase_GM.png +++ /dev/null | |||
Binary files differ | |||
diff --git a/assets/images/MEjectorBaseN_DM.png b/assets/images/MEjectorBaseN_DM.png deleted file mode 100644 index 1832c522..00000000 --- a/assets/images/MEjectorBaseN_DM.png +++ /dev/null | |||
Binary files differ | |||
diff --git a/assets/images/MEjectorBaseN_NM.png b/assets/images/MEjectorBaseN_NM.png deleted file mode 100644 index 4f7560d3..00000000 --- a/assets/images/MEjectorBaseN_NM.png +++ /dev/null | |||
Binary files differ | |||
diff --git a/assets/images/MRingBaseN_DM.png b/assets/images/MRingBaseN_DM.png deleted file mode 100644 index f8a4aebe..00000000 --- a/assets/images/MRingBaseN_DM.png +++ /dev/null | |||
Binary files differ | |||
diff --git a/assets/images/MRingBaseN_NM.png b/assets/images/MRingBaseN_NM.png deleted file mode 100644 index c9242acb..00000000 --- a/assets/images/MRingBaseN_NM.png +++ /dev/null | |||
Binary files differ | |||
diff --git a/assets/images/MSquareBaseN_DM.png b/assets/images/MSquareBaseN_DM.png deleted file mode 100644 index 5576eff0..00000000 --- a/assets/images/MSquareBaseN_DM.png +++ /dev/null | |||
Binary files differ | |||
diff --git a/assets/images/MWall_AO.png b/assets/images/MWall_AO.png deleted file mode 100644 index e5d5a684..00000000 --- a/assets/images/MWall_AO.png +++ /dev/null | |||
Binary files differ | |||
diff --git a/assets/images/MWall_DM.png b/assets/images/MWall_DM.png deleted file mode 100644 index b735de01..00000000 --- a/assets/images/MWall_DM.png +++ /dev/null | |||
Binary files differ | |||
diff --git a/assets/images/MWall_GM.png b/assets/images/MWall_GM.png deleted file mode 100644 index 2cd56c3d..00000000 --- a/assets/images/MWall_GM.png +++ /dev/null | |||
Binary files differ | |||
diff --git a/assets/images/MWall_NM.png b/assets/images/MWall_NM.png deleted file mode 100644 index 2650bc07..00000000 --- a/assets/images/MWall_NM.png +++ /dev/null | |||
Binary files differ | |||
diff --git a/assets/images/Ref.png b/assets/images/Ref.png deleted file mode 100644 index 226e4200..00000000 --- a/assets/images/Ref.png +++ /dev/null | |||
Binary files differ | |||
diff --git a/assets/images/Spec.png b/assets/images/Spec.png deleted file mode 100644 index 76658540..00000000 --- a/assets/images/Spec.png +++ /dev/null | |||
Binary files differ | |||
diff --git a/assets/images/black.tga b/assets/images/black.tga deleted file mode 100644 index 69124ff0..00000000 --- a/assets/images/black.tga +++ /dev/null | |||
Binary files differ | |||
diff --git a/assets/images/cube.png b/assets/images/cube.png deleted file mode 100644 index 6cb3ef82..00000000 --- a/assets/images/cube.png +++ /dev/null | |||
Binary files differ | |||
diff --git a/assets/images/cubelight_Glow.png b/assets/images/cubelight_Glow.png deleted file mode 100644 index 4f8c922f..00000000 --- a/assets/images/cubelight_Glow.png +++ /dev/null | |||
Binary files differ | |||
diff --git a/assets/images/cubelight_spec.png b/assets/images/cubelight_spec.png deleted file mode 100644 index 5cfe820b..00000000 --- a/assets/images/cubelight_spec.png +++ /dev/null | |||
Binary files differ | |||
diff --git a/assets/images/default_white.png b/assets/images/default_white.png deleted file mode 100644 index cca49ba7..00000000 --- a/assets/images/default_white.png +++ /dev/null | |||
Binary files differ | |||
diff --git a/assets/images/droid.png b/assets/images/droid.png deleted file mode 100644 index 9cba133e..00000000 --- a/assets/images/droid.png +++ /dev/null | |||
Binary files differ | |||
diff --git a/assets/images/env.png b/assets/images/env.png deleted file mode 100644 index 72bba813..00000000 --- a/assets/images/env.png +++ /dev/null | |||
Binary files differ | |||
diff --git a/assets/images/femaleRobot.png b/assets/images/femaleRobot.png deleted file mode 100644 index 30b153b4..00000000 --- a/assets/images/femaleRobot.png +++ /dev/null | |||
Binary files differ | |||
diff --git a/assets/images/femaleRobot_Glow.png b/assets/images/femaleRobot_Glow.png deleted file mode 100644 index 1141f521..00000000 --- a/assets/images/femaleRobot_Glow.png +++ /dev/null | |||
Binary files differ | |||
diff --git a/assets/images/lightRack.png b/assets/images/lightRack.png deleted file mode 100644 index 30b153b4..00000000 --- a/assets/images/lightRack.png +++ /dev/null | |||
Binary files differ | |||
diff --git a/assets/images/lightRack_Glow.png b/assets/images/lightRack_Glow.png deleted file mode 100644 index 30b153b4..00000000 --- a/assets/images/lightRack_Glow.png +++ /dev/null | |||
Binary files differ | |||
diff --git a/assets/images/metal.png b/assets/images/metal.png index d753bec4..ab36aaac 100644 --- a/assets/images/metal.png +++ b/assets/images/metal.png | |||
Binary files differ | |||
diff --git a/assets/images/particle-star.png b/assets/images/particle-star.png deleted file mode 100644 index 7da25295..00000000 --- a/assets/images/particle-star.png +++ /dev/null | |||
Binary files differ | |||
diff --git a/assets/images/quilt01.png b/assets/images/quilt01.png deleted file mode 100644 index 9c14865f..00000000 --- a/assets/images/quilt01.png +++ /dev/null | |||
Binary files differ | |||
diff --git a/assets/images/quilt01_E.png b/assets/images/quilt01_E.png deleted file mode 100644 index 2dbafd27..00000000 --- a/assets/images/quilt01_E.png +++ /dev/null | |||
Binary files differ | |||
diff --git a/assets/images/quilt01_N.png b/assets/images/quilt01_N.png deleted file mode 100644 index 801cd09d..00000000 --- a/assets/images/quilt01_N.png +++ /dev/null | |||
Binary files differ | |||
diff --git a/assets/images/quilt02.png b/assets/images/quilt02.png deleted file mode 100644 index 4b1bf2ed..00000000 --- a/assets/images/quilt02.png +++ /dev/null | |||
Binary files differ | |||
diff --git a/assets/images/quilt02_E.png b/assets/images/quilt02_E.png deleted file mode 100644 index 2dbafd27..00000000 --- a/assets/images/quilt02_E.png +++ /dev/null | |||
Binary files differ | |||
diff --git a/assets/images/quilt02_N.png b/assets/images/quilt02_N.png deleted file mode 100644 index 136d1008..00000000 --- a/assets/images/quilt02_N.png +++ /dev/null | |||
Binary files differ | |||
diff --git a/assets/images/white.tga b/assets/images/white.tga deleted file mode 100644 index a40a0a2b..00000000 --- a/assets/images/white.tga +++ /dev/null | |||
Binary files differ | |||
@@ -168,11 +168,31 @@ | |||
168 | 168 | ||
169 | <script type="text/javascript"> | 169 | <script type="text/javascript"> |
170 | window.onload = function() { | 170 | window.onload = function() { |
171 | // Check if we are running in Chrome | ||
172 | if(navigator.userAgent.toLowerCase().indexOf("chrome") === -1) { | ||
173 | window.location = "./redirect.html"; | ||
174 | } | ||
175 | // Load the version json | ||
176 | var req = new XMLHttpRequest(); | ||
177 | req.open("GET", "versions.json"); | ||
178 | req.onreadystatechange = (function(req) { | ||
179 | return function(event) { | ||
180 | if (req.readyState === 4) { | ||
181 | if (req.status === 200) { | ||
182 | window.ninjaVersion = JSON.parse(req.responseText); | ||
183 | } else { | ||
184 | console.log("Ninja version file could not be loaded"); | ||
185 | } | ||
186 | } | ||
187 | } | ||
188 | })(req); | ||
189 | req.send(); | ||
171 | // | 190 | // |
172 | var star = document.getElementById('star'); | 191 | var star = document.getElementById('star'); |
173 | // | 192 | // |
174 | njstar(star.getContext("2d")); | 193 | njstar(star.getContext("2d")); |
175 | } | 194 | }; |
195 | |||
176 | function njstar (ctx) { | 196 | function njstar (ctx) { |
177 | ctx.save(); | 197 | ctx.save(); |
178 | ctx.translate(0,0); | 198 | ctx.translate(0,0); |
diff --git a/js/ninja.reel/ninja.js b/js/ninja.reel/ninja.js index bc31e0e1..465533cd 100644 --- a/js/ninja.reel/ninja.js +++ b/js/ninja.reel/ninja.js | |||
@@ -13,6 +13,10 @@ exports.Ninja = Montage.create(Component, { | |||
13 | _appLoaded: { value: false }, | 13 | _appLoaded: { value: false }, |
14 | _preload: { value: false }, | 14 | _preload: { value: false }, |
15 | 15 | ||
16 | ninjaVersion: { | ||
17 | value: window.ninjaVersion.ninja.version | ||
18 | }, | ||
19 | |||
16 | toolsData: { value: null }, | 20 | toolsData: { value: null }, |
17 | appData: { value: AppData }, | 21 | appData: { value: AppData }, |
18 | 22 | ||
@@ -36,6 +40,7 @@ exports.Ninja = Montage.create(Component, { | |||
36 | 40 | ||
37 | prepareForDraw: { | 41 | prepareForDraw: { |
38 | value: function() { | 42 | value: function() { |
43 | console.log("Loading Ninja --> ", this.ninjaVersion); | ||
39 | 44 | ||
40 | this.application.ninja = this; | 45 | this.application.ninja = this; |
41 | 46 | ||
diff --git a/js/preloader/Preloader.js b/js/preloader/Preloader.js index 4a4ac019..3daeb1b4 100755 --- a/js/preloader/Preloader.js +++ b/js/preloader/Preloader.js | |||
@@ -135,7 +135,6 @@ exports.Preloader = Montage.create(Component, { | |||
135 | 135 | ||
136 | deserializedFromTemplate: { | 136 | deserializedFromTemplate: { |
137 | value: function() { | 137 | value: function() { |
138 | console.log("Start Preloading"); | ||
139 | 138 | ||
140 | this.filesTotal = this.ninjaJsRequire.length + this.ninjaCssRequire.length; | 139 | this.filesTotal = this.ninjaJsRequire.length + this.ninjaCssRequire.length; |
141 | 140 | ||
diff --git a/redirect.html b/redirect.html new file mode 100644 index 00000000..cf602f58 --- /dev/null +++ b/redirect.html | |||
@@ -0,0 +1,23 @@ | |||
1 | <!DOCTYPE html> | ||
2 | <!-- <copyright> | ||
3 | This file contains proprietary software owned by Motorola Mobility, Inc.<br/> | ||
4 | No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/> | ||
5 | (c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved. | ||
6 | </copyright> --> | ||
7 | <html> | ||
8 | |||
9 | <head> | <