| Commit message (Collapse) | Author | Age | |
|---|---|---|---|
| * | Merge branch 'master' into brushtool | Pushkar Joshi | 2012-03-27 |
| |\ | | | | | | | | | Conflicts: js/controllers/elements/shapes-controller.js | ||
| | * | Check for a authortime animation setting in the draw routine for WebGL. | Nivesh Rajbhandari | 2012-03-24 |
| | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| | * | Merge branch 'refs/heads/montage-integration' into WebGL-Animation-CheckBox | Nivesh Rajbhandari | 2012-03-24 |
| | |\ | |||
| | | * | Fixed a problem switching from 3D to 2D and back to 3D. | hwc487 | 2012-03-23 |
| | | | | |||
| | * | | Check for a authortime animation setting in the draw routine for WebGL. | Nivesh Rajbhandari | 2012-03-23 |
| | |/ | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| | * | Respect play/pause WebGL animation when saving files and re-rendering caused ↵ | Nivesh Rajbhandari | 2012-03-23 |
| | | | | | | | | | | | | | by geometry changes. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| | * | Squashed commit of the following GL integration | Valerio Virgillito | 2012-03-22 |
| | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| | * | Fixing the selection issues | Valerio Virgillito | 2012-03-20 |
| | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| * | | correctly update the brush stroke canvas size and position when the stroke ↵ | Pushkar Joshi | 2012-03-26 |
| | | | | | | | | | path is smoothed (and also when the stroke width is changed) AND some code cleanup to remove unnecessary brush stroke properties | ||
| * | | correctly update the brush stroke canvas size and position when the stroke ↵ | Pushkar Joshi | 2012-03-23 |
| | | | | | | | | | size is changed (does not yet work when smoothing is applied) AND select the newly created brush stroke by default | ||
| * | | Almost working version of brush tool that uses only local coordinates to ↵ | Pushkar Joshi | 2012-03-23 |
| | | | | | | | | | store the brush stroke points. Current version does not yet update the width and height of the brush stroke canvas upon changing the brush stroke through the PI. Also, current version does not obtain 3D position of points properly from the drawing tool base (see BrushTool _getUnsnappedPosition) | ||
| * | | revert to using the angle without flipping its sign...fixing some minor bugs ↵ | Pushkar Joshi | 2012-03-20 |
| | | | | | | | | | | | | | and code cleanup GOOD status before doing 3D unprojection step | ||
| * | | draw the brush stroke in realtime | Pushkar Joshi | 2012-03-19 |
| | | | |||
| * | | first pass for file IO of brush strokes | Pushkar Joshi | 2012-03-19 |
| | | | |||
| * | | Merge branch 'master' into brushtool | Pushkar Joshi | 2012-03-16 |
| |\| | |||
| | * | Merge pull request #34 from ericmueller/integration | Jose Antonio Marquez Russo | 2012-03-15 |
| | |\ | | | | | | | Integration | ||
| | | * | Corrections for Uber shader IO | hwc487 | 2012-03-14 |
| | | | | |||
| | | * | Uber material changes for IO | hwc487 | 2012-03-12 |
| | | | | |||
| * | | | update values in the PI from values of the selected brush stroke or pen tool ↵ | Pushkar Joshi | 2012-03-15 |
| | | | | | | | | | | | | | path | ||
| * | | | Merge branch 'master' into pentool | Pushkar Joshi | 2012-03-14 |
| |\| | | |||
| | * | | Some code cleanup - removing unused assignments. | Valerio Virgillito | 2012-03-13 |
| | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| * | | | PI for pen and brush strokes | Pushkar Joshi | 2012-03-14 |
| | | | | |||
| * | | | Merge branch 'pentool' into brushtool | Pushkar Joshi | 2012-03-13 |
| |\| | | |||
| | * | | Merge branch 'master' into pentool | Pushkar Joshi | 2012-03-13 |
| | |\ \ | |||
| | | * \ | 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> | ||
| | | | * | | Fixing radial gradient for rectangle. | Nivesh Rajbhandari | 2012-03-09 |
| | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| | | | * | | Fixing radial gradients for line and circle. | Nivesh Rajbhandari | 2012-03-09 |
| | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| | | | * | | Eyedropper support for getting color value from webgl shapes. | Nivesh Rajbhandari | 2012-03-09 |
| | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| | | | * | | gradient support for canvas-2d shapes. | Nivesh Rajbhandari | 2012-03-07 |
| | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| | | | * | | Change linear gradient to go from left to right instead of top-left to ↵ | Nivesh Rajbhandari | 2012-03-07 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bottom-right. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| | | | * | | Gradient support for canvas-2d rectangle. | Nivesh Rajbhandari | 2012-03-07 |
| | | | | | | | | | | | | | | | | | | | | | 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> | ||
| | | * | | | Merge pull request #108 from pushkarjoshi/brushtool | Valerio Virgillito | 2012-03-13 |
| | | |\ \ \ | | | |_|/ | | |/| | | Brushtool | ||
| | | * | | | Removing duplicate file | Jose Antonio Marquez | 2012-03-09 |
| | | | | | | |||
| | | * | | | Merge pull request #32 from ericmueller/integration | Jose Antonio Marquez Russo | 2012-03-09 |
| | | |\ \ \ | | | | | | | | | | | | | Added asset folder replacement to runtime load. | ||
| | | | * | | | Removed asset path replacement at authortime. | hwc487 | 2012-03-09 |
| | | | | | | | |||
| | | * | | | | Adding missing file for webGL, still need a fix for runtime | Jose Antonio Marquez | 2012-03-09 |
| | | |/ / / | |||
| | | * | | | Adding webGL I/O runtime functionality | Jose Antonio Marquez | 2012-03-09 |
| | | | | | | | | | | | | | | | | | | | | | There is a problem that needs to be resolved in the CanvasRuntime. | ||
| | | * | | | Canvas IO | hwc487 | 2012-03-08 |
| | | | | | | |||
| | | * | | | removed an unused parameter to CanvasDataManager | hwc487 | 2012-03-08 |
| | | | | | | |||
| | | * | | | Fix for runtime Radial blur material | hwc487 | 2012-03-08 |
| | | | | | | |||
| | | * | | | Fixed a few problems with Plasma material. | hwc487 | 2012-03-07 |
| | | | | | | |||
| | | * | | | File IO | hwc487 | 2012-03-07 |
| | | | | | | |||
| | | * | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵ | hwc487 | 2012-03-06 |
| | | |\ \ \ | | | | |/ | | | |/| | | | | | | | | | | | | | | | | | | | | | integration Conflicts: js/preloader/Preloader.js | ||
| | | * | | | Create element models based on nodeName. | Nivesh Rajbhandari | 2012-03-06 |
| | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| * | | | | | Add a smoothing amount parameter, and hide options based on checkboxes | Pushkar Joshi | 2012-03-13 |
| |/ / / / | |||
| * | | / | turn off the fill color for pen tool paths by default | Pushkar Joshi | 2012-03-13 |
| | |_|/ |/| | | |||
| * | | | seemingly working version of the calligraphic brush (seems to work with ↵ | Pushkar Joshi | 2012-03-12 |
| | | | | | | | | | | | | | transparency and large stroke widths...seems to work better with smoothing) | ||