Commit message (Collapse) | Author | Age | |
---|---|---|---|
* | Merge branch 'refs/heads/master' into element-model-fixes | Valerio Virgillito | 2012-06-06 |
|\ | | | | | | | | | | | | | | | Conflicts: js/document/models/html.js js/document/views/design.js Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| * | enable gradients for pen stroke and fill | Pushkar Joshi | 2012-06-05 |
| | | |||
| * | Merge branch 'master' into pentool | Pushkar Joshi | 2012-05-31 |
| |\ | |||
| * | | move all the subpath functions to its prototype, and first version of the ↵ | Pushkar Joshi | 2012-05-31 |
| | | | | | | | | | | | | pen path runtime | ||
| * | | Merge branch 'master' into pentool | Pushkar Joshi | 2012-05-21 |
| |\ \ | |||
| * | | | code cleanup and starting the subtool functionality | Pushkar Joshi | 2012-05-11 |
| | | | | |||
| * | | | Merge branch 'master' into pentool | Pushkar Joshi | 2012-05-07 |
| |\ \ \ | |||
| * | | | | 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 | ||
* | | | | | removing all model creators. | Valerio Virgillito | 2012-06-05 |
| |_|_|/ |/| | | | | | | | | | | | | | | | | | | | The elementModel is now a getter that will create a new model when needed. Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
* | | | | Fixing reference of document | Jose Antonio Marquez | 2012-05-24 |
| | | | | |||
* | | | | Merge branch 'dom-architecture' of ↵ | Eric Guzman | 2012-05-22 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | github.com:Motorola-Mobility/ninja-internal into CSSPanelUpdates Conflicts: js/controllers/styles-controller.js | ||
| * \ \ \ | Merge branch 'refs/heads/master' into dom-architecture | Valerio Virgillito | 2012-05-22 |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/io/system/ninjalibrary.json Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| | * | | | | Updates for WebGL/Canvas 2D authortime and runtime gradients. | hwc487 | 2012-05-18 |
| | | | | | | |||
| | * | | | | canvas 2d radial gradient render problem. | hwc487 | 2012-05-17 |
| | | | | | | |||
| | * | | | | Linear & radial gradients for runtime fixes | hwc487 | 2012-05-17 |
| | | | | | | |||
| | * | | | | Gradient matching between WebGL and Canvas2D | hwc487 | 2012-05-15 |
| | | | | | | |||
| | * | | | | base canvas 2d rendering of radial gradient on size of the filled region only | hwc487 | 2012-05-14 |
| | | | | | | |||
| | * | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into 3DBugs | hwc487 | 2012-05-11 |
| | |\ \ \ \ | | | | |_|/ | | | |/| | | | | | | | | | | | | | | | | | | | | Conflicts: js/lib/geom/circle.js js/lib/geom/rectangle.js | ||
| | * | | | | code cleanup for linear gradients. | hwc487 | 2012-05-08 |
| | | | | | | |||
| | * | | | | WebGL linear gradients to match CSS | hwc487 | 2012-05-08 |
| | | | | | | |||
| | * | | | | Radial gradients to match CSS | hwc487 | 2012-05-08 |
| | | |_|/ | | |/| | | |||
| * | | | | Squashed master into dom-architecture | Valerio Virgillito | 2012-05-16 |
| | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| * | | | | Fixing the live preview for the new document. | Valerio Virgillito | 2012-05-10 |
| |/ / / | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
* | | | | Merge branch 'refs/heads/master' into CSSPanelUpdates | Eric Guzman | 2012-05-17 |
|\ \ \ \ | | |/ / | |/| | | |||
| * | | | 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 '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> |