| Commit message (Collapse) | Author | Age |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
IKNINJA-1721 - File dirty marker does not show when modifying elements and IKNinja-1581 and IKNinja-1758 - Paint bucket fill bugs with lines and brush objects. Squashed commit of the following:
commit 7cad082c89911d34a99feeef8e91d22b89cae8f1
Author: Nivesh Rajbhandari <mqg734@motorola.com>
Date: Thu Jun 28 17:52:07 2012 -0700
Fix for not being able to draw linear and radial gradient materials.
I'm turning off pre-flight support of gradients for WebGL since it conflicts with the materials' color support.
Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
commit d0df8a2bff052d855bafb7885792b1dfff8eab7d
Merge: 2c67d26 b4b54f6
Author: Nivesh Rajbhandari <mqg734@motorola.com>
Date: Thu Jun 28 17:50:11 2012 -0700
Merge branch 'refs/heads/ninja-internal' into ToolFixes
commit 2c67d264851f0897fdca8ca887c1c82d0e434217
Author: Nivesh Rajbhandari <mqg734@motorola.com>
Date: Thu Jun 28 15:06:13 2012 -0700
IKNINJA-1721 - File dirty marker does not show when modifying elements.
Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
commit bb4b6a52eb75efb2f435cdb53f810ae3bc1f1fc3
Author: Nivesh Rajbhandari <mqg734@motorola.com>
Date: Thu Jun 28 11:15:34 2012 -0700
IKNinja-1581 and IKNinja-1758 - Paint bucket fill bugs with lines and brush objects.
Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
|
|
|
|
|
|
| |
and pen. Note that WebGL shapes are not supported yet.
Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
|
|\ |
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
around the user's root instead.
Also, fixed the background color setting on banner and animation templates' "body."
Stage outline draws using drawGridLines code so it can show intersection with element planes.
Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
|
|/
|
|
| |
Need to handle other color modes, currently only handling HSV and gradients. Working on getting other modes supported. Also, will need clean up color popup manager after completion.
|
|
|
|
| |
Signed-off-by: Jonathan Duran <jduran@motorola.com>
|
|
|
|
| |
Signed-off-by: Jonathan Duran <jduran@motorola.com>
|
|\ |
|
| |\
| | |
| | | |
Textures
|
| | |\
| | | |
| | | |
| | | | |
Textures
|
| | |\ \
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Textures
Conflicts:
assets/canvas-runtime.js
js/io/system/ninjalibrary.json
js/mediators/element-mediator.js
|
| | |\ \ \
| | | | | |
| | | | | |
| | | | | | |
Textures
|
| | |\ \ \ \
| | | | | | |
| | | | | | |
| | | | | | | |
Textures
|
| | |\ \ \ \ \
| | | | | | | |
| | | | | | | |
| | | | | | | | |
Textures
|
| | |\ \ \ \ \ \
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | | |
Textures
Conflicts:
js/io/system/ninjalibrary.json
|
| | | | | | | | | |
|
| | |\ \ \ \ \ \ \
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | | |
Textures
Conflicts:
js/lib/geom/geom-obj.js
js/lib/geom/rectangle.js
js/tools/TagTool.js
|
| | |\ \ \ \ \ \ \ \ |
|
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | | |
Linear/RadialGradientMaterials.
Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
|
| | |\ \ \ \ \ \ \ \ \
| | | |/ / / / / / / /
| | |/| | | | | | | |
| | | | | | | | | | | |
Textures
|
| | | | | | | | | | | |
|
|\| | | | | | | | | | |
|
| | |_|_|_|_|_|_|_|/
| |/| | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | | |
get saved out with the document.
This still requires some changes by Jose.
Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
|
| | | | | | | | | | |
|
|\| | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | | |
Conflicts:
js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html
js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js
|
| | |_|_|_|_|_|_|/
| |/| | | | | | |
| | | | | | | | |
| | | | | | | | | |
Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
|
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | | |
Fixed the currentSelectedContainer by removing bindings and using property change on the current document
added the red outline back.
Signed-off-by: Valerio Virgillito <valerio@motorola.com>
|
|\ \ \ \ \ \ \ \ \
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | | |
Conflicts:
js/controllers/elements/element-controller.js
js/document/_toDelete/html-document.js
js/panels/Timeline/Layer.reel/Layer.js
Signed-off-by: Kruti Shah <kruti.shah@motorola.com>
|
| |\| | | | | | | | |
|
| | |\ \ \ \ \ \ \ \
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | | |
Conflicts:
js/controllers/elements/body-controller.js
Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
|
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | | |
Signed-off-by: Valerio Virgillito <valerio@motorola.com>
|
| | |/ / / / / / / /
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | | |
Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
|
| | |\ \ \ \ \ \ \ \
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | | |
Conflicts:
js/mediators/element-mediator.js
Signed-off-by: Valerio Virgillito <valerio@motorola.com>
|
| | | |_|_|_|_|_|_|/
| | |/| | | |