Commit message (Collapse) | Author | Age | ||
---|---|---|---|---|
... | ||||
* | Merge branch 'refs/heads/NinjaInternal' into FileIO | Jose Antonio Marquez | 2012-02-08 | |
|\ | ||||
| * | Updated tools and PI to get/set materials by binding to appModel's materials ↵ | Nivesh Rajbhandari | 2012-02-07 | |
| | | | | | | | | | | | | property. This requires us to add FlatMaterial to the list of materials in the MaterialsLibrary. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | |||
| * | Support use WebGL checkbox in the PI. | Nivesh Rajbhandari | 2012-02-06 | |
| | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | |||
* | | Merge branch 'refs/heads/NinjaInternal' into FileIO | Jose Antonio Marquez | 2012-02-06 | |
|\| | ||||
| * | Merge branch 'refs/heads/NiveshColor' into ToolFixes | Nivesh Rajbhandari | 2012-02-03 | |
| |\ | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | |||
| | * | Updated color code in the PI to go through element mediator. | Nivesh Rajbhandari | 2012-02-01 | |
| | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | |||
| | * | Updated color code to handle shapes. | Nivesh Rajbhandari | 2012-01-31 | |
| | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | |||
* | | | Merge branch 'refs/heads/NinjaInternal' into FileIO | Jose Antonio Marquez | 2012-02-02 | |
|\| | | | | | | | | | | | | | | | | | Conflicts: .gitignore js/ninja.reel/ninja.js | |||
| * | | Fixed issue with elements not drawing in the correct plane. | Nivesh Rajbhandari | 2012-01-30 | |
| | | | | | | | | | | | | | | | | | | When first adding an element, force the 3d model to update with the element's webkit transform values. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | |||
| * | | Syncing stage view when rotating stage. | Nivesh Rajbhandari | 2012-01-30 | |
| |/ | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | |||
* / | 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> |