aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
...
| | * | | | | | | | Merge branch 'refs/heads/NINJAmaster' into TimelineUberJonathan Duran2012-07-09
| | |\ \ \ \ \ \ \ \ | | | |_|/ / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/panels/Timeline/Layer.reel/Layer.js Signed-off-by: Jonathan Duran <jduran@motorola.com>
| | * | | | | | | | Merge branch 'refs/heads/timeline-local' into TimelineUberJonathan Duran2012-07-03
| | |\ \ \ \ \ \ \ \ | | | | |/ / / / / / | | | |/| | | | | |
| | | * | | | | | | Merge remote-tracking branch 'ninja-jduran/TimelineUber' into timeline-localJon Reid2012-07-03
| | | |\ \ \ \ \ \ \
| | | * | | | | | | | Timeline: Code refactor for Layer.jsJon Reid2012-07-03
| | | | | | | | | | |
| | | * | | | | | | | Merge remote-tracking branch 'origin/timeline-local' into timeline-localJon Reid2012-07-02
| | | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js use mine; no idea why Git did this.
| | | | * | | | | | | | Timeline: Bug fix IKNINJA-1792, Cut pasting multiple selected objects throwsJon Reid2012-07-02
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | error on console.
| | | * | | | | | | | | Timeline: Bug fix IKNINJA-1792, Cut pasting multiple selected objects throwsJon Reid2012-07-02
| | | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | error on console.
| | * | | | | | | | | Merge branch 'refs/heads/NINJAmaster' into TimelineUberJonathan Duran2012-07-03
| | |\ \ \ \ \ \ \ \ \ | | | | |_|_|_|/ / / / | | | |/| | | | | | |
| | * | | | | | | | | Cleanup PropertyTrack.jsJonathan Duran2012-07-03
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
| | * | | | | | | | | Cleanup Keyframe.jsJonathan Duran2012-07-03
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
| | * | | | | | | | | Cleanup Tween.jsJonathan Duran2012-07-03
| | | |_|/ / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
| | * | | | | | | | Cleanup TimelineTrack.jsJonathan Duran2012-07-03
| | | |_|_|/ / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
| * | | | | | | | Merge branch 'refs/heads/TimelineUberJD' into Timeline-local-krutiKruti Shah2012-07-03
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js Signed-off-by: Kruti Shah <kruti.shah@motorola.com>
| | * | | | | | | Fix re-open 3D tweens correctlyJonathan Duran2012-07-03
| | | |/ / / / / | | |/| | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
| | * | | | | | Fix performance bug when moving between nested levelsJonathan Duran2012-07-02
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
| | * | | | | | Merge branch 'refs/heads/timeline-local' into TimelineUberJonathan Duran2012-07-02
| | |\ \ \ \ \ \
| | | * | | | | | Timeline: Bug fix: Unable to reselect a layer with control-click that wasJon Reid2012-06-29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | previously just deselected with control-click. (Yes, that's a weird one.)
| | | * | | | | | Timeline: Bug fix: IKNINJA-1857, "Using keyboard shortcut for chrome-previewJon Reid2012-06-29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | causes each layer in the timeline to remain selected even when clicking on another layer."
| | * | | | | | | Fix 3d rotate tweens not showing upJonathan Duran2012-07-02
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
| | * | | | | | | select keyframe when first createdJonathan Duran2012-07-02
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
| | * | | | | | | Merge branch 'refs/heads/NINJAmaster' into TimelineUberJonathan Duran2012-07-02
| | |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ Merge branch 'refs/heads/NINJAmaster' into TimelineUberJonathan Duran2012-06-29
| | |\ \ \ \ \ \ \ \ | | | |_|/ / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js Signed-off-by: Jonathan Duran <jduran@motorola.com>
| * | | | | | | | | Merge branch 'refs/heads/ninjainternalmaster' into Timeline-local-krutiKruti Shah2012-07-03
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | / / / / / / | | | |/ / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js Signed-off-by: Kruti Shah <kruti.shah@motorola.com>
| * | | | | | | | Merge branch 'refs/heads/TimelineUberJD' into Timeline-local-krutiKruti Shah2012-06-28
| |\ \ \ \ \ \ \ \
| | * | | | | | | | clean upJonathan Duran2012-06-28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
| | * | | | | | | | Merge branch 'refs/heads/timeline-local' into TimelineUberJonathan Duran2012-06-28
| | |\ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ Merge remote-tracking branch 'ninja-jduran/TimelineUber' into timeline-localJon Reid2012-06-28
| | | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js Used Theirs, doesn't matter, code block is in commented-out section.
| | | * | | | | | | | | Timeline: Better deselection of tweens when selecting/deselecting layers.Jon Reid2012-06-28
| | | | | | | | | | | |
| * | | | | | | | | | | Merge branch 'refs/heads/ninjainternalmaster' into Timeline-local-krutiKruti Shah2012-06-28
| |\| | | | | | | | | |
| * | | | | | | | | | | Bug Fix : Hot text updates with keyframe selectionKruti Shah2012-06-28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Kruti Shah <kruti.shah@motorola.com>
| * | | | | | | | | | | Merge branch 'refs/heads/ninjainternalmaster' into Timeline-local-krutiKruti Shah2012-06-28
| |\ \ \ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ \ \ Merge branch 'refs/heads/master' into v0.7.1Valerio Virgillito2012-07-17
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | |
| * | | | | | | | | | | | Merge pull request #399 from joseeight/ColorValerio Virgillito2012-07-17
| |\ \ \