aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAge
...
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | Timeline: Code cleanup. Fix bug with unfound property in serialization.Jon Reid2012-03-06
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'Timeline-uber' into timeline-serializedJon Reid2012-03-06
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge remote-tracking branch 'ninja-jduran/TimelineUber' into Timeline-uberJon Reid2012-03-06
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | Squashed commit of the following:Jonathan Duran2012-03-06
| | |/ / / / / / / / / / / / / / / / / / / / / / / / / / /
| | * | | | | / / / / / / / / / / / / / / / / / / / / / / Timeline Fix for layer/element selectionJonathan Duran2012-03-06
| | | |_|_|_|/ / / / / / / / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | Merge remote-tracking branch 'ninja-jduran/TimelineUber' into Timeline-uberJon Reid2012-03-02
| |\| | | | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge remote-tracking branch 'ninja-jduran/TimelineUber' into timeline-serial...Jon Reid2012-03-02
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | Support writing and reading of animation duration with millsecondsJonathan Duran2012-03-02
| * | | | | | | | | | | | | | | | | | | | | | | | | | | Timeline Fix timing functionJonathan Duran2012-03-02
| * | | | | | | | | | | | | | | | | | | | | | | | | | | Timeline: Fix for animation iteration countJonathan Duran2012-03-02
| | |_|_|_|/ / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | Timeline: Serialization of all Collapser componentsJon Reid2012-03-02
| |/ / / / / / / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | Timeline: Fix TODOs for consolidating repetition objects.Jon Reid2012-03-02
|/ / / / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | | Remove console logJonathan Duran2012-03-02
* | | | | | | | | | | | | | | | | | | | | | | | | CleanupJonathan Duran2012-03-02
* | | | | | | | | | | | | | | | | | | | | | | | | Start looping over tweened properties genericallyJonathan Duran2012-03-02
* | | | | | | | | | | | | | | | | | | | | | | | | Timeline bug fixes and cleanupJonathan Duran2012-03-01
* | | | | | | | | | | | | | | | | | | | | | | | | Fix for selection change event handlerJonathan Duran2012-03-01
* | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'refs/heads/Timeline-local' into TimelineUberJonathan Duran2012-03-01
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | Timeline: Merge arrlayers and arrtracks into one object.Jon Reid2012-03-01
* | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'refs/heads/NINJAmaster' into TimelineJonathan Duran2012-03-01
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / / / / |/| / / / / / / / / / / / / / / / / / / / / / / / | |/ / / / / / / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | | | | | | Merge pull request #91 from mayhewinator/WorkingBranchmayhewinator2012-03-01
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | updated name in our manifest and incremented base build numberJohn Mayhew2012-03-01
| |/ / / / / / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | | | | | Merge pull request #90 from mencio/stage-fixesValerio Virgillito2012-03-01
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'refs/heads/master' into stage-fixesValerio Virgillito2012-03-01
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | Squashed commit of the workspace-bugsValerio Virgillito2012-03-01
| | |/ / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | Merge branch 'stage-fixes' of github.com:mencio/ninja-internal into stage-fixesValerio Virgillito2012-03-01
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | | | | | | | | revert removing the webkit transform from elements.Valerio Virgillito2012-03-01
| | * | | | | | | | | | | | | | | | | | | | | | revert removing the webkit transform from elements.Valerio Virgillito2012-03-01
| | |/ / / / / / / / / / / / / / / / / / / / /
| | * / / / / / / / / / / / / / / / / / / / / stage and elements fixesValerio Virgillito2012-03-01
| |/ / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | Merge branch 'Timeline-main' into Timeline-localJon Reid2012-03-01
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | |