aboutsummaryrefslogtreecommitdiff
path: root/js/tools
Commit message (Expand)AuthorAge
* Merge branch 'master' into brushtoolPushkar Joshi2012-06-07
|\
| * Merge pull request #276 from mqg734/DrawingToolsValerio Virgillito2012-06-06
| |\
| | * Do not create any tags or shapes with width or height of 0.Nivesh Rajbhandari2012-06-06
| * | Merge pull request #272 from pushkarjoshi/pentoolValerio Virgillito2012-06-06
| |\ \ | | |/ | |/|
| * | Merge pull request #273 from mqg734/TransformToolValerio Virgillito2012-06-05
| |\ \
| | * | Free Transform tool's handle should stop when it reaches the other end.Nivesh Rajbhandari2012-06-05
| * | | Updated ink bottle tool to support color-chip's checkbox and undo/redo for st...Nivesh Rajbhandari2012-06-05
| * | | Fill and Ink-Bottle fixes.Nivesh Rajbhandari2012-06-04
| |/ /
* | / change the PI to make it look like the fill color affects the brush stroke colorPushkar Joshi2012-06-07
| |/ |/|
* | handle switching between multiple documents for Pen tool by having its own se...Pushkar Joshi2012-06-05
* | Merge branch 'master' into pentoolPushkar Joshi2012-06-04
|\|
| * IKNinja-1610 and IKNinja-1647 - Can't use transform tool if you haven't used ...Nivesh Rajbhandari2012-06-01
| * IKNinja-1609 - Stage rotates too fast when closing and re-opening file or swi...Nivesh Rajbhandari2012-06-01
| * Fixed bad reference to stage element in pen tool.Nivesh Rajbhandari2012-05-30
| * document bindings phase 1Valerio Virgillito2012-05-29
* | change the behavior of what happens when alt is pressed while moving anchor h...Pushkar Joshi2012-05-31
* | somewhat working version of the canvas runtime for pen paths (the runtime ren...Pushkar Joshi2012-05-31
* | Merge branch 'master' into pentoolPushkar Joshi2012-05-31
|\|
| * Merge pull request #256 from mqg734/Dom-ArchitectureValerio Virgillito2012-05-24
| |\
| | * IKNinja-1621 - 3D stage does not reset correctly when the rotation point is s...Nivesh Rajbhandari2012-05-24
| * | Cleaning up referencing to 'documentRoot' and '_document'Jose Antonio Marquez2012-05-24
| |/
| * removing all stageDeps for drawing classes.Valerio Virgillito2012-05-17
| * IKNinja-1628 - Can't draw shapes inside canvas after double-clicking into can...Nivesh Rajbhandari2012-05-17
| * Merge branch 'refs/heads/master' into dom-architectureValerio Virgillito2012-05-16
| |\
| * | Squashed master into dom-architectureValerio Virgillito2012-05-16
| * | Fixing scrollbar syncing, including pan tool, for banner templates.Nivesh Rajbhandari2012-05-15
| * | Merge branch 'refs/heads/master' into dom-architectureValerio Virgillito2012-05-08
| |\ \
| * | | Stage should update scroll offsets when scrolled. Note that this is not alway...Nivesh Rajbhandari2012-05-08
| * | | Fixing references to iframe's styles in new template.Nivesh Rajbhandari2012-05-04
| * | | Merge branch 'refs/heads/dom-architecture-master' into Dom-ArchitectureNivesh Rajbhandari2012-05-04
| |\ \ \
| * | | | Removed special-casing for new template workflow. Instead, we will enforce a...Nivesh Rajbhandari2012-05-04
| * | | | Fixing selection and layout code to exclude SCRIPT and STYLE tags.Nivesh Rajbhandari2012-05-04
* | | | | working version of the pen plus subtoolPushkar Joshi2012-05-30
* | | | | working version of Pen minus subtoolPushkar Joshi2012-05-30
* | | | | More consistent local and global mouse coords which solves a bug with the Pen...Pushkar Joshi2012-05-29
* | | | | rename dragging plane to dragPlane (for consistency with ShapeTool)Pushkar Joshi2012-05-29
* | | | | allow changes in the pen subtool in options to be seen by the pen tool code (...Pushkar Joshi2012-05-22
* | | | | Merge branch 'master' into pentoolPushkar Joshi2012-05-21
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | Add color to tag toolValerio Virgillito2012-05-15
| * | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Wor...John Mayhew2012-05-15
| |\ \ \ \
| | * \ \ \ Merge branch 'refs/heads/ninja-internal' into WebGLFixesNivesh Rajbhandari2012-05-10
| | |\ \ \ \
| | * \ \ \ \ Merge branch 'refs/heads/ninja-internal' into WebGLFixesNivesh Rajbhandari2012-05-08
| | |\ \ \ \ \ | | | | |_|_|/ | | | |/| | |
| | * | | | | Merge branch 'refs/heads/ninja-internal' into WebGLFixesNivesh Rajbhandari2012-05-07
| | |\ \ \ \ \ | | | | |_|_|/ | | | |/| | |
| | * | | | | Converting geom-obj to object literal notation.Nivesh Rajbhandari2012-05-02
| | * | | | | Converting line, circle and rectangle shapes to object literal notation.Nivesh Rajbhandari2012-05-02
| | | |_|_|/ | | |/| | |
| * | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Wor...John Mayhew2012-05-10
| |\ \ \ \ \ | | | |_|_|/ | | |/| | |
| * | | | | put color chips in the inkbottle and fill toolJohn Mayhew2012-05-10
| * | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Wor...John Mayhew2012-05-07
| |\ \ \ \ \ | | | |_|/ / | | |/| | |
| * | | | | More implementation of moving color chips to the individual subtools.John Mayhew2012-05-07
| * | | | | First round of moving color chips into the sub tools. Shape and Pen tool now ...John Mayhew2012-05-03