| Commit message (Collapse) | Author | Age | ||
|---|---|---|---|---|
| ... | ||||
| * | | | | | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal | Valerio Virgillito | 2012-04-26 | |
| |\ \ \ \ \ \ \ \ | | |_|_|_|_|/ / | |/| | | | | | | ||||
| * | | | | | | | | Fixing the eye dropper shortcut. | Valerio Virgillito | 2012-04-26 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | |||
| | | | | | * | | | Revert "Fix Brush tool not broadcasting elementAdded event" | Jonathan Duran | 2012-04-27 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 12fadd1494a9b5fcdaa17fde2f4847277237cf79. Signed-off-by: Jonathan Duran <jduran@motorola.com> | |||
| | | | | | * | | | Fix WEbGL not rendering on stage with timeline | Jonathan Duran | 2012-04-26 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com> | |||
| | | | | | * | | | Timeline: Deleting elements now deletes associated layers. | Jon Reid | 2012-04-26 | |
| | | | | | | | | | ||||
| | | | | | * | | | Timeline: comment out a conditional debugger; re-enable layer name storage. | Jon Reid | 2012-04-26 | |
| | | | | | | | | | ||||
| | | | | | * | | | Merge remote-tracking branch 'ninja-jduran/TimelineUber' into timeline-local | Jon Reid | 2012-04-26 | |
| | | | | | |\ \ \ | ||||
| | | | | | | * \ \ | Merge branch 'refs/heads/NINJAmaster' into TimelineUber | Jonathan Duran | 2012-04-26 | |
| | | | | | | |\ \ \ | | |_|_|_|_|/ / / | |/| | | | | | | | ||||
| | * | | | | | | | | Merge pull request #179 from joseeight/FileIO | Valerio Virgillito | 2012-04-26 | |
| |/| | | | | | | | | | | | | | | | | | | | | | | | | | | Fixing duplicate layer bug | |||
| | * | | | | | | | | Merge branch 'refs/heads/Ninja-Internal' into FileIO | Jose Antonio Marquez | 2012-04-26 | |
| | |\| | | | | | | | ||||
| | * | | | | | | | | Fixing duplicate layer error | Jose Antonio Marquez | 2012-04-26 | |
| | | | | | | | | | | ||||
| | * | | | | | | | | Fixing duplicate layer bug | Jose Antonio Marquez | 2012-04-26 | |
| | | | | | | | | | | ||||
| | * | | | | | | | | Merge branch 'refs/heads/Ninja-Internal' into FileIO | Jose Antonio Marquez | 2012-04-24 | |
| | |\ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / | | |/| | | | | | | ||||
| | * | | | | | | | | Merge branch 'refs/heads/Ninja-Internal' into FileIO | Jose Antonio Marquez | 2012-04-20 | |
| | |\ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ | | |/| | | | | | | ||||
| | * | | | | | | | | Merge branch 'refs/heads/Ninja-Internal' into FileIO | Jose Antonio Marquez | 2012-04-20 | |
| | |\ \ \ \ \ \ \ \ | ||||
| | * \ \ \ \ \ \ \ \ | Merge branch 'refs/heads/Ninja-Internal' into FileIO | Jose Antonio Marquez | 2012-04-16 | |
| | |\ \ \ \ \ \ \ \ \ | ||||
| | * \ \ \ \ \ \ \ \ \ | Merge branch 'refs/heads/Ninja-Internal' into FileIO | Jose Antonio Marquez | 2012-04-11 | |
| | |\ \ \ \ \ \ \ \ \ \ | ||||
| | * \ \ \ \ \ \ \ \ \ \ | Merge branch 'refs/heads/Ninja-Internal' into FileIO | Jose Antonio Marquez | 2012-04-10 | |
| | |\ \ \ \ \ \ \ \ \ \ \ | ||||
| | * \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'refs/heads/Ninja-Internal' into FileIO | Jose Antonio Marquez | 2012-04-04 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ | ||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'refs/heads/Ninja-Internal' into FileIO | Jose Antonio Marquez | 2012-04-04 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'refs/heads/Ninja-Internal' into FileIO | Jose Antonio Marquez | 2012-04-02 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'refs/heads/Ninja-Internal' into FileIO | Jose Antonio Marquez | 2012-03-28 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'refs/heads/Ninja-Internal' into FileIO | Jose Antonio Marquez | 2012-03-27 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'refs/heads/Ninja-Internal' into FileIO | Jose Antonio Marquez | 2012-03-26 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||
| | * | | | | | | | | | | | | | | | | | | Adding Ninja URL method to io-mediator | Jose Antonio Marquez | 2012-03-22 | |
| | | | | | | | | | | | | | | | | | | | | ||||
| | * | | | | | | | | | | | | | | | | | | Merge branch 'refs/heads/Ninja-Internal' into FileIO | Jose Antonio Marquez | 2012-03-21 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||
| * | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge pull request #177 from mqg734/WebGLMaterials | Valerio Virgillito | 2012-04-26 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | Fixed some rectangle radius bugs in canvas 2d mode. Also changed canvas 2d gradients to match what the browser renders for a div's background. | |||
| | * | | | | | | | | | | | | | | | | | | | Merge branch 'refs/heads/ninja-internal' into WebGLMaterials | Nivesh Rajbhandari | 2012-04-25 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | ||||
| | * | | | | | | | | | | | | | | | | | | | Updating the canvas runtime files for gradient and rectangle radius fixes. | Nivesh Rajbhandari | 2012-04-25 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | |||
| | * | | | | | | | | | | | | | | | | | | | IKNinja-406 - Strange behavior when changing the corner radius to the ↵ | Nivesh Rajbhandari | 2012-04-25 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | maximum value. IKNinja-1236 - Corner radius is not applied if stroke size is >= 2 times the corner radius. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | |||
| | * | | | | | | | | | | | | | | | | | | | Changing canvas-2d gradient drawing to more closely match div's ↵ | Nivesh Rajbhandari | 2012-04-25 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | background-image gradient support. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | |||
| | * | | | | | | | | | | | | | | | | | | | Merge branch 'refs/heads/ninja-internal' into WebGLMaterials | Nivesh Rajbhandari | 2012-04-25 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / | | |/| | | | | | | | | | | | | | | | | | ||||
| | * | | | | | | | | | | | | | | | | | | | Fixed materials editor popup not refreshing correctly. | Nivesh Rajbhandari | 2012-04-16 | |
| | | |_|_|_|_|_|_|_|_|_|_|/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | ||||