diff options
author | Jon Reid | 2012-03-06 14:14:01 -0800 |
---|---|---|
committer | Jon Reid | 2012-03-06 14:14:01 -0800 |
commit | 60bba95eaffa8b5c741c6c85fb84b327cd75d6c3 (patch) | |
tree | 0087ad093418638ff1d0b4362715bd7b2d147eba | |
parent | d64f8c9fc1dd5fb15ad78ad61bed1ef3736321bb (diff) | |
parent | 342fb451bd251358068a0dcb10e9dc218b79a176 (diff) | |
download | ninja-60bba95eaffa8b5c741c6c85fb84b327cd75d6c3.tar.gz |
Merge remote-tracking branch 'ninja-jduran/TimelineUber' into Timeline-uber
105 files changed, 11517 insertions, 346 deletions
@@ -18,8 +18,9 @@ | |||
18 | <meta http-equiv="Expires" content="0" /> | 18 | <meta http-equiv="Expires" content="0" /> |
19 | 19 | ||
20 | <link rel="icon" href="images/favicon.png" sizes="16x16"> | 20 | <link rel="icon" href="images/favicon.png" sizes="16x16"> |
21 | 21 | ||
22 | <link href='http://fonts.googleapis.com/css?family=Droid+Sans:400,700|Droid+Sans+Mono' rel='stylesheet' type='text/css'> | 22 | <link href='http://fonts.googleapis.com/css?family=Droid+Sans:400,700|Droid+Sans+Mono' rel='stylesheet' type='text/css'> |
23 | <link href="imports/codemirror/lib/codemirror.css" rel="stylesheet" type="text/css"/> | ||
23 | 24 | ||
24 | <style type="text/css"> | 25 | <style type="text/css"> |
25 | html, body | 26 | html, body |
@@ -174,6 +175,15 @@ | |||
174 | }; | 175 | }; |
175 | </script> | 176 | </script> |
176 | 177 | ||
178 | <script type="text/javascript" src="js/helper-classes/3D/GLMatrix/gl-matrix.js"></script> | ||
179 | <script type="text/javascript" src="js/helper-classes/RDGE/rdge-compiled.js"></script> | ||
180 | |||
181 | <script type="text/javascript" src="imports/codemirror/lib/codemirror.js"></script> | ||
182 | <script type="text/javascript" src="imports/codemirror/mode/htmlmixed/htmlmixed.js"></script> | ||
183 | <script type="text/javascript" src="imports/codemirror/mode/xml/xml.js"></script> | ||
184 | <script type="text/javascript" src="imports/codemirror/mode/javascript/javascript.js"></script> | ||
185 | <script type="text/javascript" src="imports/codemirror/mode/css/css.js"></script> | ||
186 | |||
177 | <script type="text/javascript" src="node_modules/montage/montage.js"></script> | 187 | <script type="text/javascript" src="node_modules/montage/montage.js"></script> |
178 | 188 | ||
179 | <script type="text/montage-serialization"> | 189 | <script type="text/montage-serialization"> |
@@ -184,7 +194,7 @@ | |||
184 | "properties": { | 194 | "properties": { |
185 | "mainModule": "js/ninja.reel", | 195 | "mainModule": "js/ninja.reel", |
186 | "mainName": "Ninja", | 196 | "mainName": "Ninja", |
187 | "minimumBootstrappingDuration": 4000 | 197 | "minimumBootstrappingDuration": 3000 |
188 | } | 198 | } |
189 | } | 199 | } |
190 | } | 200 | } |
diff --git a/js/controllers/elements/shapes-controller.js b/js/controllers/elements/shapes-controller.js index 749a1dd9..3423a5a7 100755 --- a/js/controllers/elements/shapes-controller.js +++ b/ |