| Commit message (Collapse) | Author | Age | |
|---|---|---|---|
| * | Squashed master into dom-architecture | Valerio Virgillito | 2012-05-16 |
| | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| * | Snapping tocontained objects | hwc487 | 2012-04-24 |
| | | |||
| * | 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> | ||
| * | Undoing mistakes from auto-merge. | Nivesh Rajbhandari | 2012-04-05 |
| | | | | | 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> | ||
| | * | 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> | ||
| | * | 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> | ||
| * | | | removed old unused import and export functions. | John Mayhew | 2012-04-03 |
| | |/ |/| | |||
| * | | Merge branch 'master' into brushtool | Pushkar Joshi | 2012-03-27 |
| |\| | |||
| | * | Fixed issue with WebGL materials not working after file-save or ↵ | Nivesh Rajbhandari | 2012-03-26 |
| | | | | | | | | | | | | | chrome-preview. Also fixed Raiders material not showing in the PI or working during Chrome Preview. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| * | | File IO for the brush stroke AND changing the data type of brush stroke from ↵ | Pushkar Joshi | 2012-03-27 |
| |/ | | | | GEOM_TYPE_CUBIC_BEZIER to GEOM_TYPE_BRUSH_STROKE | ||
| * | Fixed a problem switching from 3D to 2D and back to 3D. | hwc487 | 2012-03-23 |
| | | |||
| * | Added Paris and Raiders materials | hwc487 | 2012-03-22 |
| | | |||
| * | Bug Fixes for Canvas & WebGL File IO | hwc487 | 2012-03-20 |
| | | |||
| * | Supporting new and old GL data formats. | hwc487 | 2012-03-16 |
| | | |||
| * | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵ | hwc487 | 2012-03-16 |
| |\ | | | | | | | integration | ||
| | * | Merge pull request #34 from ericmueller/integration | Jose Antonio Marquez Russo | 2012-03-15 |
| | |\ | | | | | | | Integration | ||
| | * \ | Merge pull request #110 from mqg734/WebGLFixes | Valerio Virgillito | 2012-03-13 |
| | |\ \ | | | | | | | | | Gradient Support for Shapes and Eyedropper support for gradients. Also fixed 3d bug when moving multiple selections in 3d using the Selection Tool | ||
| | | * | | Support import/export of gradient materials. This fixes the eyedropper not ↵ | Nivesh Rajbhandari | 2012-03-12 |
| | | | | | | | | | | | | | | | | | | | | | | | | | being able to sample gradient colors from WebGL shapes. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| | | * | | Fix for stroke and fill gradients not being retained when drawing multiple ↵ | Nivesh Rajbhandari | 2012-03-07 |
| | | | | | | | | | | | | | | | | | | | | | | | | | shapes and switching between them. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| | | * | | preliminary support for setting gradients on webgl shapes. | Nivesh Rajbhandari | 2012-03-07 |
| | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| * | | | | Conversion to JSON based file IO for canvas2D and WebGL rendering | hwc487 | 2012-03-16 |
| | |_|/ |/| | | |||
| * | | | Uber material changes for IO | hwc487 | 2012-03-12 |
| |/ / | |||
| * | | Canvas IO | hwc487 | 2012-03-08 |
| | | | |||
| * | | File IO | hwc487 | 2012-03-07 |
| |/ | |||
| * | Squashed commit of preload-fix into Master | Valerio Virgillito | 2012-03-06 |
| - Requiring all the previously pre-loaded files - RDGE, Codemirror and gl-matrix are not included via a script tag. Signed-off-by: Valerio Virgillito <valerio@motorola.com> | |||