Commit message (Collapse) | Author | Age | |
---|---|---|---|
* | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵ | hwc487 | 2012-02-08 |
|\ | | | | | | | working | ||
| * | 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> | ||
| | * | IKNINJA-964 - Fixed inconsistent element name in PI/CSS panel. | Valerio Virgillito | 2012-02-07 |
| | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
* | | | Merge branch 'ToolFixes' of github.com:mqg734/ninja-internal into working | hwc487 | 2012-02-07 |
|\| | | | | | | | | | | | | | | | | | | | | Conflicts: js/helper-classes/RDGE/GLRectangle.js js/helper-classes/RDGE/GLWorld.js js/helper-classes/RDGE/MaterialsLibrary.js | ||
| * | | 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> | ||
* | | | Enhanced the overlap test for the selection tool marquee select. | hwc487 | 2012-02-06 |
|/ / | |||
* / | Support use WebGL checkbox in the PI. | Nivesh Rajbhandari | 2012-02-06 |
|/ | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
* | Update element planes after shapes are created so stage grid updates. | 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> | ||
| * | Removed border special-casing from PI since the mediator now handles this ↵ | Nivesh Rajbhandari | 2012-02-01 |
| | | | | | | | | | | | | generically. Updated mediator's set stroke routine to use the setColor routine. 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> | ||
* | | Integrating Pan and Zoom tool and snap manager fixes. | Nivesh Rajbhandari | 2012-02-02 |
| | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
* | | Forgot to remove a require in previous checkin. | Nivesh Rajbhandari | 2012-01-30 |
| | | | | | | | | 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> | ||
* | First commit of Ninja to ninja-internal | Pierre Frisch | 2012-01-27 |
Signed-off-by: Valerio Virgillito <rmwh84@motorola.com> |