Commit message (Collapse) | Author | Age | |
---|---|---|---|
* | Merge branch 'refs/heads/NinjaInternal' into FileIO | Jose Antonio Marquez | 2012-02-11 |
|\ | | | | | | | | | Conflicts: js/ninja.reel/ninja.html | ||
| * | 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 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-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> |