aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPushkar Joshi2012-02-09 13:42:59 -0800
committerPushkar Joshi2012-02-09 13:42:59 -0800
commit6bb00e69713bd7131b2bc0a15e4e0cb6071d616c (patch)
tree08d43d3c3a6777032ce51c503947874c02bf3947
parent5f42bd1f7723483d374cdd3fe51ef8298c86a1a2 (diff)
parent666ae3e9119410cbf7fa974274d95336aaff091c (diff)
downloadninja-6bb00e69713bd7131b2bc0a15e4e0cb6071d616c.tar.gz
Merge branch 'master' into brushtool
Diffstat
-rw-r--r--credits.html99
-rw-r--r--css/ninja.css2
-rw-r--r--images/favicon.pngbin1085 -> 564 bytes
-rw-r--r--index.html291
-rw-r--r--js/components/treeview/ninja-branch.reel/ninja-branch.css11
-rw-r--r--js/components/treeview/ninja-leaf.reel/ninja-leaf.css2
-rw-r--r--js/components/treeview/treeview.reel/treeview.html2
-rw-r--r--js/controllers/elements/shapes-controller.js25
-rw-r--r--js/helper-classes/3D/math-utils.js97
-rw-r--r--js/helper-classes/3D/snap-manager.js17
-rw-r--r--js/helper-classes/RDGE/GLLine.js29
-rw-r--r--js/helper-classes/RDGE/GLMaterial.js2
-rw-r--r--js/helper-classes/RDGE/GLRectangle.js141
-rw-r--r--js/helper-classes/RDGE/Materials/BumpMetalMaterial.js10
-rw-r--r--js/helper-classes/RDGE/Materials/FlatMaterial.js31
-rw-r--r--js/helper-classes/RDGE/Materials/UberMaterial.js6
-rw-r--r--js/helper-classes/RDGE/MaterialsLibrary.js2
-rw-r--r--js/ninja.reel/ninja.js3
-rw-r--r--js/panels/properties/sections/position-and-size.reel/position-and-size.js89
-rw-r--r--js/panels/properties/sections/three-d-view.reel/three-d-view.html12
-rw-r--r--js/panels/properties/sections/three-d-view.reel/three-d-view.js3
-rw-r--r--js/tools/Rotate3DToolBase.js2
-rw-r--r--js/tools/RotateStage3DTool.js2
-rw-r--r--js/tools/SelectionTool.js40
-rw-r--r--js/tools/modifier-tool-base.js35
-rw-r--r--license.html52
-rw-r--r--scss/imports/scss/_PanelUI.scss2
27 files changed, 599 insertions, 408 deletions
diff --git a/credits.html b/credits.html
new file mode 100644
index 00000000..b2623600
--- /dev/null
+++ b/credits.html
@@ -0,0 +1,99 @@
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 lang="en">
10 <title>Motorola Ninja - Third Party Credits</title>
11
12 <meta charset="utf-8"/>
13 <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
14 <meta http-equiv="cache-control" content="no-store, no-cache, must-revalidate" />
15 <meta http-equiv="Pragma" content="no-store, no-cache" />
16 <meta http-equiv="Expires" content="0" />
17
18 <link rel="icon" href="images/favicon.png" sizes="16x16">
19
20 <style type="text/css">
21 html, body
22 {
23 width: 98%;
24 height: 98%;
25 overflow: hidden;
26 background: white;
27 margin: 0;
28 padding: 0;
29 color: black;
30 text-align: left;
31 font-family: Arial;
32 margin: 1%;
33 }
34
35 ul
36 {
37 margin-top: -2px;
38 margin-left: -9px;
39 }
40 </style>
41 </head>
42
43 <body>
44 <h2>Motorola Mobility, Inc. Ninja Third Party Credits</h2>
45 <div>
46 Dotted stroke drawing from Gavin Kistner
47 <ul>
48 <li>Code from: <a href="http://stackoverflow.com/questions/4576724/dotted-stroke-in-canvas/7210370#7210370" target="_blank">http://stackoverflow.com/questions/4576724/dotted-stroke-in-canvas/7210370#7210370</a></li>
49 <li>Used by permission of Gavin Kistner</li>
50 </ul>
51 </div>
52 <div>
53 CSS specificity in JavaScript from Graham Bradley
54 <ul>
55 <li>Code from: <a href="http://gbradley.com/2009/10/02/css-specificity-in-javascript" target="_blank">http://gbradley.com/2009/10/02/css-specificity-in-javascript</a></li>
56 <li>Used by permission of Graham Bradley</li>
57 </ul>
58 </div>
59
60 <div>
61 Highest Z index code from Jason Jaeger
62 <ul>
63 <li>Code from: <a href="http://greengeckodesign.com/blog/2007/07/get-highest-z-index-in-javascript.html#comment-248" target="_blank">http://greengeckodesign.com/blog/2007/07/get-highest-z-index-in-javascript.html#comment-248</a></li>
64 <li>Used by permission of Jason Jaeger</li>
65 </ul>
66 </div>
67 <div>
68 Webkit CSS Matrix code from Joe Lambert
69 <ul>
70 <li>Code from: <a href="https://github.com/joelambert/morf/blob/master/js/src/WebkitCSSMatrix.ext.js" target="_blank">https://github.com/joelambert/morf/blob/master/js/src/WebkitCSSMatrix.ext.js</a></li>
71 <li>Used by permission of Joe Lambert</li>
72 </ul>
73 </div>
74
75 <div>
76 GLMatrix code from Code from Brandon Jones
77 <ul>
78 <li>Code from: <a href="https://github.com/toji/gl-matrix" target="_blank">https://github.com/toji/gl-matrix</a></li>
79 <li>License: <a href="https://github.com/toji/gl-matrix/blob/master/LICENSE.md" target="_blank">https://github.com/toji/gl-matrix/blob/master/LICENSE.md</a></li>
80 </ul>
81 </div>
82
83 <div>
84 CodeMirror Code Editor
85 <ul>
86 <li>Code from: <a href="http://codemirror.net/" target="_blank">http://codemirror.net/</a> and <a href="https://github.com/marijnh/CodeMirror">https://github.com/marijnh/CodeMirror</a></li>
87 <li>License: <a href="https://github.com/marijnh/CodeMirror/blob/master/LICENSE" target="_blank">https://github.com/marijnh/CodeMirror/blob/master/LICENSE</a></li>
88 </ul>
89 </div>
90
91 <div>
92 Mongoose HTTP Server (for the Ninja Local Cloud application)
93 <ul>
94 <li>Code from: <a href="http://code.google.com/p/mongoose/" target="_blank">http://code.google.com/p/mongoose/</a></li>
95 <li>License: <a href="http://www.opensource.org/licenses/mit-license.php" target="_blank">http://www.opensource.org/licenses/mit-license.php</a></li>
96 </ul>
97 </div>
98 </body>
99</html> \ No newline at end of file
diff --git a/css/ninja.css b/css/ninja.css
index 8ce60a10..ba434f42 100644
--- a/css/ninja.css
+++ b/css/ninja.css
@@ -408,7 +408,7 @@ span.pp-span-all:focus { -webkit-box-shadow: none; background-color: #b4b4b4; bo
408 408
409#pp-container-list li, #pp-container-list span.span-space { background-repeat: no-repeat; } 409#pp-container-list li, #pp-container-list span.span-space { background-repeat: no-repeat; }
410 410
411#pp-container-list li.directory.open > span.pp-span-all > span.pp-col-files > span.span-space { background-image: url("../images/panels/project-panel/icon-file-folderopen.png"); background-position: 100% 0px; } 411#pp-container-list li.directory.open > span.pp-span-all > span.pp-col-files > span.span-space, .branch-label { background-image: url("../images/panels/project-panel/icon-file-folderopen.png"); background-position: 100% 0px; }
412 412
413#pp-container-list li.directory.closed > span.pp-span-all > span.pp-col-files > span.span-space { background-image: url("../images/panels/project-panel/icon-file-folderclosed.png"); background-position: 100% 0px; } 413#pp-container-list li.directory.closed > span.pp-span-all > span.pp-col-files > span.span-space { background-image: url("../images/panels/project-panel/icon-file-folderclosed.png"); background-position: 100% 0px; }
414 414
diff --git a/images/favicon.png b/images/favicon.png
index b578b2bf..dba96b25 100644
--- a/images/favicon.png
+++ b/images/favicon.png
Binary files differ
diff --git a/index.html b/index.html
index 53bd6605..306906c2 100644
--- a/index.html
+++ b/index.html
@@ -8,20 +8,19 @@
8 8
9 <head lang="en"> 9 <head lang="en">
10 10
11 <title>Ninja</title> 11 <title>Motorola Ninja</title>
12 12
13 <meta charset="utf-8"/> 13 <meta charset="utf-8"/>
14 <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/> 14 <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
15 <meta http-equiv="cache-control" content="no-store, no-cache, must-revalidate" /> 15 <meta http-equiv="cache-control" content="no-store, no-cache, must-revalidate" />
16 <meta http-equiv="Pragma" content="no-store, no-cache" /> 16 <meta http-equiv="Pragma" content="no-store, no-cache" />
17 <meta http-equiv="Expires" content="0" /> 17 <meta http-equiv="Expires" content="0" />
18 18
19 <link rel="icon" href="images/favicon.png" sizes="16x16"> 19 <link rel="icon" href="images/favicon.png" sizes="16x16">
20 20
21 <link href='http://fonts.googleapis.com/css?family=Droid+Sans:400,700|Droid+Sans+Mono' rel='stylesheet' type='text/css'> 21 <link href='http://fonts.googleapis.com/css?family=Droid+Sans:400,700|Droid+Sans+Mono' rel='stylesheet' type='text/css'>
22 22
23 <style type="text/css"> 23 <style type="text/css">
24
25 html, body 24 html, body
26 { 25 {
27 width: 100%; 26 width: 100%;
@@ -39,17 +38,8 @@
39 left: 0%; 38 left: 0%;
40 width: 100%; 39 width: 100%;
41 height: 100%; 40 height: 100%;
42 background-image: -webkit-radial-gradient(center, ellipse cover, rgba(40, 40, 40, 1) 0%, rgba(5, 5, 5, 1) 50%, rgba(0, 0, 0, 1) 100%);
43 background-size: auto, 115%; 41 background-size: auto, 115%;
44 background-color: rgba(150, 0, 0, 1); 42 background-color: rgba(0, 0, 0, 1);
45 background-position: center center;
46 background-repeat: no-repeat;/*
47
48 -webkit-animation-name: background-animation;
49 -webkit-animation-duration: 3s;
50 -webkit-animation-iteration-count: infinite;
51 -webkit-animation-timing-function: linear;
52*/
53 } 43 }
54 44
55 .montage-app-loaded body 45 .montage-app-loaded body
@@ -62,7 +52,6 @@
62 { 52 {
63 opacity: 0; 53 opacity: 0;
64 -webkit-transition: opacity 250ms ease-in-out; 54 -webkit-transition: opacity 250ms ease-in-out;
65 /* This is a hack, trying to smooth the draw */
66 -webkit-transition-delay: 500ms; 55 -webkit-transition-delay: 500ms;
67 } 56 }
68 57
@@ -73,112 +62,66 @@
73 62
74 #ninja_logo 63 #ninja_logo
75 { 64 {
76 width: 320px; 65 width: 256px;
77 height: 320px; 66 height: 256px;
78 position: absolute; 67 position: absolute;
79 top: 50%; 68 top: 165px;
80 left: 50%; 69 left: 28%;
81 margin: -160px 0px 0px -160px; 70 overflow: hidden;