Commit message (Collapse) | Author | Age | |
---|---|---|---|
* | Added all materials back in | hwc487 | 2012-02-22 |
| | |||
* | Adding new RDGE library data | Jose Antonio Marquez | 2012-02-16 |
| | |||
* | Setting up webGL local library (assets) | Jose Antonio Marquez | 2012-02-15 |
| | |||
* | Merge branch 'refs/heads/NinjaInternal' into FileIO | Jose Antonio Marquez | 2012-02-11 |
|\ | | | | | | | | | Conflicts: js/ninja.reel/ninja.html | ||
| * | Undoing experimental changes from the basic webgl shaders. | Nivesh Rajbhandari | 2012-02-09 |
| | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| * | Removing image assets that were being used by deleted WebGL materials. | Nivesh Rajbhandari | 2012-02-09 |
| | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| * | Removed unused materials. | Nivesh Rajbhandari | 2012-02-09 |
| | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| * | Removed unused images and reduced the size of the larger image files used ↵ | John Mayhew | 2012-02-01 |
| | | | | | | | | for shaders. | ||
* | | Merge branch 'refs/heads/NinjaInternal' into FileIO | Jose Antonio Marquez | 2012-02-09 |
|\ \ | |||
| * | | removing shaders | Pushkar Joshi | 2012-02-09 |
| | | | |||
| * | | changes to allow minimal rendering ofnon-animated materials. | hwc487 | 2012-02-01 |
| | | | |||
| * | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵ | hwc487 | 2012-01-31 |
| |\ \ | | | | | | | | | | | | | working | ||
| * \ \ | Merge branch 'staging' of github.com:Motorola-Mobility/ninja-internal into ↵ | hwc487 | 2012-01-30 |
| |\ \ \ | | | |/ | | |/| | | | | | working | ||
| * | | | updated from old repo | hwc487 | 2012-01-27 |
| | | | | |||
* | | | | Merge branch 'refs/heads/NinjaInternal' into FileIO | Jose Antonio Marquez | 2012-01-30 |
|\ \ \ \ | | |_|/ | |/| | | | | | | | | | | | | | | Conflicts: _scss/compass_app_log.txt _scss/imports/scss/_Stage.scss | ||
| * | | | Removed unused images and reduced the size of the larger image files used ↵ | John Mayhew | 2012-01-30 |
| | |/ | |/| | | | | | | | for shaders. | ||
| * | | Removing unused file from assets/images. This file should not have been ↵ | John Mayhew | 2012-01-30 |
| |/ | | | | | | | committed initially. | ||
* / | 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> |