aboutsummaryrefslogtreecommitdiff
path: root/js/tools
Commit message (Collapse)AuthorAge
* 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
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'refs/heads/NINJAmaster' into TimelineUberJonathan Duran2012-04-10
| |\ \ \ \ \ \
| * | | | | | | Breadcrumb FixKruti Shah2012-04-06
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Kruti Shah <kruti.shah@motorola.com>
| * | | | | | | Merge branch 'refs/heads/NINJAmaster' into TimelineUberJonathan Duran2012-04-04
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js js/tools/SelectionTool.js Signed-off-by: Jonathan Duran <jduran@motorola.com>
| * \ \ \ \ \ \ \ Merge branch 'refs/heads/NINJAmaster' into TimelineUberJonathan Duran2012-03-30
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'refs/heads/NINJAmaster' into TimelineUberJonathan Duran2012-03-29
| |\ \ \ \ \ \ \ \ \
| * | | | | | | | | | Timeline : Bug Fix : IKNINJA 1374Jonathan Duran2012-03-23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Kruti Shah <kruti.shah@motorola.com> Signed-off-by: Jonathan Duran <jduran@motorola.com>
* | | | | | | | | | | Fix for 1524 Pen: Unable to add anchor to a closed pathPushkar Joshi2012-04-27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ---behavior is unchanged, but the realtime feedback for the tool (i.e. mouse cursor) will correctly reflect that a click after closing a path will start a new path, not add to that path
* | | | | | | | | | | add event handlers for open, close, and switch document to pen tool, fixes:Pushkar Joshi2012-04-27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1532 Pen: Anchor points get carried over to the new document
* | | | | | | | | | | Fix for 1525 Pen: "Uncaught RangeError: Maximum call stack size exceeded".Pushkar Joshi2012-04-27
| |_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | (check if the second mouse click actually selects the existing first anchor point)
* | | | | | | | | | track the dragging plane based on the hit record so that the file IO works ↵Pushkar Joshi2012-04-26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | again (bug fix)
* | | | | | | | | | render the calligraphic brush stroke in realtime on a rotated canvasPushkar Joshi2012-04-25
| | | | | | | | | |
* | | | | | | | | | allow the realtime drawing of brush strokes drawn off the standard XY plane ↵Pushkar Joshi2012-04-24
| |_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | by passing in the transformation matrix
* | | | | | | | | re-compute and store the center of the subpath in local coordinates upon ↵Pushkar Joshi2012-04-24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | file open
* | | | | | | | | allow the addition of the pen tool to the timelinePushkar Joshi2012-04-23
| | | | | | | | |
* | | | | | | | | Merge branch 'master' into pentoolPushkar Joshi2012-04-19
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/helper-classes/3D/view-utils.js
| * | | | | | | | Moving initialzeSnapping routine from RotateObject3DTool tool to ↵Nivesh Rajbhandari2012-04-18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rotate3DToolBase so Rotate Stage uses the same code. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| * | | | | | | | Fixing some more merge issues.Nivesh Rajbhandari2012-04-18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| * | | | | | | | Merge branch 'refs/heads/ninja-internal' into EricMergeNivesh Rajbhandari2012-04-18
| |\ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/tools/Rotate3DToolBase.js js/tools/RotateStage3DTool.js js/tools/Translate3DToolBase.js js/tools/modifier-tool-base.js Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| * | | | | | | | snapping for stage rotation toolhwc4872012-04-16
| | | | | | | | |
| * | | | | | | | 3D translation fixeshwc4872012-04-16
| | | | | | | | |
| * | | | | | | | 3D rotationhwc4872012-04-13
| | | | | | | | |