aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
...
| | | | | | | | | * | | | | | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵hwc4872012-03-21
| | | | | | | | | |\ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|/ / / / / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | integration
| | | * | | | | | | | | | | | | | | Merge pull request #125 from ananyasen/IO-patch-ninja-internal-master-ananyaValerio Virgillito2012-03-21
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|/ / / / / / / | | | |/| | | | | | | | | | | | | | fix for IKNINJA-1357 - Cannot create other file types such as css, json ...
| | | | * | | | | | | | | | | | | | fix for IKNINJA-1357 - Cannot create other file types such as css, json from ↵Ananya Sen2012-03-16
| | | | | |_|_|_|_|_|_|_|/ / / / / | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the New file dialog box. Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
| | | | | | | | | | * | | | | | | Added material library data to the canvas data.hwc4872012-03-21
| | | | | | | | | | | | | | | | |
| | | | | | | | | | * | | | | | | Clear RDGE when an element is deleted and before registering the context.hwc4872012-03-21
| | | | | | | | | | | | | | | | |
| | | | | | | | | | * | | | | | | Runtime canvas & WebGL fixes.hwc4872012-03-20
| | | | | | | | | | | | | | | | |
| | | | | | | | | | * | | | | | | Bug Fixes for Canvas & WebGL File IOhwc4872012-03-20
| | | | | | | | | | | | | | | | |
| | | | | | | | | | * | | | | | | removing dead codehwc4872012-03-16
| | | | | | | | | | | | | | | | |
| | | | | | | | | | * | | | | | | Supporting new and old GL data formats.hwc4872012-03-16
| | | | | | | | | | | | | | | | |
| | | | | | | | | | * | | | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵hwc4872012-03-16
| | | | | | | | | | |\ \ \ \ \ \ \ | | | | | | | | | | | | |_|_|_|/ / | | | | | | | | | | | |/| | | | | | | | | | | | | | | | | | | | | | integration
| | | | | | | | | | * | | | | | | Conversion to JSON based file IO for canvas2D and WebGL renderinghwc4872012-03-16
| | | | | | | | | | | | | | | | |
| | | | | | | | | | | | * | | | | Check for a authortime animation setting in the draw routine for WebGL.Nivesh Rajbhandari2012-03-23
| | |_|_|_|_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| * | | | | | | | | | | | | | | Respect play/pause WebGL animation when saving files and re-rendering caused ↵Nivesh Rajbhandari2012-03-23
|/ / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | by geometry changes. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* | | | | | | | | | | | | | | Merge pull request #134 from mqg734/WebGL-Animation-CheckBoxValerio Virgillito2012-03-22
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adding enabled/disabled support for PI"s checkbox controls, and using that capability for WebGL animate checkbox.
| * | | | | | | | | | | | | | | Adding enabled/disabled support for PI's checkbox control.Nivesh Rajbhandari2012-03-22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* | | | | | | | | | | | | | | | Merge pull request #133 from mqg734/WebGL-Animation-CheckBoxValerio Virgillito2012-03-22
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Web gl animation check box
| * | | | | | | | | | | | | | | Start WebGL animation during live preview. And set WebGL animation back to ↵Nivesh Rajbhandari2012-03-22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | user preference when closing live preview. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| * | | | | | | | | | | | | | | Adding checkbox in PI to start/stop WebGL animation preview.Nivesh Rajbhandari2012-03-22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* | | | | | | | | | | | | | | | Merge branch 'montage-integration' of ↵Valerio Virgillito2012-03-22
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | github.com:Motorola-Mobility/ninja-internal into montage-integration
| * | | | | | | | | | | | | | | Merge branch 'montage-integration' of ↵Valerio Virgillito2012-03-22
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | github.com:Motorola-Mobility/ninja-internal into montage-integration
* | | | | | | | | | | | | | | | Merge branch 'montage-integration' of ↵Valerio Virgillito2012-03-22
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / |/| / / / / / / / / / / / / / / | |/ / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | github.com:Motorola-Mobility/ninja-internal into montage-integration Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | | | | | | | | | | | | | fixing the shape properties border bindings.Valerio Virgillito2012-03-22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* | | | | | | | | | | | | | | fixing the shape properties border bindings.Valerio Virgillito2012-03-22
|/ / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* | | | | | | | | | | | | | Squashed commit of the following GL integrationValerio Virgillito2012-03-22
| | | | | | | | | | | | | |