aboutsummaryrefslogtreecommitdiff
path: root/js/panels/Timeline
Commit message (Collapse)AuthorAge
* 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/TimelineUberJD' into Timeline-local-krutiKruti Shah2012-06-28
|\
| * clean upJonathan Duran2012-06-28
| | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
| * 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
|\ \ \ | | |/ | |/|
| * | FIX layer selection bugJonathan Duran2012-06-28
| | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
* | | Bug Fix : Hot text updates with keyframe selectionKruti Shah2012-06-28
|/ / | | | | | | Signed-off-by: Kruti Shah <kruti.shah@motorola.com>
* / Timeline: bug fix IKNINJA-1843Jon Reid2012-06-27
|/
* Bug Fix : Hot Text change from the CSS panelKruti Shah2012-06-27
| | | | Signed-off-by: Kruti Shah <kruti.shah@motorola.com>
* Merge branch 'refs/heads/TimelineUberJD' into Timeline-local-krutiKruti Shah2012-06-27
|\
| * Merge branch 'refs/heads/timeline-local' into TimelineUberJonathan Duran2012-06-27
| |\
| | * Timeline: Bug fix: Hintable should work better now.Jon Reid2012-06-27
| | |
| * | Fix animation names breakingJonathan Duran2012-06-27
| |/ | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
* / Bug Fix : PI changes in Position updates the hottest in timeline & Keyframes ↵Kruti Shah2012-06-27
|/ | | | | | deselection help apply style property Signed-off-by: Kruti Shah <kruti.shah@motorola.com>
* Merge branch 'refs/heads/TimelineUberJD' into Timeline-local-krutiKruti Shah2012-06-27
|\
| * FIx - hook up play button in timeline to live previewJonathan Duran2012-06-26
| | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
| * Fix keyframe selection stickinessJonathan Duran2012-06-26
| | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
| * Merge branch 'refs/heads/timeline-local' into TimelineUberJonathan Duran2012-06-26
| |\
| | * Timeline: Bug fix: Adding or splitting tweens on multiple layers at onceJon Reid2012-06-26
| | | | | | | | | | | | will no longer change the selection.
| | * Merge remote-tracking branch 'ninja-jduran/TimelineUber' into timeline-localJon Reid2012-06-26
| | |\
| | * | Timeline: Bug fix: Keyboard shortcut now works for adding keyframes,Jon Reid2012-06-26
| | | | | | | | | | | | | | | | including splitting tweens.
| * | | Fix missing serialization in Layer.jsJonathan Duran2012-06-26
| | |/ | |/| | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
| * | Merge branch 'refs/heads/timeline-local' into TimelineUberJonathan Duran2012-06-26
| |\|
| | * Timeline: Bug fix: Indexing on styles when loading files.Jon Reid2012-06-26
| | |
| | * Merge remote-tracking branch 'ninja-jduran/TimelineUber' into timeline-localJon Reid2012-06-26
| | |\
| | * | Timeline: Bug fix IKNINJA-1816Jon Reid2012-06-26
| | | |
| * | | Fix - deselect tweens when selecting a layerJonathan Duran2012-06-26
| | | | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
* | | | Bug Fix: Fix Animation for Position & Size PropsKruti Shah2012-06-27
|/ / / | | | | | | | | | Signed-off-by: Kruti Shah <kruti.shah@motorola.com>
* | | Merge branch 'refs/heads/TimelineUberJD' into Timeline-local-krutiKruti Shah2012-06-26
|\ \ \ | | |/ | |/|
| * | Fix sub prop tween selection to select main tweenJonathan Duran2012-06-26
| |/ | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
| * Fix sub prop animationsJonathan Duran2012-06-26
| | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
| * Fix end animation for style tracksJonathan Duran2012-06-26
| | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
| * Fix animation to end at last keyframeJonathan Duran2012-06-26
| | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
* | Bug Fix : Color Chip PositionKruti Shah2012-06-26
| | | | | | | | Signed-off-by: Kruti Shah <kruti.shah@motorola.com>
* | BugFix - Color Chip Positioning & Checking for null value of the current colorKruti Shah2012-06-26
|/ | | | Signed-off-by: Kruti Shah <kruti.shah@motorola.com>
* Fix play marker appearing in wrong position when clicking on a tweenJonathan Duran2012-06-26
| | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
* Move time marker when clicking anywhere in timeline tracksJonathan Duran2012-06-26
| | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
* Merge branch 'refs/heads/timeline-local' into TimelineUberJonathan Duran2012-06-26
|\
| * Timeline: bug fix: command-click now works for multi selecting layers on ↵Jon Reid2012-06-25
| | | | | | | | Macs. Also disabled control-click on macs.
| * Timeline: Bug fix IKNINJA-1812, "Easing option switches to NoneJon Reid2012-06-25
| | | | | | | | automatically when moving a keyframe"
| * Timeline: CSS fixes.Jon Reid2012-06-25
| |
* | Timeline Bug fixesJonathan Duran2012-06-26
|/ | | | | | Fix keyframe selection updating stage for sub props. Fix tween 0 for sub props on re-open. Fix repetition mismatch for styles and position tracks. Signed-off-by: Jonathan Duran <jduran@motorola.com>
* Merge remote-tracking branch 'ninja-jduran/TimelineUber' into timeline-localJon Reid2012-06-25
|\ | | | | | | | | | | Conflicts: js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js Resolution: Use both.