| Commit message (Collapse) | Author | Age |
... | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | | |
Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
|
| |\ \ \ \ \ \ \ \ \
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | | |
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>
|
| | |\ \ \ \ \ \ \ \ \
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | | |
Conflicts:
assets/canvas-runtime.js
js/controllers/elements/shapes-controller.js
js/lib/drawing/world.js
js/lib/geom/geom-obj.js
js/lib/geom/line.js
js/mediators/element-mediator.js
js/panels/presets/animations-presets.reel/animations-presets.js
js/panels/presets/style-presets.reel/style-presets.js
js/panels/presets/transitions-presets.reel/transitions-presets.js
Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
|
| | | |\ \ \ \ \ \ \ \ \
| | | | |_|_|_|_|_|/ / /
| | | |/| | | | | | | | |
|
| | | | | |_|_|_|/ / /
| | | | |/| | | | | | |
|
| | | |_|_|_|_|_|_|/
| | |/| | | | | | |
| | | | | | | | | |
| | | | | | | | | | |
Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
|
| |\ \ \ \ \ \ \ \ \
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | | |
Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
|
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | | |
This requires minor modifications to both StageController and ComponentController.
Also removing unused global3DSettings CSS.
Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
|
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | | |
Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
|
| | |_|_|_|_|_|_|/ /
| |/| | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | | |
properties panel.
Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
|
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | | |
Signed-off-by: Valerio Virgillito <valerio@motorola.com>
|
|\ \ \ \ \ \ \ \ \ \
| | |_|/ / / / / / /
| |/| | | | | | | | |
|
| |\ \ \ \ \ \ \ \ \
| | | | | | | | | | |
| | | | | | | | | | | |
Bug fixes
|
| | |\ \ \ \ \ \ \ \ \
| | | | |_|_|_|_|_|_|/
| | | |/| | | | | | | |
|
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | | |
Signed-off-by: Armen Kesablyan <armen@motorola.com>
|
| | | |_|_|_|/ / / /
| | |/| | | | | | |
| | | | | | | | | |
| | | | | | | | | | |
Signed-off-by: Armen Kesablyan <armen@motorola.com>
|
| |\ \ \ \ \ \ \ \ \
| | | |/ / / / / / /
| | |/| | | | | | |
| | | | | | | | | |
| | | | | | | | | | |
Conflicts:
js/controllers/presets-controller.js
|
| | | |_|_|/ / / /
| | |/| | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | | |
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>
|
| | |/ / / / / / |
|
| |\| | | | | | |
|
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
temporary fix for aggregating animations (from timeline/presets)
|
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
Signed-off-by: Valerio Virgillito <valerio@motorola.com>
|
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
Components now appear in alphabetical order.
Signed-off-by: Valerio Virgillito <valerio@motorola.com>
|
|\ \ \ \ \ \ \ \
| | |/ / / / / /
| |/| | | | | | |
|
| |\| | | | | |
| | | | | | | |
| | | | | | | | |
Presets - Adding presets controller
|
| | |\ \ \ \ \ \
| | | | |/ / / /
| | | |/| | | | |
|
| | | |/ / / /
| | |/ |