| Commit message (Collapse) | Author | Age | |
|---|---|---|---|
| * | Merge branch 'refs/heads/master' into CSSPanelUpdates | Eric Guzman | 2012-05-10 |
| |\ | | | | | | | | | Conflicts: js/panels/CSSPanel/ComputedStyleSubPanel.reel/ComputedStyleSubPanel.html | ||
| | * | Refactor creating elements. Removed makeNJElement and separated the model ↵ | Valerio Virgillito | 2012-05-03 |
| | | | | | | | | | | | | | creation Signed-off-by: Valerio Virgillito <valerio@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> | ||
| * | | Merge branch 'refs/heads/master' into CSSPanelUpdates | Eric Guzman | 2012-05-01 |
| |\| | |||
| | * | Merge pull request #182 from ericmueller/Canvas-interaction | Valerio Virgillito | 2012-04-30 |
| | |\ | | | | | | | Canvas interaction | ||
| | | * | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵ | hwc487 | 2012-04-27 |
| | | |\ | | | | | | | | | | | | | Canvas-interaction | ||
| | | * | | canvas interaction | hwc487 | 2012-04-26 |
| | | | | | |||
| | | * | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵ | hwc487 | 2012-04-25 |
| | | |\ \ | | | | | | | | | | | | | | | | Canvas-interaction | ||
| | | * | | | Snapping tocontained objects | hwc487 | 2012-04-24 |
| | | | | | | |||
| | | * | | | canvas interaction | hwc487 | 2012-04-23 |
| | | | | | | |||
| * | | | | | Merge branch 'refs/heads/master' into CSSPanelUpdates | Eric Guzman | 2012-04-30 |
| |\| | | | | |||
| | * | | | | Merge branch 'refs/heads/serialization' | Valerio Virgillito | 2012-04-27 |
| | |\ \ \ \ | | |_|_|/ | |/| | | | |||
| | | * | | | Merge branch 'refs/heads/master' into stage-document-architecture | Valerio Virgillito | 2012-04-26 |
| | | |\ \ \ | |||
| | | * | | | | Fixing the element model and adding get element | Valerio Virgillito | 2012-04-26 |
| | | | |_|/ | | |/| | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| | * | | | | Merge pull request #176 from pushkarjoshi/brushtool | Valerio Virgillito | 2012-04-27 |
| | |\ \ \ \ | | |_|/ / | |/| | | | Brushtool | ||
| | | * | | | 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 | ||
| | * | | | IKNinja-406 - Strange behavior when changing the corner radius to the ↵ | Nivesh Rajbhandari | 2012-04-25 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | maximum value. IKNinja-1236 - Corner radius is not applied if stroke size is >= 2 times the corner radius. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| | * | | | Changing canvas-2d gradient drawing to more closely match div's ↵ | Nivesh Rajbhandari | 2012-04-25 |
| | |/ / | | | | | | | | | | | | | | | | background-image gradient support. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| * | | | Merge branch 'refs/heads/master' into CSSPanelUpdates | Eric Guzman | 2012-04-26 |
| |\| | | |||
| | * | | re-compute and store the center of the subpath in local coordinates upon ↵ | Pushkar Joshi | 2012-04-24 |
| | | | | | | | | | | | | | file open | ||
| | * | | Merge branch 'master' into pentool | Pushkar Joshi | 2012-04-19 |
| | |\| | | | | | | | | | | | | | Conflicts: js/helper-classes/3D/view-utils.js | ||
| | * | | 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) | ||
| | * | | 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 | ||
| | * | | re-enable dragging and editing of anchor point handles for bezier path ↵ | Pushkar Joshi | 2012-04-18 |
| | | | | | | | | | | | | | editing in 3D | ||
| | * | | 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) | ||
| | * | | 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 | ||
| | * | | | 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 | ||
| | * | | | Use local coordinates to pick a point within the path (works correctly even ↵ | Pushkar Joshi | 2012-04-11 |
| | | | | | | | | | | | | | | | | | with canvas and/or stage transformation). Dragging does not yet work in case of canvas transformation | ||
| | * | | | compute and store local coordinates for all anchor points and their control ↵ | Pushkar Joshi | 2012-04-10 |
| | | | | | | | | | | | | | | | | | handles separately, AND more hit testing with local coordinates | ||
| | * | | | snapping feedback for pen tool, correct for subpaths that may lie on rotated ↵ | Pushkar Joshi | 2012-04-09 |
| | | | | | | | | | | | | | | | | | canvas, and with a rotated view | ||
| | * | | | Merge branch 'master' into pentool | Pushkar Joshi | 2012-04-06 |
| | |\ \ \ | |||
| | * | | | | Don't update the plane matrix of subpaths that already have a plane matrix | Pushkar Joshi | 2012-04-06 |
| | | | | | | |||
| | * | | | | Merge branch 'master' into pentool | Pushkar Joshi | 2012-04-04 |
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/tools/PenTool.js | ||
| | * | | | | | draw the path overlay (and anchor points) taking into account the ↵ | Pushkar Joshi | 2012-04-04 |
| | | | | | | | | | | | | | | | | | | | | | | | | | transformation applied to the element canvas and the stage canvas. Still quite buggy. | ||
| | * | | | | | working File I/O for pen tool created paths and some minor bug fixes ↵ | Pushkar Joshi | 2012-04-03 |
| | | | | | | | | | | | | | | | | | | | | | | | | | (correctly setting the canvas for brush stroke file I/O, correct plane matrix for file I/O) | ||
| | * | | | | | track the canvas top left position instead of the center position to figure ↵ | Pushkar Joshi | 2012-04-03 |
| | | | | | | | | | | | | | | | | | | | | | | | | | out when to translate the subpath per canvas translation...this one seems to not drift (no floating point issues uncovered so far) | ||
| | * | | | | | First attempt at preventing the drifting of the canvas due to floating point ↵ | Pushkar Joshi | 2012-04-03 |
| | | | | | | | | | | | | | | | | | | | | | | | | | roundoff errors when constantly changing stroke width | ||
| | * | | | | | render the pen path with local coordinates, but use stage world coordinates ↵ | Pushkar Joshi | 2012-04-02 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | to position the canvas on which the path is rendered AND add data-montage- to the ids in the pen and brush reels AND fix a bug with pen stroke transparency not working | ||
| | * | | | | | Merge branch 'brushtool' into pentool | Pushkar Joshi | 2012-03-28 |
| | |\ \ \ \ \ | |||
| | * | | | | | | added cursors to the pen tool UI AND change cursor when the user hovers over ↵ | Pushkar Joshi | 2012-03-27 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | an anchor point or handles of thte selected anchor | ||
| * | | | | | | | Merge branch 'refs/heads/master' into CSSPanelUpdates | Eric Guzman | 2012-04-23 |
| |\ \ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | | | |||
| | * | | | | | | IKNinja-1477 - Cannot preflight Fill color if WebGL Line shape is selected. | Nivesh Rajbhandari | 2012-04-17 |
| | | |_|_|_|/ | |/| | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| * | | | | | | Merge branch 'refs/heads/master' into CSSPanelUpdates | Eric Guzman | 2012-04-09 |
| |\| | | | | | |||
| | * | | | | | Undoing mistakes from auto-merge. | Nivesh Rajbhandari | 2012-04-05 |
| | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| | * | | | | | Merge branch 'refs/heads/ToolFixes' into WebGLMaterials | Nivesh Rajbhandari | 2012-04-04 |
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/document/templates/montage-html/default_html.css js/mediators/element-mediator.js js/panels/properties.reel/properties.js js/tools/BrushTool.js js/tools/LineTool.js js/tools/PenTool.js js/tools/SelectionTool.js js/tools/ShapeTool.js js/tools/TranslateObject3DTool.js Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||