aboutsummaryrefslogtreecommitdiff
path: root/js/tools
Commit message (Collapse)AuthorAge
* handle anchor point deletion correctly (does not yet fully work for ↵Pushkar Joshi2012-05-11
| | | | PEN-MINUS subtool)
* Merge branch 'master' into pentoolPushkar Joshi2012-05-11
|\
| * some code cleanupValerio Virgillito2012-05-09
| | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * Fixed a snapping issue on the mouse down in drawing tools.hwc4872012-05-08
| |
| * fixes for 2D and 3D translation.hwc4872012-05-07
| |
* | code cleanup and starting the subtool functionalityPushkar Joshi2012-05-11
| |
* | Merge branch 'master' into pentoolPushkar Joshi2012-05-07
|\|
| * Refactor creating elements. Removed makeNJElement and separated the model ↵Valerio Virgillito2012-05-03
| | | | | | | | | | | | creation Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * Merge branch 'refs/heads/master' into tag-2.0Valerio Virgillito2012-05-03
| |\
| | * Support drawing in side and top view. Also, adding back support for drawing ↵Nivesh Rajbhandari2012-05-01
| | | | | | | | | | | | | | | | | | shapes inside canvas when double-clicked into canvas or when moused over canvas. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| * | Nesting absolute element in the Tag tool. Refactoring element creation and ↵Valerio Virgillito2012-05-02
| |/ | | | | | | | | | | element models Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * webTemplate var gets reset to false, so must check for new stage template ↵Nivesh Rajbhandari2012-05-01
| | | | | | | | | | | | differently. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| * Merge branch 'refs/heads/ninja-internal' into StageWebTemplateNivesh Rajbhandari2012-05-01
| |\
| | * Removing some console logsValerio Virgillito2012-04-30
| | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | Get working plane grid to draw for new stage web template workflow.Nivesh Rajbhandari2012-05-01
| |/ | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| * Squashed commit of stage architectureValerio Virgillito2012-04-30
| | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * Merge pull request #182 from ericmueller/Canvas-interactionValerio Virgillito2012-04-30
| |\ | | | | | | Canvas interaction
| | * added a console.log to show the working plane during a draghwc4872012-04-27
| | |
| | * Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵hwc4872012-04-27
| | |\ | | | | | | | | | | | | Canvas-interaction
| | * | Creating shapes in a containerhwc4872012-04-27
| | | |
| | * | canvas interactionhwc4872012-04-26
| | | |
| | * | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵hwc4872012-04-25
| | |\ \ | | | | | | | | | | | | | | | Canvas-interaction
| | * \ \ Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵hwc4872012-04-25
| | |\ \ \ | | | | | | | | | | | | | | | | | | Canvas-interaction
| | * | | | canvas interactionhwc4872012-04-23
| | | | | |
| | * | | | limitshwc4872012-04-23
| | | | | |
* | | | | | handle delete more correctly than before (selected subpaths are ↵Pushkar Joshi2012-05-04
| | | | | | | | | | | | | | | | | | | | | | | | deleted)....this is buggy when the second anchor of a two-anchor subpath is deleted (since the first anchor needs to be converted back into stage world coords)
* | | | | | flip the action of the alt key when modifying anchor handles (this ↵Pushkar Joshi2012-05-02
| | | | | | | | | | | | | | | | | | | | | | | | essentially forces the need for a keyboard...must be addressed by a fix later on)
* | | | | | handle left button up correctly for the brush toolPushkar Joshi2012-05-01
| | | | | |
* | | | | | Merge branch 'master' into pentoolPushkar Joshi2012-04-27
|\| | | | |
| * | | | | Merge cleanupValerio Virgillito2012-04-27
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | | | | Merge branch 'refs/heads/serialization'Valerio Virgillito2012-04-27
| |\ \ \ \ \
| | * | | | | Simplifying the getElement method from stage and adding an exclusion list to ↵Valerio Virgillito2012-04-26
| | | |_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | the new template Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | | | | Refix brush tool elementAdded eventJonathan Duran2012-04-27
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
| * | | | | Merge branch 'refs/heads/NINJAmaster' into TimelineUberJonathan Duran2012-04-27
| |\ \ \ \ \ | | | |_|_|/ | | |/| | |
| | * | | | Merge pull request #176 from pushkarjoshi/brushtoolValerio Virgillito2012-04-27
| | |\ \ \ \ | | | |/ / / | | |/| | | Brushtool
| * | | | | Revert "Fix Brush tool not broadcasting elementAdded event"Jonathan Duran2012-04-27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 12fadd1494a9b5fcdaa17fde2f4847277237cf79. Signed-off-by: Jonathan Duran <jduran@motorola.com>
| * | | | | Merge branch 'refs/heads/NINJAmaster' into TimelineUberJonathan Duran2012-04-26
| |\| | | |
| | * | | | Merge pull request #175 from mqg734/BoundsCalculationValerio Virgillito2012-04-25
| | |\ \ \ \ | | | |_|_|/ | | |/| | | 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.
| | | * | | Allow users to toggle application of stroke and border settings when using ↵Nivesh Rajbhandari2012-04-24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the ink bottle tool. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| | | * | | Fixing translate handles to draw without zoom value. Also fixed some typos ↵Nivesh Rajbhandari2012-04-20
| | | | |/ | | | |/| | | | | | | | | | | | | | | | | | | | | in zoom code. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| * | | | Merge branch 'refs/heads/NINJAmaster' into TimelineUberJonathan Duran2012-04-25
| |\| | |
| * | | | Revert "Fix Pen Tool not broadcasting elementAdded event"Jonathan Duran2012-04-25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 0475cb7e37601366ec07d77fcea44269d3d49633. Signed-off-by: Jonathan Duran <jduran@motorola.com>
| * | | | Fix Brush tool not broadcasting elementAdded eventJonathan Duran2012-04-23
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
| * | | | Fix Pen Tool not broadcasting elementAdded eventJonathan Duran2012-04-23
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
| * | | | Breadcrumb FixKruti Shah2012-04-20
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Kruti Shah <kruti.shah@motorola.com>
| * | | | Merge branch 'timeline-local' of github.com:ntfx47/ninja-internal into ↵Jonathan Duran2012-04-19
| |\ \ \ \ | | | | | | | | | | | | | | | | | | TimelineUber
| | * | | | BreadCrumb Bug FixKruti Shah2012-04-19
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Kruti Shah <kruti.shah@motorola.com>
| * | | | | Merge branch 'refs/heads/NINJAmaster' into TimelineUberJonathan Duran2012-04-19
| |\ \ \ \ \ | | | |_|/ / | | |/| | |
| * | | | | Merge branch 'refs/heads/NINJAmaster' into TimelineUberJonathan Duran2012-04-18
| |\ \ \ \ \ | | |_|/ / / | |/| | | |
| * | | | | Merge branch 'refs/heads/NINJAmaster' into TimelineUberJonathan Duran2012-04-12
| |\ \ \ \ \