aboutsummaryrefslogtreecommitdiff
path: root/js/tools
Commit message (Expand)AuthorAge
* Merge branch 'master' into brushtoolPushkar Joshi2012-05-22
|\
| * 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
| |\ \ \ \ \ | | | |_|_|/ | | |/| | |
| | * | | | some code cleanupValerio Virgillito2012-05-09
| | | |_|/ | | |/| |
| | * | | Fixed a snapping issue on the mouse down in drawing tools.hwc4872012-05-08
| | * | | fixes for 2D and 3D translation.hwc4872012-05-07
| | | |/ | | |/|
| * | | 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
| |\| |
| | * | Refactor creating elements. Removed makeNJElement and separated the model cre...Valerio Virgillito2012-05-03
| | * | 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 s...Nivesh Rajbhandari2012-05-01
| | * | Nesting absolute element in the Tag tool. Refactoring element creation and el...Valerio Virgillito2012-05-02
| | |/
| | * webTemplate var gets reset to false, so must check for new stage template dif...Nivesh Rajbhandari2012-05-01
| | * Merge branch 'refs/heads/ninja-internal' into StageWebTemplateNivesh Rajbhandari2012-05-01
| | |\
| | | * Removing some console logsValerio Virgillito2012-04-30
| | * | Get working plane grid to draw for new stage web template workflow.Nivesh Rajbhandari2012-05-01
| | |/
| | * Squashed commit of stage architectureValerio Virgillito2012-04-30
| * | 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
| |/
| * Merge pull request #182 from ericmueller/Canvas-interactionValerio Virgillito2012-04-30
| |\
| | * 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 Can...hwc4872012-04-27
| | |\
| | * | Creating shapes in a containerhwc4872012-04-27
| | * | canvas interactionhwc4872012-04-26
| | * | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Can...hwc4872012-04-25
| | |\ \
| | * \ \ Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Can...hwc4872012-04-25
| | |\ \ \
| | * | | | canvas interactionhwc4872012-04-23
| | * | | | limitshwc4872012-04-23
* | | | | | 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
| * | | | | 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
| | | |_|/ / | | |/| | |
| * | | | | Refix brush tool elementAdded eventJonathan Duran2012-04-27
| * | | | | Merge branch 'refs/heads/NINJAmaster' into TimelineUberJonathan Duran2012-04-27
| |\ \ \ \ \ | | | |_|_|/ | | |/| | |
| | * | | | Merge pull request #176 from pushkarjoshi/brushtoolValerio Virgillito2012-04-27
| | |\ \ \ \ | | | |/ / / | | |/| | |
| * | | | | Revert "Fix Brush tool not broadcasting elementAdded event"Jonathan Duran2012-04-27
| * | | | | 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 th...Nivesh Rajbhandari2012-04-24
| | | * | | Fixing translate handles to draw without zoom value. Also fixed some typos i...Nivesh Rajbhandari2012-04-20
| | | | |/ | | | |/|
| * | | | Merge branch 'refs/heads/NINJAmaster' into TimelineUberJonathan Duran2012-04-25
| |\| | |
| * | | | Revert "Fix Pen Tool not broadcasting elementAdded event"Jonathan Duran2012-04-25
| * | | | Fix Brush tool not broadcasting elementAdded eventJonathan Duran2012-04-23