| Commit message (Collapse) | Author | Age | ||
|---|---|---|---|---|
| ... | ||||
| | * | | | | | | | | | | Merge branch 'ToolFixes' of https://github.com/mqg734/ninja-internal into ↵ | Valerio Virgillito | 2012-02-28 | |
| | |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | / | | | |_|_|_|_|_|_|/ | | |/| | | | | | | | integration-candidate | |||
| | | * | | | | | | | | Merge branch 'refs/heads/ninja-internal' into ToolFixes | Nivesh Rajbhandari | 2012-02-28 | |
| | | |\ \ \ \ \ \ \ \ | | | | |/ / / / / / | | | |/| | | | | | | ||||
| | | * | | | | | | | | Fix for "jumping" issue when using the selection tool repeatedly. | Nivesh Rajbhandari | 2012-02-28 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | |||
| | * | | | | | | | | | Merge pull request #78 from imix23ways/Timeline | Valerio Virgillito | 2012-02-28 | |
| | |\ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ / | | |/| | | | | | | | Timeline bug fixes | |||
| | | * | | | | | | | | Merge branch 'refs/heads/NINJAmaster' into Timeline | Jonathan Duran | 2012-02-28 | |
| | | |\ \ \ \ \ \ \ \ | | | | |/ / / / / / | | | |/| | | | | / | | | |_|_|_|_|_|/ | | |/| | | | | | | ||||
| | | * | | | | | | | Timeline : Deleting Layer deletes the element, Deleting Layer selects ↵ | Jonathan Duran | 2012-02-28 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | another layer Signed-off-by: Kruti Shah <kruti.shah@motorola.com> Signed-off-by: Jonathan Duran <jduran@motorola.com> | |||
| | | * | | | | | | | Fix element selection on open doc | Jonathan Duran | 2012-02-28 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com> | |||
| | | * | | | | | | | Timeline: Basic document switching. | Jon Reid | 2012-02-28 | |
| | | | | | | | | | | ||||
| | | * | | | | | | | Fix to animation names to support multiclassed elements | Jonathan Duran | 2012-02-28 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com> | |||
| | | * | | | | | | | remove comment | Jonathan Duran | 2012-02-28 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com> | |||
| | | * | | | | | | | todo note | Jonathan Duran | 2012-02-28 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com> | |||
| | | * | | | | | | | Fix re-reopened animation duration and milliseconds | Jonathan Duran | 2012-02-28 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com> | |||
| | | * | | | | | | | Timeline: Successfully unbind event listeners in tweens when clearing timeline. | Jon Reid | 2012-02-27 | |
| | | | | | | | | | | ||||
| | | * | | | | | | | Timeline: try to clean up bogus events manually. | Jon Reid | 2012-02-27 | |
| | | | | | | | | | | ||||
| | | * | | | | | | | Merge remote-tracking branch 'ninja-jduran/Timeline' into Timeline-local | Jon Reid | 2012-02-27 | |
| | | |\ \ \ \ \ \ \ | ||||
| | | * | | | | | | | | Timeline: More work on clear timeline method. | Jon Reid | 2012-02-27 | |
| | | | | | | | | | | | ||||
| | | * | | | | | | | | Merge remote-tracking branch 'ninja-jduran/Timeline' into Timeline-local | Jon Reid | 2012-02-27 | |
| | | |\ \ \ \ \ \ \ \ | ||||
| | | * | | | | | | | | | Timeline: further work on clearTimeline method. | Jon Reid | 2012-02-27 | |
| | | | | | | | | | | | | ||||
| | * | | | | | | | | | | Merge branch 'FileIO-Build-Candidate' of ↵ | Valerio Virgillito | 2012-02-28 | |
| | |\ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ / / | | |/| | | | | | | | | | | | | | | | | | | | https://github.com/joseeight/ninja-internal into integration-candidate | |||
| | | * | | | | | | | | | Updating legal copy | Jose Antonio Marquez | 2012-02-27 | |
| | | | | | | | | | | | | ||||
| | | * | | | | | | | | | Merge branch 'refs/heads/FileIO-jose' into FileIO | Ananya Sen | 2012-02-27 | |
| | | |\ \ \ \ \ \ \ \ \ | ||||
| | | | * | | | | | | | | | Cleaning up pretty functions in IO | Jose Antonio Marquez | 2012-02-27 | |
| | | | | | | | | | | | | | ||||
| | | | * | | | | | | | | | Cleaning up and adding TODOs | Jose Antonio Marquez | 2012-02-26 | |
| | | | | | | | | | | | | | ||||
| | | * | | | | | | | | | | - save show3DGrid flag per document while switching documents | Ananya Sen | 2012-02-27 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - fix zoom tool keyboard control to listen to Z when ctrl and shift keys are not pressed with it Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com> | |||
| | * | | | | | | | | | | | Merge branch 'integration' of https://github.com/ericmueller/ninja-internal ↵ | Valerio Virgillito | 2012-02-28 | |
| | |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into integration-candidate | |||
| | | * \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵ | hwc487 | 2012-02-28 | |
| | | |\ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|/ / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | integration | |||
| | | * | | | | | | | | | | | Enable shift key constraint for Pan Tool. | hwc487 | 2012-02-27 | |
| | | | | | | | | | | | | | | ||||
| | | * | | | | | | | | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵ | hwc487 | 2012-02-27 | |
| | | |\ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|/ / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | integration | |||
| | | * | | | | | | | | | | | Color fix for line shapes. | hwc487 | 2012-02-27 | |
| | | | | | | | | | | | | | | ||||
| | | * | | | | | | | | | | | Changed the hardcoded publish setting for a PI fix. | hwc487 | 2012-02-27 | |
| | | | | | | | | | | | | | | ||||
| | | * | | | | | | | | | | | Fixed various rendering bugs. | hwc487 | 2012-02-27 | |
| | | | | | | | | | | | | | | ||||
| | | * | | | | | | | | | | | bug fixes for canvas 2d shape drawing. | hwc487 | 2012-02-23 | |
| | | | | | | | | | | | | | | ||||
| | * | | | | | | | | | | | | Merge branch 'ToolFixes' of https://github.com/mqg734/ninja-internal into ↵ | Valerio Virgillito | 2012-02-28 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / / | |/| | | | | | | | / / / | | | |_|_|_|_|_|_|/ / / | | |/| | | | | | | | | | integration-candidate | |||
| | | * | | | | | | | | | | Fixing tooltips and keyboard shortcuts for 3d tools. | Nivesh Rajbhandari | 2012-02-27 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | IKNinja-1014 and IKNinja-1015. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | |||
| | | * | | | | | | | | | | Reset translation values as well when double-clicking to reset the rotation ↵ | Nivesh Rajbhandari | 2012-02-27 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | values. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | |||
| | * | | | | | ||||