| Commit message (Collapse) | Author | Age | |
|---|---|---|---|
| * | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵ | hwc487 | 2012-04-19 |
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Textures Conflicts: js/lib/drawing/world.js js/lib/geom/geom-obj.js js/lib/rdge/materials/cloud-material.js js/lib/rdge/materials/deform-material.js js/lib/rdge/materials/flat-material.js js/lib/rdge/materials/material.js js/lib/rdge/materials/pulse-material.js js/lib/rdge/materials/relief-tunnel-material.js js/lib/rdge/materials/square-tunnel-material.js js/lib/rdge/materials/star-material.js js/lib/rdge/materials/taper-material.js js/lib/rdge/materials/tunnel-material.js js/lib/rdge/materials/twist-material.js js/lib/rdge/materials/twist-vert-material.js js/lib/rdge/materials/uber-material.js js/lib/rdge/materials/water-material.js js/lib/rdge/materials/z-invert-material.js | ||
| | * | Squashed commit of the following GL integration | Valerio Virgillito | 2012-03-22 |
| | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| * | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵ | hwc487 | 2012-04-18 |
| | | | | | | | | | | | | | | | | | | | | | Snapping_II Conflicts: js/tools/Rotate3DToolBase.js js/tools/RotateStage3DTool.js js/tools/Translate3DToolBase.js js/tools/modifier-tool-base.js | ||
| * | | Cloud material | hwc487 | 2012-04-17 |
| | | | |||
| * | | Cloud material | hwc487 | 2012-04-16 |
| | | | |||
| * | | Cloud Material | hwc487 | 2012-04-15 |
| | | | |||
| * | | Cloud Material | hwc487 | 2012-04-13 |
| | | | |||
| * | | Cloud material | hwc487 | 2012-04-11 |
| | | | |||
| * | | Cloud material | hwc487 | 2012-04-10 |
| | | | |||
| * | | added copyright info to flag frag shader | hwc487 | 2012-04-04 |
| | | | |||
| * | | Added Flag material | hwc487 | 2012-04-04 |
| | | | |||
| * | | started the flag material | hwc487 | 2012-04-03 |
| | | | |||
| * | | Added Paris and Raiders materials | hwc487 | 2012-03-22 |
| |/ | |||
| * | Fixed a few problems with Plasma material. | hwc487 | 2012-03-07 |
| | | |||
| * | Added all materials back in | hwc487 | 2012-02-22 |
| | | |||
| * | 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> | ||
| | * | Removed unused materials. | Nivesh Rajbhandari | 2012-02-09 |
| | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| * | | 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 |
| | | | | |||
| | * | | updated from old repo | hwc487 | 2012-01-27 |
| | |/ | |||
| * / | 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> | |||