aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAge
...
| | * | | | | | | | | | | | | | | | 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
* | | | | | | | | | | | | | | | | | Merge pull request #84 from mqg734/SnapManagerFixesValerio Virgillito2012-02-29
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | / | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | SnapManager fixes for sag tags.Nivesh Rajbhandari2012-02-29
|/ / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | Merge branch 'refs/heads/integration-candidate'Valerio Virgillito2012-02-28
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / / / / / |/| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Fix for double clicking in the resizerValerio Virgillito2012-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 : 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
| |\| | | | | | | | | | | | |
| | * | | | | | | | | | | | | Merge branch 'local-storage-version' of https://github.com/mencio/ninja-inter...Valerio Virgillito2012-02-27
| | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | removing the old settings class and disabling panel settings until the new pa...Valerio Virgillito2012-02-24
| | | * | | | | | | | | | | | | clearing the old local setting and using the new version/prefix local settings.Valerio Virgillito2012-02-24
| | | * | | | | | | | | | | | | prefixing the local storage and using the new local-storage object.Valerio Virgillito2012-02-24
| | | * | | | | | | | | | | | | fixing the right panel disappearing when collapsed and re-enabledValerio Virgillito2012-02-24
| | | * | | | | | | | | | | | | Merge branch 'refs/heads/master' into local-storage-versionValerio Virgillito2012-02-24
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |_|_|_|_|_|_|_|/ / / / | | | | |/| | | | | | | | | | |
| | | * | | | | | | | | | | | | Merge branch 'refs/heads/master' into local-storage-versionValerio Virgillito2012-02-23
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |_|_|_|_|_|_|_|/ / / / | | | | |/| | | | | | | | | | |
| | | * | | | | | | | | | | | | local storage integration and versioningValerio Virgillito2012-02-22
| | * | | | | | | | | | | | | | Merge branch 'FileIO-Build-Candidate' of https://github.com/joseeight/ninja-i...Valerio Virgillito2012-02-27
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|/ / / / / / / / / / | | |/| | | | | | / / / / / / / | | | | |_|_|_|_|/ / / / / / / | | | |/| | | | | | | | | | |
| | | * | | | | | | | | | | | Merge pull request #20 from joseeight/FileIOJose Antonio Marquez Russo2012-02-26
| | | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | |_|_|_|_|/ / / / / / | | | | |/| | | | | | | | | |
| | | | * | | | | | | | | | | Cleaning up formatting for webGL dataJose Antonio Marquez2012-02-26
| | | | * | | | | | | | | | | Fixed issue with losing track of Ninja template cssJose Antonio Marquez2012-02-26
| | | | * | | | | | | | | | | Cleaning up comments for external styles loadingJose Antonio Marquez2012-02-25
| | | | * | | | | | | | | | | Cleaning up ninja-data attributesJose Antonio Marquez2012-02-25
| | | | * | | | | | | | | | | Adding prettify code to I/OJose Antonio Marquez2012-02-24
| | | |/ / / / / / / / / / /
| | | * | | | | | | | | | | Merge pull request #19 from ananyasen/FileIOJose Antonio Marquez Russo2012-02-24
| | | |\ \ \ \ \ \ \ \ \ \ \ | | | | | |_|_|_|_|/ / / / / | | | | |/| | | | | | | | |
| |