Commit message (Collapse) | Author | Age | |
---|---|---|---|
* | Squashed commit of the following: | Jonathan Duran | 2012-03-14 |
| | | | | | | merge master into timeline Signed-off-by: Jonathan Duran <jduran@motorola.com> | ||
* | GL save and reload. | hwc487 | 2012-02-22 |
| | |||
* | Adding bug fixes. | hwc487 | 2012-02-22 |
| | |||
* | Merge branch 'refs/heads/NinjaInternal' into FileIO | Jose Antonio Marquez | 2012-02-11 |
|\ | | | | | | | | | Conflicts: js/ninja.reel/ninja.html | ||
| * | Merging WebGL changes that allow users to modify different shape instances. ↵ | Nivesh Rajbhandari | 2012-02-09 |
| | | | | | | | | | | | | Also, merging in changes that improve rendering performance by not updating static materials. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
* | | Merge branch 'refs/heads/NinjaInternal' into FileIO | Jose Antonio Marquez | 2012-02-09 |
|\ \ | |||
| * | | changes to allow minimal rendering ofnon-animated materials. | hwc487 | 2012-02-01 |
| | | | |||
| * | | updated from old repo | hwc487 | 2012-01-27 |
| |/ | |||
* / | Merged old FileIO | Jose Antonio Marquez | 2012-01-27 |
|/ | |||
* | First commit of Ninja to ninja-internal | Pierre Frisch | 2012-01-27 |
Signed-off-by: Valerio Virgillito <rmwh84@motorola.com> |