Commit message (Expand) | Author | Age | |
---|---|---|---|
* | Merge pull request #181 from imix23ways/TimelineUber | Valerio Virgillito | 2012-04-27 |
|\ | |||
| * | Refix brush tool elementAdded event | Jonathan Duran | 2012-04-27 |
| * | Merge branch 'refs/heads/NINJAmaster' into TimelineUber | Jonathan Duran | 2012-04-27 |
| |\ | |/ |/| | |||
* | | Merge pull request #176 from pushkarjoshi/brushtool | Valerio Virgillito | 2012-04-27 |
|\ \ | |||
| * | | track the dragging plane based on the hit record so that the file IO works ag... | Pushkar Joshi | 2012-04-26 |
| * | | Merge branch 'master' into brushtool | Pushkar Joshi | 2012-04-25 |
| |\ \ | |||
| * | | | render the calligraphic brush stroke in realtime on a rotated canvas | Pushkar Joshi | 2012-04-25 |
| * | | | allow the realtime drawing of brush strokes drawn off the standard XY plane b... | Pushkar Joshi | 2012-04-24 |
* | | | | Merge pull request #178 from mqg734/PerspectiveFix | Valerio Virgillito | 2012-04-26 |
|\ \ \ \ | |||
| * | | | | We don't currently support perspective values on individual elements, so remo... | Nivesh Rajbhandari | 2012-04-26 |
* | | | | | 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 |
| | | | | * | Revert "Fix Brush tool not broadcasting elementAdded event" | Jonathan Duran | 2012-04-27 |
| | | | | * | Fix WEbGL not rendering on stage with timeline | Jonathan Duran | 2012-04-26 |
| | | | | * | 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 |
|/| | | | | | | |||
| * | | | | | | 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 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | |||
| * | | | | | | | | | | | | | | | | | | | 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 |
| * | | | | | | | | | | | | | | | | | | | IKNinja-406 - Strange behavior when changing the corner radius to the maximum... | Nivesh Rajbhandari | 2012-04-25 |
| * | | | | | | | | | | | | | | | | | | | Changing canvas-2d gradient drawing to more closely match div's background-im... | Nivesh Rajbhandari | 2012-04-25 |
| * | | | | | | | | | | | | | | | | | | | 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 |
| | |_|_|_|_|_|_|_|_|_|_|/ / / / / / / | |/| | | | | | | | | | | | | | | | | | |||
| | | | | | | | | | | | | | | | | | * | Merge branch 'refs/heads/timeline-local' into TimelineUber | Jonathan Duran | 2012-04-26 |
| | | | | | | | | | | | | | | | | | |\ | |||
| | | | | | | | | | | | | | | | | | * \ | Merge branch 'refs/heads/NINJAmaster' into TimelineUber | Jonathan Duran | 2012-04-26 |
| | | | | | | | | | | | | | | | | | |\ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | |||
* | | | | | | | | | | | | | | | | | | | | Merge pull request #175 from mqg734/BoundsCalculation | Valerio Virgillito | 2012-04-25 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | |||
| * | | | | | | | | | | | | | | | | | | | Fixed issue with setting stroke when using the PI. | Nivesh Rajbhandari | 2012-04-24 |
| * | | | | | | | | | | | | | | | | | | | Merge branch 'refs/heads/ninja-internal' into AllFixes | Nivesh Rajbhandari | 2012-04-24 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / | | |/| | | | | | | | | | | | | | | | | | |||
| * | | | | | | | | | | | | | | | | | | | Allow users to toggle application of stroke and border settings when using th... | Nivesh Rajbhandari | 2012-04-24 |
| * | | | | | | | | | | | | | | | | | | | Fixing translate handles to draw without zoom value. Also fixed some typos i... | Nivesh Rajbhandari | 2012-04-20 |