| Commit message (Collapse) | Author | Age |
|\
| |
| | |
Updating id to data-montage-id.
|
| |
| |
| |
| |
| |
| | |
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>
|
|/
|
|
| |
Signed-off-by: Valerio Virgillito <valerio@motorola.com>
|
|
|
|
| |
Signed-off-by: Valerio Virgillito <valerio@motorola.com>
|
|
|
|
| |
Signed-off-by: Valerio Virgillito <valerio@motorola.com>
|
|\ |
|
| |\
| | |
| | |
| | | |
https://github.com/mencio/ninja-internal into serialization
|
| | |
| | |
| | |
| | | |
Signed-off-by: Valerio Virgillito <valerio@motorola.com>
|
| |/
| |
| |
| | |
preparation for montage converting to the new "prototype" format fully
|
|\| |
|
| |\
| | |
| | | |
Allow users to toggle application of stroke and border settings when using the ink bottle tool. Also, fixed translate tool's handles to draw without stage's zoom.
|
| | |\ |
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
the ink bottle tool.
Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
in zoom code.
Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
|
|\| | | |
|
| |\ \ \
| | | |/
| | |/| |
|
| |\ \ \
| | | | |
| | | | |
| | | | |
| | | | | |
Conflicts:
js/tools/PenTool.js
|
| |\ \ \ \
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Conflicts:
js/tools/PenTool.js
|
| |\ \ \ \ \ |
|
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
to position the canvas on which the path is rendered
AND
add data-montage- to the ids in the pen and brush reels
AND
fix a bug with pen stroke transparency not working
|
|\ \ \ \ \ \ \
| | |_|_|_|/ /
| |/| | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Conflicts:
js/components/layout/bread-crumb.reel/bread-crumb.js
Signed-off-by: Jonathan Duran <jduran@motorola.com>
|
| |\ \ \ \ \ \
| | | |_|_|_|/
| | |/| | | | |
|
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Initial container get setup in ninja now.
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: Kruti Shah <kruti.shah@motorola.com>
|
|\ \ \ \ \ \
| | |/ / / /
| |/| | | | |
|
| |/ / / /
| | | | |
| | | | |
| | | | | |
Signed-off-by: Valerio Virgillito <valerio@motorola.com>
|
| | | | |
| | | | |
| | | | |
| | | | | |
Signed-off-by: Kruti Shah <kruti.shah@motorola.com>
|
| | | | |
| | | | |
| | | | |
| | | | | |
value.
|
|\ \ \ \ \ |
|
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
require hitting "Return" key to commit the change"
|
|\ \ \ \ \ \
| |/ / / / /
|/| / / / /
| |/ / / / |
|
| |\ \ \ \
| | | |_|/
| | |/| |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Conflicts:
js/document/templates/montage-html/default_html.css
js/mediators/element-mediator.js
js/panels/properties.reel/properties.js
js/tools/BrushTool.js
js/tools/LineTool.js
js/tools/PenTool.js
js/tools/SelectionTool.js
js/tools/ShapeTool.js
js/tools/TranslateObject3DTool.js
Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
rotate tool and 3D object translate tool.
Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
|
| |\ \ \ \
| | | | | |
| | | | | |
| | | | | | |
Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
|
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
|
| | | | | | |
|
|\ \ \ \ \ \
| | |_|/ / /
| |/| | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Conflicts:
js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
js/tools/SelectionTool.js
Signed-off-by: Jonathan Duran <jduran@motorola.com>
|
| | |_|_|/
| |/| | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Reworked the add and remove elements into 1 function which can take 1 or more elements.
Removed the _element from the selection array
Many other changes related to those 2 changes
Undo/Redo shortcuts are now using montage undo/redo manager.
Signed-off-by: Valerio Virgillito <valerio@motorola.com>
|
|\| | | | |
|
| |\ \ \ \
| | | |_|/
| | |/| | |
Brushtool
|
| | |\ \ \ |
|
| | |\ \ \ \
| | | | |_|/
| | | |/| |
| | | | | |
| | | | | | |
Conflicts:
js/controllers/elements/shapes-controller.js
|
| | |\ \ \ \ |
|
| | |\ \ \ \ \ |
|
| | | | | | | | |
|
| | |\ \ \ \ \ \ |
|
| | | | | | | | | |
|
| | |\ \ \ \ \ \ \ |
|