aboutsummaryrefslogtreecommitdiff
path: root/assets
Commit message (Collapse)AuthorAge
* Integrating canvas-2d and WebGL drawing fixes. Also adding back WebGL materials.Nivesh Rajbhandari2012-02-22
| | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* Revert "Integrating canvas-2d drawing and WebGL fixes, including adding back ↵Nivesh Rajbhandari2012-02-22
| | | | | | WebGL materials." This reverts commit 96a0a8c916533eb5625816192ed38488f639326d.
* Integrating canvas-2d drawing and WebGL fixes, including adding back WebGL ↵Nivesh Rajbhandari2012-02-22
| | | | | | materials. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* Adding new RDGE library dataJose Antonio Marquez2012-02-16
|
* Setting up webGL local library (assets)Jose Antonio Marquez2012-02-15
|
* Merge branch 'refs/heads/NinjaInternal' into FileIOJose Antonio Marquez2012-02-11
|\ | | | | | | | | Conflicts: js/ninja.reel/ninja.html
| * Undoing experimental changes from the basic webgl shaders.Nivesh Rajbhandari2012-02-09
| | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| * Removing image assets that were being used by deleted WebGL materials.Nivesh Rajbhandari2012-02-09
| | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| * Removed unused materials.Nivesh Rajbhandari2012-02-09
| | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| * Removed unused images and reduced the size of the larger image files used ↵John Mayhew2012-02-01
| | | | | | | | for shaders.
* | Merge branch 'refs/heads/NinjaInternal' into FileIOJose Antonio Marquez2012-02-09
|\ \
| * | removing shadersPushkar Joshi2012-02-09
| | |
| * | changes to allow minimal rendering ofnon-animated materials.hwc4872012-02-01
| | |
| * | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵hwc4872012-01-31
| |\ \ | | | | | | | | | | | | working
| * \ \ Merge branch 'staging' of github.com:Motorola-Mobility/ninja-internal into ↵hwc4872012-01-30
| |\ \ \ | | | |/ | | |/| | | | | working
| * | | updated from old repohwc4872012-01-27
| | | |
* | | | Merge branch 'refs/heads/NinjaInternal' into FileIOJose Antonio Marquez2012-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 Mayhew2012-01-30
| | |/ | |/| | | | | | | for shaders.
| * | Removing unused file from assets/images. This file should not have been ↵John Mayhew2012-01-30
| |/ | | | | | | committed initially.
* / Merged old FileIOJose Antonio Marquez2012-01-27
|/
* First commit of Ninja to ninja-internalPierre Frisch2012-01-27
Signed-off-by: Valerio Virgillito <rmwh84@motorola.com>