Commit message (Collapse) | Author | Age | |
---|---|---|---|
* | Merge branch 'master' into pentool | Pushkar Joshi | 2012-02-08 |
|\ | | | | | | | | | | | Conflicts: js/helper-classes/RDGE/GLWorld.js js/helper-classes/RDGE/MaterialsLibrary.js | ||
| * | Merge pull request #21 from mencio/pi_bugs | Valerio Virgillito | 2012-02-08 |
| |\ | | | | | | | Pi bugs fixes for 964, 616, 1084 | ||
| | * | IKNINJA - 1084: Fixing the custom tag. | Valerio Virgillito | 2012-02-07 |
| | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| * | | Added ability to toggle combobox's visibility so we can show/hide materials ↵ | Nivesh Rajbhandari | 2012-02-07 |
| | | | | | | | | | | | | | | | | | | comboboxes in the tool options. 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> | ||
* | | Merge branch 'master' into pentool | Pushkar Joshi | 2012-02-07 |
|\| | |||
| * | 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> | ||
* | | missed a couple of pen tool property files on last checkin | Pushkar Joshi | 2012-01-30 |
|/ | |||
* | First commit of Ninja to ninja-internal | Pierre Frisch | 2012-01-27 |
Signed-off-by: Valerio Virgillito <rmwh84@motorola.com> |