aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAge
...
| | | * | | | | | | | | | | | | | Merge branch 'refs/heads/FileIO' into FileIO-Build-CandidateJose Antonio Marquez2012-02-27
| | | |\| | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | Updating creditsJose Antonio Marquez2012-02-27
| | | | * | | | | | | | | | | | | Merge pull request #21 from ananyasen/FileIOJose Antonio Marquez Russo2012-02-27
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'refs/heads/FileIO-jose' into FileIOAnanya Sen2012-02-27
| | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / / / / / / | | | | |/| | | | | | | | | | | | |
| | | | | * | | | | | | | | | | | | - save show3DGrid flag per document while switching documentsAnanya Sen2012-02-27
| | | * | | | | | | | | | | | | | | Merge branch 'refs/heads/FileIO' into FileIO-Build-CandidateJose Antonio Marquez2012-02-27
| | | |\| | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | Cleaning up pretty functions in IOJose Antonio Marquez2012-02-27
| | | | * | | | | | | | | | | | | | Cleaning up and adding TODOsJose Antonio Marquez2012-02-26
| | * | | | | | | | | | | | | | | | Merge branch 'integration' of https://github.com/ericmueller/ninja-internal i...Valerio Virgillito2012-02-28
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into int...hwc4872012-02-28
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |_|_|_|_|/ / / / / / / / / / | | | | |/| | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into int...hwc4872012-02-28
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |_|_|_|_|_|_|_|/ / / / / / / | | | | |/| | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | Enable shift key constraint for Pan Tool.hwc4872012-02-27
| | | * | | | | | | | | | | | | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into int...hwc4872012-02-27
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |_|_|_|_|_|_|_|_|/ / / / / / | | | | |/| | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | Color fix for line shapes.hwc4872012-02-27
| | | * | | | | | | | | | | | | | | | Changed the hardcoded publish setting for a PI fix.hwc4872012-02-27
| | | * | | | | | | | | | | | | | | | Fixed various rendering bugs.hwc4872012-02-27
| | | * | | | | | | | | | | | | | | | bug fixes for canvas 2d shape drawing.hwc4872012-02-23
| | * | | | | | | | | | | | | | | | | Merge branch 'ToolFixes' of https://github.com/mqg734/ninja-internal into int...Valerio Virgillito2012-02-28
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|/ / / / / / / / / / / / / | | |/| | | | | | | | / / / / / / / / | | | | |_|_|_|_|_|_|/ / / / / / / / | | | |/| | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | Fixing tooltips and keyboard shortcuts for 3d tools.Nivesh Rajbhandari2012-02-27
| | | * | | | | | | | | | | | | | | Reset translation values as well when double-clicking to reset the rotation v...Nivesh Rajbhandari2012-02-27
| * | | | | | | | | | | | | | | | | Squashed commit of the following:Jonathan Duran2012-02-29
| | |_|_|_|_|_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | Timeline: Document switching and code restructuring.Jon Reid2012-03-01
* | | | | | | | | | | | | | | | | Merge remote-tracking branch 'ninja-jduran/Timeline' into Timeline-newdocJon Reid2012-02-29
|\| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Merge branch 'Timeline-b2-latest' of github.com:ntfx47/ninja-internal into Ti...Jonathan Duran2012-02-29
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|/ / / / | | |/| | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | Timeline: Fix Selection , Partially Fix adding element to an already animated...Kruti Shah2012-02-28
| * | | | | | | | | | | | | | | | fix for creatingNewFile flagJonathan Duran2012-02-29
| | |_|_|_|_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | | | | |
* / | | | | | | | | | | | | | | Timeline: document switching + new document.Jon Reid2012-02-29
|/ / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | Merge branch 'refs/heads/NINJAmaster' into TimelineJonathan Duran2012-02-28
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / |/| / / / / / / / / / / / / / | |/ / / / / / / / / / / / /
| * | | | | | | | | | | | | Merge branch 'refs/heads/integration-candidate'Valerio Virgillito2012-02-28
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / / / / | |/| | | | | | | | | | | |
| | * | | | | | | | | | | | Fix for double clicking in the resizerValerio Virgillito2012-02-27
| * | | | | | | | | | | | | adding the template-creator classValerio Virgillito2012-02-27
| | |_|_|/ / / / / / / / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Timeline : Deleting Layer deletes the element, Deleting Layer selects another...Jonathan Duran2012-02-28
* | | | | | | | | | | | | Fix element selection on open docJonathan Duran2012-02-28
* | | | | | | | | | | | | Timeline: Basic document switching.Jon Reid2012-02-28
* | | | | | | | | | | | | Fix to animation names to support multiclassed elementsJonathan Duran2012-02-28
* | | | | | | | | | | | | remove commentJonathan Duran2012-02-28
* | | | | | | | | | | | | todo noteJonathan Duran2012-02-28
* | | | | | | | | | | | | Fix re-reopened animation duration and millisecondsJonathan Duran2012-02-28
* | | | | | | | | | | | | Timeline: Successfully unbind event listeners in tweens when clearing timeline.Jon Reid2012-02-27
* | | | | | | | | | | | | Timeline: try to clean up bogus events manually.Jon Reid2012-02-27
* | | | | | | | | | | | | Merge remote-tracking branch 'ninja-jduran/Timeline' into Timeline-localJon Reid2012-02-27
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / | |/| | | | | | | | | | |
| * | | | | | | | | | | | Merge branch 'refs/heads/integration-candidate' into TimelineJonathan Duran2012-02-27
| |\ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | Reverting the export for publish property since its only used for testing.Valerio Virgillito2012-02-27
* | | | | | | | | | | | | | Timeline: More work on clear timeline method.Jon Reid2012-02-27
* | | | | | | | | | | | | | Merge remote-tracking branch 'ninja-jduran/Timeline' into Timeline-localJon Reid2012-02-27
|\| | | | | | | | | | | | |
| * | | | | | | | | | | | | Timeline : Reopening Doc has layer 1 default fixJonathan Duran2012-02-27
| * | | | | | | | | | | | | Timeline: RetrieveStoredTweens calling fixedJonathan Duran2012-02-27
| * | | | | | | | | | | | | Merge branch 'refs/heads/integration-candidate' into TimelineJonathan Duran2012-02-27
| |\| | | | |</