Commit message (Collapse) | Author | Age | |
---|---|---|---|
* | Merge branch 'refs/heads/ninja-internal' into WebGLFileIO | Nivesh Rajbhandari | 2012-03-30 |
|\ | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| * | Merge branch 'master' into brushtool | Pushkar Joshi | 2012-03-27 |
| |\ | |||
| * | | 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 | ||
* | | | 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> | ||
* | | 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> | ||
* | 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> | ||
* | Some code cleanup - removing unused assignments. | Valerio Virgillito | 2012-03-13 |
| | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
* | 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 | ||
| * | Eyedropper support for getting color value from webgl shapes. | Nivesh Rajbhandari | 2012-03-09 |
| | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
* | | Removed asset path replacement at authortime. | hwc487 | 2012-03-09 |
| | | |||
* | | 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> |