| Commit message (Collapse) | Author | Age | |
|---|---|---|---|
| * | Merge branch 'master' into pentool | Pushkar Joshi | 2012-05-21 |
| |\ | |||
| | * | 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> | ||
| * | | | 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> | ||
| | * | | 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 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 |
| | | | | | | |||
| * | | | | | undo some previous change that was halving the alpha value of the stroke | Pushkar Joshi | 2012-05-01 |
| | | | | | | |||
| * | | | | | small code changes (mostly re-org) | Pushkar Joshi | 2012-05-01 |
| | | | | | | |||
| * | | | | | Fixed 1436 Brush: Calligraphic brushstroke is slightly thicker than the ↵ | Pushkar Joshi | 2012-05-01 |
| | | | | | | | | | | | | | | | | | | | | | round tip brushstroke | ||
| * | | | | | prevent alpha values from accumulating over 1 due to rounding...fixes 1443 ↵ | Pushkar Joshi | 2012-05-01 |
| | | | | | | | | | | | | | | | | | | | | | Brush: Odd painting behavior when Hardness is 99%. A solid outline is shown on the brushstroke. | ||
| * | | | | | scale the brush stroke according to the input width and height | Pushkar Joshi | 2012-04-27 |
| |/ / / / | | | | | | | | | | | | | Fixes: 1444 Brush: Unable to scale brushstroke using the Transform handles | ||
| * | | | | 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> | ||
| * | | 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 | ||
| | * | 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> | ||
| * | | 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 | ||
| | * | 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> | ||
| | | * | Merge branch 'refs/heads/WebGLFileIO' into ToolFixes | Nivesh Rajbhandari | 2012-04-04 |
| | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: assets/canvas-runtime.js js/controllers/elements/shapes-controller.js js/lib/drawing/world.js js/lib/geom/geom-obj.js js/lib/geom/line.js js/mediators/element-mediator.js js/panels/presets/animations-presets.reel/animations-presets.js js/panels/presets/style-presets.reel/style-presets.js js/panels/presets/transitions-presets.reel/transitions-presets.js Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| | | | * | Merge branch 'refs/heads/EricSnapping' into WebGLFileIO | Nivesh Rajbhandari | 2012-04-04 |
| | | | |\ | |||
| | | | | * | Snapping fixes. | hwc487 | 2012-04-02 |
| | | | | | | |||
| | | | * | | IKNinja-1399 - [Eyedropper] Not sampling WebGL gradients after file open. | Nivesh Rajbhandari | 2012-04-02 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Need to set the isShape property in the elementModel on file open. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| | | | * | | IKNinna-1409 - Should dirty document when changing shape properties. ↵ | Nivesh Rajbhandari | 2012-04-02 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | IKNinja-1391 - Shapes need to support no-color. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| | | | * | | Update PI and Color Panel to reflect default LinearGradient and ↵ | Nivesh Rajbhandari | 2012-03-30 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | RadialGradient materials' colors. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| | | | * | | Merge branch 'refs/heads/ninja-internal' into WebGLFileIO | Nivesh Rajbhandari | 2012-03-30 |
| | | | |\| | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| | | | * | | Updated shapes to always check for its stroke and fill colors and materials ↵ | Nivesh Rajbhandari | 2012-03-29 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | instead of relying on the shapeModel cache because it can get out of sync. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| | * | | | | Build elements' properties3d values on file open. | Nivesh Rajbhandari | 2012-03-27 |
| | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| | * | | | | Merge branch 'refs/heads/WebGLFileIO' into WebGLMaterials | Nivesh Rajbhandari | 2012-03-27 |
| | |\ \ \ \ | | | |/ / | | |/| | | |||
| | * | | | | Merge branch 'refs/heads/ninja-internal' into WebGLMaterials | Nivesh Rajbhandari | 2012-03-27 |
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| | * | | | | | Do not set webkit-transform styles on elements unless 3d is used on them. | Nivesh Rajbhandari | 2012-03-21 |
| | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| | * | | | | | Get matrix and perspective distance from styles controller. | Nivesh Rajbhandari | 2012-03-21 |
| | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||