| Commit message (Collapse) | Author | Age | |
|---|---|---|---|
| * | Added all materials back in | hwc487 | 2012-02-22 |
| | | |||
| * | Adding all the shaders 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 | ||
| | * | Updated linear and radial gradient materials import/export routines. | 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 |
| |\ \ | |||
| | * | | Fixed bad merge in FlatMaterials. | Nivesh Rajbhandari | 2012-02-09 |
| | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| | * | | Merge branch 'refs/heads/ninja-internal' into SnapManagerFixes | Nivesh Rajbhandari | 2012-02-09 |
| | |\ \ | | |/ | |/| | | | | | | | | | | | | | Conflicts: js/helper-classes/RDGE/Materials/FlatMaterial.js Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| | * | | Fixed several typos in Materials import/export code to support toggling ↵ | Nivesh Rajbhandari | 2012-02-08 |
| | | | | | | | | | | | | | | | | | | | between 2d and 3d shape modes. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| * | | | Merge branch 'refs/heads/NinjaInternal' into FileIO | Jose Antonio Marquez | 2012-02-09 |
| |\ \ \ | | |/ | |/| | |||
| | * | | Removed a console log and set the Plasma material to animating. | hwc487 | 2012-02-01 |
| | | | | |||
| | * | | changes to allow minimal rendering ofnon-animated materials. | hwc487 | 2012-02-01 |
| | | | | |||
| | * | | Renderer startup handling of non-animated materials. | hwc487 | 2012-01-30 |
| | | | | | | | | | | | | | Changed zoom from the document bar to keep the location center of the viewable portion of the document fixed. | ||
| | * | | 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> | |||