Commit message (Collapse) | Author | Age | |
---|---|---|---|
* | Merge branch 'refs/heads/NinjaInternal' into Color | Jose Antonio Marquez | 2012-02-11 |
|\ | |||
| * | Support export/import of GLLine data. | Nivesh Rajbhandari | 2012-02-10 |
| | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
* | | Merge branch 'refs/heads/NinjaInternal' into Color | Jose Antonio Marquez | 2012-02-08 |
|\| | | | | | | | | | | | | | Conflicts: js/controllers/elements/shapes-controller.js js/data/pi/pi-data.js js/panels/properties/content.reel/content.js | ||
| * | Fixed PI to support WebGL materials. | Nivesh Rajbhandari | 2012-02-07 |
| | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| * | 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> | ||
| * | Add enabled property for ComboBox to support enabling/disabling materials ↵ | Nivesh Rajbhandari | 2012-02-06 |
| | | | | | | | | | | | | dropdowns in the PI. 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> | ||
| * | We were only updating the first custom section in the PI. | Nivesh Rajbhandari | 2012-02-03 |
| | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| * | Merge branch 'refs/heads/NiveshColor' into ToolFixes | Nivesh Rajbhandari | 2012-02-03 |
| |\ | |/ |/| | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| * | Updating Shapes PI to support corner radii. Also fixed PI bug where we were ↵ | Nivesh Rajbhandari | 2012-02-02 |
| | | | | | | | | | | | | always updating custom section 0. 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> | ||
* | First commit of Ninja to ninja-internal | Pierre Frisch | 2012-01-27 |
Signed-off-by: Valerio Virgillito <rmwh84@motorola.com> |