diff options
56 files changed, 62 insertions, 7 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/components/combobox.reel/combobox.js b/js/components/combobox.reel/combobox.js index f262bb06..a68a7d6b 100644 --- a/js/components/combobox.reel/combobox.js +++ b/js/components/combobox.reel/combobox.js | |||
@@ -67,7 +67,7 @@ exports.Combobox = Montage.create(Component, { | |||
67 | var e = document.createEvent("CustomEvent"); | 67 | var e = document.createEvent("CustomEvent"); |
68 | e.initEvent("change", true, true); | 68 | e.initEvent("change", true, true); |
69 | e.type = "change"; | 69 | e.type = "change"; |
70 | e._wasSetByCode = this._wasSetByCode; | 70 | e.wasSetByCode = this._wasSetByCode; |
71 | e.value = this._value; | 71 | e.value = this._value; |
72 | this.dispatchEvent(e); | 72 | this.dispatchEvent(e); |
73 | 73 | ||
diff --git a/js/components/radio.reel/radio.js b/js/components/radio.reel/radio.js index 954da3c4..c661ec11 100644 --- a/js/components/radio.reel/radio.js +++ b/js/components/radio.reel/radio.js | |||
@@ -41,7 +41,7 @@ exports.RadioGroup = Montage.create(Component, { | |||
41 | e = document.createEvent("CustomEvent"); | 41 | e = document.createEvent("CustomEvent"); |
42 | e.initEvent("change", true, true); | 42 | e.initEvent("change", true, true); |
43 | e.type = "change"; | 43 | e.type = "change"; |
44 | e._wasSetByCode = this._wasSetByCode; | 44 | e.wasSetByCode = this._wasSetByCode; |
45 | e.selectedIndex = i; | 45 | e.selectedIndex = i; |
46 | e.selectedItem = value; | 46 | e.selectedItem = value; |
47 | this.dispatchEvent(e); | 47 | this.dispatchEvent(e); |
@@ -77,7 +77,7 @@ exports.RadioGroup = Montage.create(Component, { | |||
77 | { | 77 | { |
78 | value:function(event) | 78 | value:function(event) |
79 | { | 79 | { |
80 | this._wasSetByCode = event._event._wasSetByCode; | 80 | this._wasSetByCode = event._event.wasSetByCode; |
81 | this.selectedItem = event._event.value; | 81 | this.selectedItem = event._event.value; |
82 | } | 82 | } |
83 | } | 83 | } |
@@ -126,7 +126,7 @@ exports.Radio = Montage.create(Component, { | |||
126 | var e = document.createEvent("CustomEvent"); | 126 | var e = document.createEvent("CustomEvent"); |
127 | e.initEvent("change", true, true); | 127 | e.initEvent("change", true, true); |
128 | e.type = "change"; | 128 | e.type = "change"; |