| Commit message (Collapse) | Author | Age |
| |
|
| |
|
|\
| |
| |
| | |
Textures
|
| |\
| | |
| | |
| | | |
WorkingBranch
|
| | |
| | |
| | |
| | | |
color chips in the PI was broken due to a reliance on a css class from the colortoolbar reel. The requried class was copied to the properties.css file as a temporary fix.
|
| |\ \
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
WorkingBranch
Conflicts:
js/components/layout/tools-list.reel/tools-list.html
js/components/layout/tools-properties.reel/tools-properties.html
js/components/tools-properties/brush-properties.reel/brush-properties.html
js/components/tools-properties/fill-properties.reel/fill-properties.html
js/components/tools-properties/pen-properties.reel/pen-properties.html
js/components/tools-properties/pencil-properties.reel/pencil-properties.html
js/components/tools-properties/selection-properties.reel/selection-properties.html
js/components/tools-properties/shape-properties.reel/shape-properties.html
js/components/tools-properties/tag-properties.reel/tag-properties.html
js/components/tools-properties/text-properties.reel/text-properties.html
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Removed the tool color bar
Added new icons for inkbottle
Removed Pencil tool
Removed Inkbottle tool
Added chips to the pen, brush and tag tools
Aligned controls in several subtools
|
| | | |
| | | |
| | | |
| | | | |
have chips in the sub tool bar. Still need to complete adding chips to the Brush tool and finalizing the subtool bar layout to our spec for all of the subtools.
|
| | | | |
|
|\ \ \ \
| | |_|/
| |/| |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Textures
Conflicts:
js/lib/geom/geom-obj.js
js/lib/geom/rectangle.js
js/tools/TagTool.js
|
| | | |
| | | |
| | | |
| | | | |
Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
|
| | |/
| |/|
| | |
| | | |
Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
|
| | |
| | |
| | |
| | | |
Signed-off-by: Valerio Virgillito <valerio@motorola.com>
|
| | |
| | |
| | |
| | | |
Signed-off-by: Valerio Virgillito <valerio@motorola.com>
|
| |\ \
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Conflicts:
js/components/tools-properties/tag-properties.reel/tag-properties.html
Signed-off-by: Valerio Virgillito <valerio@motorola.com>
|
| | |\ \ |
|
| | |\ \ \
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Conflicts:
js/controllers/elements/element-controller.js
Signed-off-by: Valerio Virgillito <valerio@motorola.com>
|
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
creation
Signed-off-by: Valerio Virgillito <valerio@motorola.com>
|
| | | |_|/
| | |/| |
| | | | |
| | | | | |
Signed-off-by: Valerio Virgillito <valerio@motorola.com>
|
| | | | |
| | | | |
| | | | |
| | | | | |
Signed-off-by: Valerio Virgillito <valerio@motorola.com>
|
| | | | |
| | | | |
| | | | |
| | | | | |
Signed-off-by: Valerio Virgillito <valerio@motorola.com>
|
| | | | |
| | | | |
| | | | |
| | | | | |
Signed-off-by: Valerio Virgillito <valerio@motorola.com>
|
| |\ \ \ \
| | | |_|/
| | |/| | |
|
| | |\ \ \
| | | | | |
| | | | | | |
submitting project : Code Editor Improvements [Phase 1]
|
| | | |\ \ \
| | | | | |/
| | | | |/| |
|
| | | |\ \ \
| | | | | |/
| | | | |/| |
|
| | | |\ \ \
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Conflicts:
js/controllers/document-controller.js
Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
|
| | | |\ \ \ \ |
|
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
- apply theme selection to all code view documents
Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
|
| |\| | | | | | |
|
| | |\ \ \ \ \ \
| | | |_|_|_|_|/
| | |/| | | | | |
Timeline uber
|
| | | | | | | | |
|
| | | | | | | | |
|
| | | | |_|_|/
| | | |/| | | |
|
| | |/ / / /
| | | | | |
| | | | | |
| | | | | | |
Signed-off-by: Kruti Shah <kruti.shah@motorola.com>
|
| |\ \ \ \ \ |
|
| | |/ / / / |
|
| |/ / / /
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
our custom ui controls (such as hottest, slider, etc.), materials panels and three-d section of the PI.
Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
|
| | | | | |
|
|\| | | |
| | | | |
| | | | |
| | | | | |
Textures
|
| | | | |
| | | | |
| | | | |
| | | | | |
Signed-off-by: Valerio Virgillito <valerio@motorola.com>
|
| |\ \ \ \ |
|
| | |\ \ \ \
| | | | | | |
| | | | | | |
| | | | | | | |
https://github.com/mencio/ninja-internal into serialization
|
| | | |\ \ \ \ |
|
| | | |\ \ \ \ \
| | | | | |_|_|/
| | | | |/| | | |
|
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
Signed-off-by: Valerio Virgillito <valerio@motorola.com>
|
| | |\ \ \ \ \ \
| | | |_|_|/ / /
| | |/| | | | |
| | | | | | | | |
serialization
|
| | | | |/ / /
| | | |/| | |
| | | | | | |
| | | | | | | |
preparation for montage converting to the new "prototype" format fully
|
| |\| | | | | |
|
| | |