aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJose Antonio Marquez2012-01-30 18:25:03 -0800
committerJose Antonio Marquez2012-01-30 18:25:03 -0800
commit6dc03672707a91085954359d82c14bd876f85b12 (patch)
treeb213ff3f082341797c59b4643fbcb5e7d50ccbb4
parent3b4291c783c4b8fb07f111a240049069277f3c49 (diff)
parent682f895b42863fc36574f04aa930b7d4c9a1c114 (diff)
downloadninja-6dc03672707a91085954359d82c14bd876f85b12.tar.gz
Merge branch 'refs/heads/NinjaInternal' into FileIO
Conflicts: _scss/compass_app_log.txt _scss/imports/scss/_Stage.scss
-rw-r--r--.gitignore4
-rwxr-xr-x_scss/imports/scss/_Stage.scss103
-rwxr-xr-xassets/images/BasePlatformA01_AO.pngbin65754 -> 0 bytes
-rwxr-xr-xassets/images/BasePlatformA01_DM.pngbin70207 -> 0 bytes
-rwxr-xr-xassets/images/BoxA01_AO.pngbin62516 -> 0 bytes
-rwxr-xr-xassets/images/BoxA01_DM.pngbin54892 -> 0 bytes
-rwxr-xr-xassets/images/Grunge.pngbin2174259 -> 0 bytes
-rwxr-xr-xassets/images/LabelFrame.tgabin12306 -> 0 bytes
-rwxr-xr-xassets/images/MArmBaseN_DM.pngbin136280 -> 0 bytes
-rwxr-xr-xassets/images/MArmBaseN_NM.pngbin109974 -> 0 bytes
-rwxr-xr-xassets/images/MArmTopN_DM.pngbin136902 -> 0 bytes
-rwxr-xr-xassets/images/MArmTopN_NM.pngbin97275 -> 0 bytes
-rwxr-xr-xassets/images/MArm_AO.pngbin157336 -> 0 bytes
-rwxr-xr-xassets/images/MBaseWallA01_AO.pngbin134056 -> 0 bytes
-rwxr-xr-xassets/images/MBaseWallA01_DM.pngbin136022 -> 0 bytes
-rwxr-xr-xassets/images/MBaseWallA01_GM.pngbin26051 -> 0 bytes
-rwxr-xr-xassets/images/MBase_AO.pngbin165449 -> 0 bytes
-rwxr-xr-xassets/images/MCoreBase_DM.pngbin130589 -> 0 bytes
-rwxr-xr-xassets/images/MCoreBase_GM.pngbin9853 -> 0 bytes
-rwxr-xr-xassets/images/MEjectorBaseN_DM.pngbin119768 -> 0 bytes
-rwxr-xr-xassets/images/MEjectorBaseN_NM.pngbin57808 -> 0 bytes
-rwxr-xr-xassets/images/MRingBaseN_DM.pngbin107671 -> 0 bytes
-rwxr-xr-xassets/images/MRingBaseN_NM.pngbin94852 -> 0 bytes
-rwxr-xr-xassets/images/MSquareBaseN_DM.pngbin76400 -> 0 bytes
-rwxr-xr-xassets/images/MWall_AO.pngbin108536 -> 0 bytes
-rwxr-xr-xassets/images/MWall_DM.pngbin133125 -> 0 bytes
-rwxr-xr-xassets/images/MWall_GM.pngbin9294 -> 0 bytes
-rwxr-xr-xassets/images/MWall_NM.pngbin89287 -> 0 bytes
-rwxr-xr-xassets/images/Ref.pngbin13632 -> 0 bytes
-rwxr-xr-xassets/images/Spec.pngbin2321526 -> 0 bytes
-rwxr-xr-xassets/images/Thumbs.dbbin7168 -> 0 bytes
-rwxr-xr-xassets/images/black.tgabin210 -> 0 bytes
-rwxr-xr-xassets/images/cube.pngbin34506 -> 0 bytes
-rwxr-xr-xassets/images/cubelight_Glow.pngbin3635 -> 0 bytes
-rwxr-xr-xassets/images/cubelight_spec.pngbin33249 -> 0 bytes
-rwxr-xr-xassets/images/default_white.pngbin90 -> 0 bytes
-rwxr-xr-xassets/images/droid.pngbin885 -> 0 bytes
-rwxr-xr-xassets/images/env.pngbin85724 -> 0 bytes
-rwxr-xr-xassets/images/femaleRobot.pngbin2857 -> 0 bytes
-rwxr-xr-xassets/images/femaleRobot_Glow.pngbin2855 -> 0 bytes
-rwxr-xr-xassets/images/lightRack.pngbin2857 -> 0 bytes
-rwxr-xr-xassets/images/lightRack_Glow.pngbin2857 -> 0 bytes
-rwxr-xr-xassets/images/metal.pngbin2366049 -> 696663 bytes
-rwxr-xr-xassets/images/particle-star.pngbin3665 -> 0 bytes
-rwxr-xr-xassets/images/quilt01.pngbin572888 -> 0 bytes
-rwxr-xr-xassets/images/quilt01_E.pngbin3273 -> 0 bytes
-rwxr-xr-xassets/images/quilt01_N.pngbin116034 -> 0 bytes
-rwxr-xr-xassets/images/quilt02.pngbin391471 -> 0 bytes
-rwxr-xr-xassets/images/quilt02_E.pngbin3273 -> 0 bytes
-rwxr-xr-xassets/images/quilt02_N.pngbin34939 -> 0 bytes
-rwxr-xr-xassets/images/white.tgabin236 -> 0 bytes
-rwxr-xr-xindex.html18
-rwxr-xr-xjs/ninja.reel/ninja.js5
-rwxr-xr-xjs/panels/CSSPanel/CSSPanelBase.reel/CSSPanelBase.css2
-rwxr-xr-xjs/preloader/Preloader.js1
-rw-r--r--versions.json8
56 files changed, 34 insertions, 107 deletions
diff --git a/.gitignore b/.gitignore
index b92bd629..fd016bd0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -20,4 +20,6 @@ js/components/gradientpicker.reel/.sass-cache/6f8390f69a31f1a976968b9c18d0824d78
20 20
21cloud/ 21cloud/
22 22
23/.idea/scopes/scope_settings.xml \ No newline at end of file 23/.idea/scopes/scope_settings.xml
24_scss/imports/scss/_Stage.scss
25compass_app_log.txt \ No newline at end of file
diff --git a/_scss/imports/scss/_Stage.scss b/_scss/imports/scss/_Stage.scss
deleted file mode 100755
index bed29d98..00000000
--- a/_scss/imports/scss/_Stage.scss
+++ /dev/null
@@ -1,103 +0,0 @@
1// <copyright>
2// This file contains proprietary software owned by Motorola Mobility, Inc.<br/>
3// No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/>
4// (c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved.
5// </copyright>
6
7#middleDocArea {
8 -webkit-box-orient: horizontal;
9 -moz-box-orient: horizontal;
10 box-orient: horizontal;
11
12 -moz-box-flex: 1;
13 -webkit-box-flex: 1;
14 box-flex: 1;
15
16 margin: 1px;
17 margin-bottom:3px;
18
19 border-style: solid;
20 border-width: 1px;
21}
22
23#stageBG {
24 width:100%;
25 height:100%;
26 background-color: red;
27 position: absolute;
28 margin-left: auto;
29 margin-right: auto;
30 left: 0;
31 right: 0;
32 top: 150px;
33
34 z-index: 0;
35}
36
37#stageUserContent {
38 width:100%;
39 height:100%;
40 background-color: transparent;
41 border : 1px solid $color-body-border;
42
43 position: absolute;
44 margin-left: auto;
45 margin-right: auto;
46 left: 0;
47 right: 0;
48 top: 150px;
49
50 z-index: 1;
51}
52
53.global3DSettings {
54 -webkit-transform-style: preserve-3d;
55 -webkit-transform:perspective(1400) matrix3d(1,0,0,0,0,1,0,0,0,0,1,0,0,0,0,1);
56}
57
58.perspective3D {
59 -webkit-perspective: 1400;
60}
61
62#iframeContainer {
63 position: absolute;
64 top: 0px;
65 left: 0px;
66 margin: 0px;
67 padding: 0px;
68 width:100%;
69 height:100%;
70 overflow:scroll;
71 background:$color-stage;
72}
73
74#drawingCanvas {
75 position: absolute;
76 margin: 0px;
77 border: none;
78 padding: 0px;
79 top: 0px;
80 left: 0px;
81 z-index: 6;
82}
83
84
85#stageCanvas {
86 position: absolute;
87 margin: 0px;
88 border: none;
89 padding: 0px;
90 top: 0px;
91 left: 0px;
92 z-index: 5;
93}
94
95#layoutCanvas {
96 position: absolute;
97 margin: 0px;
98 border: none;
99 padding: 0px;
100 top: 0px;
101 left: 0px;
102 z-index: 4;
103}
diff --git a/assets/images/BasePlatformA01_AO.png b/assets/images/BasePlatformA01_AO.png
deleted file mode 100755
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 100755
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 100755
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 100755
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 100755
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 100755
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 100755
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 100755
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 100755
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 100755
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 100755
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 100755
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 100755
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 100755
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 100755
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 100755
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 100755
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 100755
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 100755
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 100755
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 100755
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 100755
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 100755
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 100755
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 100755
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 100755
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 100755
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 100755
index 76658540..00000000
--- a/assets/images/Spec.png
+++ /dev/null
Binary files differ
diff --git a/assets/images/Thumbs.db b/assets/images/Thumbs.db
deleted file mode 100755
index fa66bbc8..00000000
--- a/assets/images/Thumbs.db
+++ /dev/null
Binary files differ
diff --git a/assets/images/black.tga b/assets/images/black.tga
deleted file mode 100755
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 100755
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 100755
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 100755
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 100755
index cca49ba7..00000000
--- a/