| Commit message (Collapse) | Author | Age | |
|---|---|---|---|
| * | More consistent local and global mouse coords which solves a bug with the ↵ | Pushkar Joshi | 2012-05-29 |
| | | | | | Pen minus subtool not removing 1 anchor paths | ||
| * | rename dragging plane to dragPlane (for consistency with ShapeTool) | Pushkar Joshi | 2012-05-29 |
| | | |||
| * | allow changes in the pen subtool in options to be seen by the pen tool code ↵ | Pushkar Joshi | 2012-05-22 |
| | | | | | | | (can now select the pen plus, pen minus subtools) AND add keyboard shortcut for brush tool | ||
| * | Merge branch 'master' into pentool | Pushkar Joshi | 2012-05-21 |
| |\ | |||
| | * | Add color to tag tool | Valerio Virgillito | 2012-05-15 |
| | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| | * | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵ | John Mayhew | 2012-05-15 |
| | |\ | | | | | | | | | | WorkingBranch | ||
| | | * | Merge branch 'refs/heads/ninja-internal' into WebGLFixes | Nivesh Rajbhandari | 2012-05-10 |
| | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/io/system/ninjalibrary.json Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| | | * \ | Merge branch 'refs/heads/ninja-internal' into WebGLFixes | Nivesh Rajbhandari | 2012-05-08 |
| | | |\ \ | |||
| | | * \ \ | Merge branch 'refs/heads/ninja-internal' into WebGLFixes | Nivesh Rajbhandari | 2012-05-07 |
| | | |\ \ \ | |||
| | | * | | | | Converting geom-obj to object literal notation. | Nivesh Rajbhandari | 2012-05-02 |
| | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| | | * | | | | Converting line, circle and rectangle shapes to object literal notation. | Nivesh Rajbhandari | 2012-05-02 |
| | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| | * | | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵ | John Mayhew | 2012-05-10 |
| | |\ \ \ \ \ | | | |_|_|/ | | |/| | | | | | | | | | WorkingBranch | ||
| | * | | | | | put color chips in the inkbottle and fill tool | John Mayhew | 2012-05-10 |
| | | | | | | | |||
| | * | | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵ | John Mayhew | 2012-05-07 |
| | |\ \ \ \ \ | | | |_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | WorkingBranch Conflicts: js/components/layout/tools-list.reel/tools-list.html js/components/layout/tools-properties.reel/tools-properties.html js/components/tools-properties/brush-properties.reel/brush-properties.html js/components/tools-properties/fill-properties.reel/fill-properties.html js/components/tools-properties/pen-properties.reel/pen-properties.html js/components/tools-properties/pencil-properties.reel/pencil-properties.html js/components/tools-properties/selection-properties.reel/selection-properties.html js/components/tools-properties/shape-properties.reel/shape-properties.html js/components/tools-properties/tag-properties.reel/tag-properties.html js/components/tools-properties/text-properties.reel/text-properties.html | ||
| | * | | | | | More implementation of moving color chips to the individual subtools. | John Mayhew | 2012-05-07 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removed the tool color bar Added new icons for inkbottle Removed Pencil tool Removed Inkbottle tool Added chips to the pen, brush and tag tools Aligned controls in several subtools | ||
| | * | | | | | First round of moving color chips into the sub tools. Shape and Pen tool now ↵ | John Mayhew | 2012-05-03 |
| | | | | | | | | | | | | | | | | | | | | | | | | | have chips in the sub tool bar. Still need to complete adding chips to the Brush tool and finalizing the subtool bar layout to our spec for all of the subtools. | ||
| * | | | | | | handle anchor point deletion correctly (does not yet fully work for ↵ | Pushkar Joshi | 2012-05-11 |
| | | | | | | | | | | | | | | | | | | | | | | | | | PEN-MINUS subtool) | ||
| * | | | | | | Merge branch 'master' into pentool | Pushkar Joshi | 2012-05-11 |
| |\ \ \ \ \ \ | | |_|/ / / | |/| | | | | |||
| | * | | | | | some code cleanup | Valerio Virgillito | 2012-05-09 |
| | | |_|_|/ | |/| | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| | * | | | | Fixed a snapping issue on the mouse down in drawing tools. | hwc487 | 2012-05-08 |
| | | | | | | |||
| | * | | | | fixes for 2D and 3D translation. | hwc487 | 2012-05-07 |
| | | |/ / | |/| | | |||
| * | | | | code cleanup and starting the subtool functionality | Pushkar Joshi | 2012-05-11 |
| | | | | | |||
| * | | | | Merge branch 'master' into pentool | Pushkar Joshi | 2012-05-07 |
| |\| | | | |||
| | * | | | Refactor creating elements. Removed makeNJElement and separated the model ↵ | Valerio Virgillito | 2012-05-03 |
| | | | | | | | | | | | | | | | | | | | | | | | | | creation Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| | * | | | Merge branch 'refs/heads/master' into tag-2.0 | Valerio Virgillito | 2012-05-03 |
| | |\ \ \ | | | |/ | | |/| | |||
| | | * | | Support drawing in side and top view. Also, adding back support for drawing ↵ | Nivesh Rajbhandari | 2012-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 Virgillito | 2012-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 Rajbhandari | 2012-05-01 |
| | | | | | | | | | | | | | | | | | | | differently. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| | * | | Merge branch 'refs/heads/ninja-internal' into StageWebTemplate | Nivesh Rajbhandari | 2012-05-01 |
| | |\ \ | |||
| | | * | | Removing some console logs | Valerio Virgillito | 2012-04-30 |
| | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| | * | | | Get working plane grid to draw for new stage web template workflow. | Nivesh Rajbhandari | 2012-05-01 |
| | |/ / | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| | * / | Squashed commit of stage architecture | Valerio Virgillito | 2012-04-30 |
| | |/ | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| | * | Merge pull request #182 from ericmueller/Canvas-interaction | Valerio Virgillito | 2012-04-30 |
| | |\ | | | | | | | Canvas interaction | ||
| | | * | added a console.log to show the working plane during a drag | hwc487 | 2012-04-27 |
| | | | | |||
| | | * | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵ | hwc487 | 2012-04-27 |
| | | |\ | | | | | | | | | | | | | Canvas-interaction | ||
| | | * | | Creating shapes in a container | hwc487 | 2012-04-27 |
| | | | | | |||
| | | * | | canvas interaction | hwc487 | 2012-04-26 |
| | | | | | |||
| | | * | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵ | hwc487 | 2012-04-25 |
| | | |\ \ | | | | | | | | | | | | | | | | Canvas-interaction | ||
| | | * \ \ | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵ | hwc487 | 2012-04-25 |
| | | |\ \ \ | | | | | | | | | | | | | | | | | | | Canvas-interaction | ||
| | | * | | | | canvas interaction | hwc487 | 2012-04-23 |
| | | | | | | | |||
| | | * | | | | limits | hwc487 | 2012-04-23 |
| | | | | | | | |||
| * | | | | | | handle delete more correctly than before (selected subpaths are ↵ | Pushkar Joshi | 2012-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 Joshi | 2012-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 tool | Pushkar Joshi | 2012-05-01 |
| | | | | | | | |||
| * | | | | | | Merge branch 'master' into pentool | Pushkar Joshi | 2012-04-27 |
| |\| | | | | | |||
| | * | | | | | Merge cleanup | Valerio Virgillito | 2012-04-27 |
| | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| | * | | | | | Merge branch 'refs/heads/serialization' | Valerio Virgillito | 2012-04-27 |
| | |\ \ \ \ \ | |||
| | | * | | | | | Simplifying the getElement method from stage and adding an exclusion list to ↵ | Valerio Virgillito | 2012-04-26 |
| | | | |_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | the new template Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| | * | | | | | Refix brush tool elementAdded event | Jonathan Duran | 2012-04-27 |
| | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com> | ||
| | * | | | | | Merge branch 'refs/heads/NINJAmaster' into TimelineUber | Jonathan Duran | 2012-04-27 |
| | |\ \ \ \ \ | | | |_|_|/ | | |/| | | | |||