| Commit message (Collapse) | Author | Age | |
|---|---|---|---|
| * | Merge branch 'refs/heads/FileIO-jose' into FileIO | Ananya Sen | 2012-02-23 |
| |\ | | | | | | | | | | | | | | | Conflicts: js/document/html-document.js js/helper-classes/3D/snap-manager.js Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com> | ||
| | * | Merge branch 'refs/heads/ninja-internal' into WebGLMaterials | Nivesh Rajbhandari | 2012-02-22 |
| | |\ | |||
| | * \ | Merge branch 'refs/heads/ninja-internal' into ToolFixes | Nivesh Rajbhandari | 2012-02-20 |
| | |\ \ | |||
| | * | | | Updated ink bottle tool to use new setColor routine in the mediator and ↵ | Nivesh Rajbhandari | 2012-02-13 |
| | | | | | | | | | | | | | | | | | | | | | | | | | controllers. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| * | | | | switch html document - re-initialize draw-utils and snap-manager on opening ↵ | Ananya Sen | 2012-02-23 |
| | |_|/ |/| | | | | | | | | | | | | | | a document and while switching documents Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com> | ||
| * | | | enabling nested selection | Valerio Virgillito | 2012-02-20 |
| | |/ |/| | | | | | Signed-off-by: Valerio Virgillito <valerio@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> | ||
| | | * | 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> | ||
| | | * | 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 | ||
| | * | | Fixing 3d section of the PI. | Nivesh Rajbhandari | 2012-01-31 |
| | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| | * | | 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> | ||
| * / | 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> | |||