| Commit message (Collapse) | Author | Age |
|\
| |
| | |
Canvas interaction
|
| | |
|
| |\
| | |
| | |
| | | |
Canvas-interaction
|
| |\ \
| | | |
| | | |
| | | | |
Canvas-interaction
|
| | | | |
|
|\ \ \ \
| | | | |
| | | | |
| | | | | |
https://github.com/mencio/ninja-internal into serialization
|
| | | | |
| | | | |
| | | | |
| | | | | |
Signed-off-by: Valerio Virgillito <valerio@motorola.com>
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
the new template
Signed-off-by: Valerio Virgillito <valerio@motorola.com>
|
| | | | |
| | | | |
| | | | |
| | | | | |
Signed-off-by: Valerio Virgillito <valerio@motorola.com>
|
| |\ \ \ \
| | | |_|/
| | |/| | |
|
| | |_|/
| |/| |
| | | |
| | | | |
Signed-off-by: Valerio Virgillito <valerio@motorola.com>
|
| |/ /
|/| |
| | |
| | | |
preparation for montage converting to the new "prototype" format fully
|
|\| | |
|
| | |
| | |
| | |
| | |
| | |
| | | |
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>
|
|\| | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Conflicts:
js/tools/PenTool.js
|
| |\ \ \ \
| | | | | |
| | | | | | |
3D tools, eyedropper, fill, ink-bucket, gradients and shape fixes.
|
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
cache because they can easily get out of sync with the actual colors and materials. Instead, we will always query the object for these values.
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>
|
| | | | | |/
| | | | |/|
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
instead of relying on the shapeModel cache because it can get out of sync.
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>
|
|\| | | | | | |
|
| |\ \ \ \ \ \
| | |_|_|/ / /
| |/| | | | | |
[CR] Keep Save related menu items always enabled, if there is an open do...
|
| | | |_|_|/
| | |/| | |
| | | | | |
| | | | | | |
Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
|
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Ninja does not need to create duplicate files when it sets up the users Ninja Projects directory for RDGE support.
|
| | | | | | |
|
| |/ / / / |
|
|\| | | | |
|
| |\ \ \ \
| | |_|_|/
| |/| | | |
Brushtool
|
| |\ \ \ \
| | | | | |
| | | | | | |
Pull request IKNINJA-1302, IKNINJA-1367, IKNINJA-1361, IKNINJA-1364, IKNINJA-1302, IKNINJA-1266
|
| | | |/ /
| | |/| |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
- added close file and close all menu items
Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
Conflicts:
js/helper-classes/3D/draw-utils.js
Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
|
| |_|/ /
|/| | |
| | | |
| | | | |
(correctly setting the canvas for brush stroke file I/O, correct plane matrix for file I/O)
|
|\| | | |
|
| | | | |
|
| |\ \ \
| | | |/
| | |/| |
|
| | |/
| |/|
| | |
| | | |
panel code
|
| |/
|/|
| |
| | |
GEOM_TYPE_CUBIC_BEZIER to GEOM_TYPE_BRUSH_STROKE
|
| |
| |
| |
| | |
Removed saving m-js components as new components broke I/O when present. Also made a fix for checking length of webGL array since first item now is non-user data. (That is to be removed)
|
|