aboutsummaryrefslogtreecommitdiff
path: root/js/tools
Commit message (Collapse)AuthorAge
...
| * | | | | | Merge branch 'refs/heads/master' into tag-2.0Valerio Virgillito2012-05-03
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | |
| * | | | | | Nesting absolute element in the Tag tool. Refactoring element creation and ↵Valerio Virgillito2012-05-02
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | element models Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* | | | | | | Removed special-casing for new template workflow. Instead, we will enforce ↵Nivesh Rajbhandari2012-05-04
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a width and height on the body in order to do 3d. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* | | | | | | Fixing selection and layout code to exclude SCRIPT and STYLE tags.Nivesh Rajbhandari2012-05-04
| |/ / / / / |/| | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* | | | | | Support drawing in side and top view. Also, adding back support for drawing ↵Nivesh Rajbhandari2012-05-01
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | shapes inside canvas when double-clicked into canvas or when moused over canvas. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* | | | | webTemplate var gets reset to false, so must check for new stage template ↵Nivesh Rajbhandari2012-05-01
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | differently. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* | | | | Merge branch 'refs/heads/ninja-internal' into StageWebTemplateNivesh Rajbhandari2012-05-01
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | Removing some console logsValerio Virgillito2012-04-30
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* | | | | Get working plane grid to draw for new stage web template workflow.Nivesh Rajbhandari2012-05-01
|/ / / / | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* / / / Squashed commit of stage architectureValerio Virgillito2012-04-30
|/ / / | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* | | Merge pull request #182 from ericmueller/Canvas-interactionValerio Virgillito2012-04-30
|\ \ \ | |_|/ |/| | Canvas interaction
| * | 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 ↵hwc4872012-04-27
| |\ \ | | | | | | | | | | | | Canvas-interaction
| * | | Creating shapes in a containerhwc4872012-04-27
| | | |
| * | | canvas interactionhwc4872012-04-26
| | | |
| * | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵hwc4872012-04-25
| |\ \ \ | | | | | | | | | | | | | | | Canvas-interaction
| * \ \ \ Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵hwc4872012-04-25
| |\ \ \ \ | | | | | | | | | | | | | | | | | | Canvas-interaction
| * | | | | canvas interactionhwc4872012-04-23
| | | | | |
| * | | | | limitshwc4872012-04-23
| | | | | |
* | | | | | 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
| | * | | 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
* | | | 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
|\| |
| * | 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
| * | get the canvas plane matrix before multiplying it with the translation due ↵Pushkar Joshi2012-04-19
| | | | | | | | | | | | to shift in center of rotation
| * | correctly maintain canvas position when drawing subpaths off the XY plane ↵Pushkar Joshi2012-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 Joshi2012-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 Joshi2012-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 Joshi2012-04-19
| | | | | | | | | | | | decide to, later)
| * | fix a bug with closing the subpathPushkar Joshi2012-04-18
| | |
| * | re-enable dragging and editing of anchor point handles for bezier path ↵Pushkar Joshi2012-04-18
| | | | | | | | | | | | editing in 3D
| * | compute the translation to new center of bounding of the subpath --- this ↵Pushkar Joshi2012-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 Joshi2012-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 Joshi2012-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 Joshi2012-04-17
| | | | | | | | | | | | from local to global coords (the latter should be a temporary change as I will significantly change this)
| * | Merge branch 'master' into pentoolPushkar Joshi2012-04-17
| |\ \ | | | | | | | | | | | | | | | | Conflicts: js/tools/PenTool.js
| * | | Snapshot for pen tool before merging with master....can draw polylines (no ↵Pushkar Joshi2012-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