diff options
| author | Jose Antonio Marquez | 2012-02-16 11:30:33 -0800 |
|---|---|---|
| committer | Jose Antonio Marquez | 2012-02-16 11:30:33 -0800 |
| commit | 9fe5d98bf469036c856e28d71ad4160d630b4af4 (patch) | |
| tree | 930a334bcda0c26ca02eaa33a1506d147e8691e1 | |
| parent | 89b5e793ea88ef235b54b6e1d1c379698d3e612b (diff) | |
| parent | 71619045b692015b0889a4f5c381c1dee9c056cd (diff) | |
| download | ninja-9fe5d98bf469036c856e28d71ad4160d630b4af4.tar.gz | |
Merge branch 'refs/heads/NinjaInternal' into Color
78 files changed, 1615 insertions, 1480 deletions
diff --git a/assets/descriptor.json b/assets/descriptor.json new file mode 100644 index 00000000..53bfb684 --- /dev/null +++ b/assets/descriptor.json | |||
| @@ -0,0 +1,34 @@ | |||
| 1 | { | ||
| 2 | "copyright": "This file contains proprietary software owned by Motorola Mobility, Inc. No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder. (c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved.", | ||
| 3 | "version": "0.0.0.0", | ||
| 4 | "root": "/assets/", | ||
| 5 | "directories": [{"name": "images"}, {"name": "shaders"}], | ||
| 6 | "files": [ | ||
| 7 | "images/black.png", | ||
| 8 | "images/blue.png", | ||
| 9 | "images/BoxB2_AO.png", | ||
| 10 | "images/BoxB2_DM.png", | ||
| 11 | "images/cubelight.png", | ||
| 12 | "images/grey.png", | ||
| 13 | "images/material_paint.png", | ||
| 14 | "images/metal.png", | ||
| 15 | "images/normalMap.png", | ||
| 16 | "images/random_normal.png", | ||
| 17 | "images/rocky-diffuse.jpg", | ||
| 18 | "images/rocky-normal.jpg", | ||
| 19 | "images/rocky-spec.jpg", | ||
| 20 | "images/silver.png", | ||
| 21 | "images/white.png", | ||
| 22 | "shaders/Basic.frag.glsl", | ||
| 23 | "shaders/Basic.vert.glsl", | ||
| 24 | "shaders/linearGradient.frag.glsl", | ||
| 25 | "shaders/linearGradient.vert.glsl", | ||
| 26 | "shaders/radialGradient.frag.glsl", | ||
| 27 | "shaders/radialGradient.vert.glsl", | ||
| 28 | "shaders/test_fshader.glsl", | ||
| 29 | "shaders/test_fshader_full.glsl", | ||
| 30 | "shaders/test_vshader.glsl", | ||
| 31 | "shaders/ub_fshader.glsl", | ||
| 32 | "shaders/ub_vshader.glsl" | ||
| 33 | ] | ||
| 34 | } \ No newline at end of file | ||
diff --git a/css/ninja.css b/css/ninja.css index d22cfc22..824a675a 100755 --- a/css/ninja.css +++ b/css/ninja.css | |||
| @@ -118,9 +118,9 @@ body { position: absolute; margin: 0px; width: 100%; height: 100%; background-co | |||
| 118 | 118 | ||
| 119 | #sceneBar { height: 70px; background-color: #474747; } | 119 | #sceneBar { height: 70px; background-color: #474747; } |
| 120 | 120 | ||
| 121 | #mainContainer #rulerTop { background: url("../images/temp/ruler-top.png"); height: 15px; margin-bottom: 0px; } | 121 | #mainContainer #rulerTop { background: url("../images/temp/ruler-top.png"); height: 15px; margin-bottom: 0px; display:none;} |
| 122 | 122 | ||
| 123 | #rulerLeft { background: url("../images/temp/ruler-left.png"); width: 16px; } | 123 | #rulerLeft { background: url("../images/temp/ruler-left.png"); width: 16px; display:none;} |
| 124 | 124 | ||
| 125 | #stateBar { height: 20px; background-color: #282828; margin-bottom: 0px; } | 125 | #stateBar { height: 20px; background-color: #282828; margin-bottom: 0px; } |
| 126 | 126 | ||
| @@ -174,6 +174,8 @@ body { position: absolute; margin: 0px; width: 100%; height: 100%; background-co | |||
| 174 | 174 | ||
| 175 | #documentBar { height: 25px; width: 1000px; position: relative; overflow: hidden; color: white; } | 175 | #documentBar { height: 25px; width: 1000px; position: relative; overflow: hidden; color: white; } |
| 176 | 176 | ||
| 177 | .montage-popup-modal-mask { opacity: 1; background: -webkit-radial-gradient(center, ellipse cover, rgba(0, 0, 0, 0.65) 0%, rgba(0, 0, 0, 0.8) 80%); } | ||
| 178 | |||
| 177 | #middleDocArea { -webkit-box-orient: horizontal; -moz-box-orient: horizontal; box-orient: horizontal; -moz-box-flex: 1; -webkit-box-flex: 1; box-flex: 1; margin: 1px; margin-bottom: 3px; border-style: solid; border-width: 1px; } | 179 | #middleDocArea { -webkit-box-orient: horizontal; -moz-box-orient: horizontal; box-orient: horizontal; -moz-box-flex: 1; -webkit-box-flex: 1; box-flex: 1; margin: 1px; margin-bottom: 3px; border-style: solid; border-width: 1px; } |
| 178 | 180 | ||
| 179 | #mainStageIFrame { border: none; margin: 4px; } | 181 | #mainStageIFrame { border: none; margin: 4px; } |
diff --git a/js/components/controllers/tree-controller.js b/js/components/controllers/tree-controller.js index 03ef7b9e..1e9222fd 100644 --- a/js/components/controllers/tree-controller.js +++ b/js/components/controllers/tree-controller.js | |||
| @@ -28,7 +28,7 @@ var TreeController = exports.TreeController = Montage.create(ObjectController, / | |||
| 28 | }, | 28 | }, |
| 29 | 29 | ||
| 30 | branchKey : { | 30 | branchKey : { |
| 31 | value: 'children' | 31 | value: null |
| 32 | }, | 32 | }, |
| 33 | 33 | ||
| 34 | _root : { | 34 | _root : { |
| @@ -98,7 +98,8 @@ var TreeController = exports.TreeController = Montage.create(ObjectController, / | |||
| 98 | }, | 98 | }, |
| 99 | 99 | ||
| 100 | branchControllers: { | 100 | branchControllers: { |
| 101 | value: [] | 101 | value: [], |
| 102 | distinct: true | ||
| 102 | }, | 103 | }, |
| 103 | 104 | ||
| 104 | addBranchController : { | 105 | addBranchController : { |
diff --git a/js/components/treeview/ninja-branch.reel/ninja-branch.css b/js/components/treeview/ninja-branch.reel/ninja-branch.css index d8c212e8..a3a9350e 100644 --- a/js/components/treeview/ninja-branch.reel/ninja-branch.css +++ b/js/components/treeview/ninja-branch.reel/ninja-branch.css | |||
| @@ -26,7 +26,7 @@ | |||
| 26 | cursor: pointer; | 26 | cursor: pointer; |
| 27 | font-weight: bold; | 27 | font-weight: bold; |
| 28 | padding: 3px 0 4px; | 28 | padding: 3px 0 4px; |
| 29 | text-shadow | ||