aboutsummaryrefslogtreecommitdiff
path: root/assets/shaders
Commit message (Collapse)AuthorAge
* 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
* Cloud materialhwc4872012-04-17
|
* Cloud materialhwc4872012-04-16
|
* Cloud Materialhwc4872012-04-15
|
* Cloud Materialhwc4872012-04-13
|
* Cloud materialhwc4872012-04-11
|
* Cloud materialhwc4872012-04-10
|
* added copyright info to flag frag shaderhwc4872012-04-04
|
* Added Flag materialhwc4872012-04-04
|
* started the flag materialhwc4872012-04-03
|
* Added Paris and Raiders materialshwc4872012-03-22
|
* Fixed a few problems with Plasma material.hwc4872012-03-07
|
* Added all materials back inhwc4872012-02-22
|
* 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>
| * Removed unused materials.Nivesh Rajbhandari2012-02-09
| | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* | 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
| | |
| * | updated from old repohwc4872012-01-27
| |/
* / 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>