aboutsummaryrefslogtreecommitdiff
path: root/assets/images
Commit message (Collapse)AuthorAge
* Renamed Raiders material to Dark Blur, and Paris to Blue Sky.hwc4872012-07-19
|
* Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵hwc4872012-04-18
| | | | | | | | | | Snapping_II Conflicts: js/tools/Rotate3DToolBase.js js/tools/RotateStage3DTool.js js/tools/Translate3DToolBase.js js/tools/modifier-tool-base.js
* Re-added taper and twist-vert materials.hwc4872012-04-05
|
* started the flag materialhwc4872012-04-03
|
* Added Paris and Raiders materialshwc4872012-03-22
|
* Merge branch 'refs/heads/NinjaInternal' into FileIOJose Antonio Marquez2012-02-11
|\ | | | | | | | | Conflicts: js/ninja.reel/ninja.html
| * 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 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-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>