| Commit message (Collapse) | Author | Age | |
|---|---|---|---|
| * | 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. | ||
| * | 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 |
| | | | | | | |||
| * | | | | | 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 |
| |\ \ \ \ \ | | |_|_|/ | |/| | | | |||
| | * | | | | Merge pull request #176 from pushkarjoshi/brushtool | Valerio Virgillito | 2012-04-27 |
| | |\ \ \ \ | | |/ / / | |/| | | | Brushtool | ||
| | | * | | | track the dragging plane based on the hit record so that the file IO works ↵ | Pushkar Joshi | 2012-04-26 |
| | | | | | | | | | | | | | | | | | | | | | again (bug fix) | ||
| | | * | | | render the calligraphic brush stroke in realtime on a rotated canvas | Pushkar Joshi | 2012-04-25 |
| | | | | | | |||
| | | * | | | allow the realtime drawing of brush strokes drawn off the standard XY plane ↵ | Pushkar Joshi | 2012-04-24 |
| | | | |/ | | |/| | | | | | | | | | by passing in the transformation matrix | ||
| * | | | | Revert "Fix Brush tool not broadcasting elementAdded event" | Jonathan Duran | 2012-04-27 |
| | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 12fadd1494a9b5fcdaa17fde2f4847277237cf79. Signed-off-by: Jonathan Duran <jduran@motorola.com> | ||
| * | | | | Merge branch 'refs/heads/NINJAmaster' into TimelineUber | Jonathan Duran | 2012-04-26 |
| |\| | | | |||
| | * | | | Merge pull request #175 from mqg734/BoundsCalculation | Valerio Virgillito | 2012-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 Rajbhandari | 2012-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 Rajbhandari | 2012-04-20 |
| | | |/ | | | | | | | | | | | | | | | | in zoom code. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| * | | | Merge branch 'refs/heads/NINJAmaster' into TimelineUber | Jonathan Duran | 2012-04-25 |
| |\| | | |||
| | * | | re-compute and store the center of the subpath in local coordinates upon ↵ | Pushkar Joshi | 2012-04-24 |
| | | | | | | | | | | | | | file open | ||
| | * | | allow the addition of the pen tool to the timeline | Pushkar Joshi | 2012-04-23 |
| | | | | |||
| | * | | Merge branch 'master' into pentool | Pushkar Joshi | 2012-04-19 |
| | |\| | | | | | | | | | | | | | Conflicts: js/helper-classes/3D/view-utils.js | ||
| | * | | get the canvas plane matrix before multiplying it with the translation due ↵ | Pushkar Joshi | 2012-04-19 |
| | | | | | | | | | | | | | to shift in center of rotation | ||
| | * | | correctly maintain canvas position when drawing subpaths off the XY plane ↵ | Pushkar Joshi | 2012-04-19 |
| | | | | | | | | | | | | | (was a bug with starting drawing in those planes) | ||
| | * | | for subpaths that have not been initialized with a canvas yet (i.e. no local ↵ | Pushkar Joshi | 2012-04-19 |
| | | | | | | | | | | | | | coordinates), use stage world mouse positions to translate the anchor points while dragging | ||
| | * | | store the canvas center (in local space) per each subpath, instead of ↵ | Pushkar Joshi | 2012-04-19 |
| | | | | | | | | | | | | | tracking it by the pen tool. This fixes the bug where the canvas transform was incorrectly applied when the stroke width was changed | ||
| | * | | turn off snapping for the pen tool (with an option to turn it back on if we ↵ | Pushkar Joshi | 2012-04-19 |
| | | | | | | | | | | | | | decide to, later) | ||
| | * | | fix a bug with closing the subpath | Pushkar Joshi | 2012-04-18 |
| | | | | |||
| | * | | re-enable dragging and editing of anchor point handles for bezier path ↵ | Pushkar Joshi | 2012-04-18 |
| | | | | | | | | | | | | | editing in 3D | ||
| | * | | compute the translation to new center of bounding of the subpath --- this ↵ | Pushkar Joshi | 2012-04-18 |
| | | | | | | | | | | | | | preserves the correct transformation applied to the subpath. This is a good snapshot of the polyline drawing in 3D (with some minor bugs). | ||
| | * | | allow drawing polylines in YZ and XZ planes as well as XY. In those planes, ↵ | Pushkar Joshi | 2012-04-18 |
| | | | | | | | | | | | | | still have bug with shift when the bbox of the path grows (due to missing translation) | ||
| | * | | Fairly stable version of polyline drawing code that works for paths on XY, ↵ | Pushkar Joshi | 2012-04-17 |
| | | | | | | | | | | | | | | | | | | | YZ, XZ planes. Current bugs: if the new point increases the bbox of the canvas, the entire canvas is shifted (due to inconsistency with center of rotation) AND the first two points added to planes other than XY have incorrect local coordinates (due to missing local coordinates) | ||
| | * | | took out bad merge line and use different function for converting points ↵ | Pushkar Joshi | 2012-04-17 |
| | | | | | | | | | | | | | from local to global coords (the latter should be a temporary change as I will significantly change this) | ||
| | * | | Merge branch 'master' into pentool | Pushkar Joshi | 2012-04-17 |
| | |\ \ | | | | | | | | | | | | | | | | | Conflicts: js/tools/PenTool.js | ||
| | * | | | Snapshot for pen tool before merging with master....can draw polylines (no ↵ | Pushkar Joshi | 2012-04-17 |
| | | | | | | | | | | | | | | | | | prev, next) handles and hit testing in 3D. Update of the canvas with a transformation on it will modify the canvas incorrectly, and will be completed after merging with master | ||
| | * | | | re-enable some hit testing and change the code for obtaining 3D (stage ↵ | Pushkar Joshi | 2012-04-16 |
| | | | | | | | | | | | | | | | | | world) point when there is no canvas yet | ||
| | * | | | limit the size of the subpath canvas by ignoring the last point added that ↵ | Pushkar Joshi | 2012-04-16 |
| | | | | | | | | | | | | | | | | | tool the canvas size over the specified limit | ||
| | * | | | Allow the path stroke width to be changed without causing a drift in the ↵ | Pushkar Joshi | 2012-04-16 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | canvas position AND some code cleanup (remove canvas left and top tracking for each subpath) AND add flags for the specifying in what coordinate space we're sampling the subpath | ||
| | * | | | Still buggy version of pen tool that can create polylines in 3D space ↵ | Pushkar Joshi | 2012-04-13 |
| | | | | | | | | | | | | | | | | | correctly (except for incorrect canvas translation). Using cleaned up and re-factored version of the code. Not suitable for testing. | ||
| | * | | | Use local coordinates for rendering and hit testing only when the path ↵ | Pushkar Joshi | 2012-04-12 |
| | | | | | | | | | | | | | | | | | canvas exists....AND...good state for code that works in 3D as long as the path was originally created in XY plane of the stage | ||
| | * | | | create paths in 3D...still buggy if starting from scratch in planes other ↵ | Pushkar Joshi | 2012-04-11 |
| | | | | | | | | | | | | | | | | | than XY | ||
| | * | | | correctly add points to open paths on transformed canvases | Pushkar Joshi | 2012-04-11 |
| | | | | | |||
| | * | | | dragging anchor points in 3D (seems to work ok for existing paths --- the ↵ | Pushkar Joshi | 2012-04-11 |
| | | | | | | | | | | | | | | | | | left and top change causes the rest of the points to move, which *may* be unavoidable), still has bugs with NEW points being placed at wrong position | ||