Commit message (Collapse) | Author | Age | |
---|---|---|---|
* | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵ | hwc487 | 2012-05-22 |
|\ | | | | | | | | | | | | | | | Textures Conflicts: js/lib/geom/shape-primitive.js js/lib/rdge/materials/linear-gradient-material.js | ||
| * | 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 |
| | | | |||
* | | | Editable parameters for flag, pulse, uber, and radial gradient materials. | hwc487 | 2012-05-22 |
| | | | |||
* | | | Editable material properties | hwc487 | 2012-05-22 |
| | | | |||
* | | | Exposing parameters for pulse and plasma materials | hwc487 | 2012-05-17 |
| | | | |||
* | | | Exposing parameters in Water Material | hwc487 | 2012-05-16 |
| | | | |||
* | | | More merge problems | hwc487 | 2012-05-14 |
| | | | |||
* | | | Fixing merge issues | hwc487 | 2012-05-14 |
| | | | |||
* | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵ | hwc487 | 2012-05-11 |
|\ \ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | | Textures Conflicts: js/lib/geom/geom-obj.js js/lib/geom/rectangle.js js/tools/TagTool.js | ||
| * | | Merge branch 'refs/heads/ninja-internal' into WebGLFixes | Nivesh Rajbhandari | 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> | ||
| * | | 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> | ||
* | | Cleanup of indirect textures. | hwc487 | 2012-05-03 |
| | | |||
* | | Material editor | hwc487 | 2012-05-02 |
| | | |||
* | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵ | hwc487 | 2012-05-01 |
|\| | | | | | | | Textures | ||
| * | 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 |
| | | | | | |||
* | | | | | twist vertex material changes | hwc487 | 2012-04-30 |
| | | | | | |||
* | | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵ | hwc487 | 2012-04-27 |
|\| | | | | | | | | | | | | | | | | | | | Textures | ||
| * | | | | 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 | ||
* | | | | Update materials to the new texture model. | hwc487 | 2012-04-26 |
| | | | | | | | | | | | | | | | | Create local world for deleted source canvases | ||
* | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵ | hwc487 | 2012-04-26 |
|\| | | | | | | | | | | | | | | | Textures | ||
| * | | | 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 | ||
| * | | 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 |