| Commit message (Collapse) | Author | Age | |
|---|---|---|---|
| * | Merge branch 'refs/heads/ninjainternalmaster' into Timeline-local-kruti | Kruti Shah | 2012-07-03 |
| |\ | | | | | | | | | | | | | Conflicts: js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js Signed-off-by: Kruti Shah <kruti.shah@motorola.com> | ||
| | * | Timeline: Better deselection of tweens when selecting/deselecting layers. | Jon Reid | 2012-06-28 |
| | | | | | | | | | | | | | | | | | Conflicts: js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js Resolved: use mine (doesn't matter, affected code block is in commented out section) | ||
| * | | Merge branch 'refs/heads/TimelineUberJD' into Timeline-local-kruti | Kruti Shah | 2012-06-28 |
| |\ \ | |||
| | * | | clean up | Jonathan Duran | 2012-06-28 |
| | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com> | ||
| | * | | Merge remote-tracking branch 'ninja-jduran/TimelineUber' into timeline-local | Jon Reid | 2012-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 Reid | 2012-06-28 |
| | | | | |||
| * | | | Merge branch 'refs/heads/ninjainternalmaster' into Timeline-local-kruti | Kruti Shah | 2012-06-28 |
| |\ \ \ | | |/ | |/| | |||
| | * | | FIX layer selection bug | Jonathan Duran | 2012-06-28 |
| | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com> | ||
| * | | | Bug Fix : Hot text updates with keyframe selection | Kruti Shah | 2012-06-28 |
| |/ / | | | | | | | Signed-off-by: Kruti Shah <kruti.shah@motorola.com> | ||
| * / | Timeline: bug fix IKNINJA-1843 | Jon Reid | 2012-06-27 |
| |/ | |||
| * | Bug Fix : Hot Text change from the CSS panel | Kruti Shah | 2012-06-27 |
| | | | | | Signed-off-by: Kruti Shah <kruti.shah@motorola.com> | ||
| * | Merge branch 'refs/heads/TimelineUberJD' into Timeline-local-kruti | Kruti Shah | 2012-06-27 |
| |\ | |||
| | * | Merge branch 'refs/heads/timeline-local' into TimelineUber | Jonathan Duran | 2012-06-27 |
| | |\ | |||
| | | * | Timeline: Bug fix: Hintable should work better now. | Jon Reid | 2012-06-27 |
| | | | | |||
| | * | | Fix animation names breaking | Jonathan Duran | 2012-06-27 |
| | |/ | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com> | ||
| * / | Bug Fix : PI changes in Position updates the hottest in timeline & Keyframes ↵ | Kruti Shah | 2012-06-27 |
| |/ | | | | | | deselection help apply style property Signed-off-by: Kruti Shah <kruti.shah@motorola.com> | ||
| * | Merge branch 'refs/heads/TimelineUberJD' into Timeline-local-kruti | Kruti Shah | 2012-06-27 |
| |\ | |||
| | * | FIx - hook up play button in timeline to live preview | Jonathan Duran | 2012-06-26 |
| | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com> | ||
| | * | Fix keyframe selection stickiness | Jonathan Duran | 2012-06-26 |
| | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com> | ||
| | * | Merge branch 'refs/heads/timeline-local' into TimelineUber | Jonathan Duran | 2012-06-26 |
| | |\ | |||
| | | * | Timeline: Bug fix: Adding or splitting tweens on multiple layers at once | Jon Reid | 2012-06-26 |
| | | | | | | | | | | | | | will no longer change the selection. | ||
| | | * | Merge remote-tracking branch 'ninja-jduran/TimelineUber' into timeline-local | Jon Reid | 2012-06-26 |
| | | |\ | |||
| | | * | | Timeline: Bug fix: Keyboard shortcut now works for adding keyframes, | Jon Reid | 2012-06-26 |
| | | | | | | | | | | | | | | | | | including splitting tweens. | ||
| | * | | | Fix missing serialization in Layer.js | Jonathan Duran | 2012-06-26 |
| | | |/ | |/| | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com> | ||
| | * | | Merge branch 'refs/heads/timeline-local' into TimelineUber | Jonathan Duran | 2012-06-26 |
| | |\| | |||
| | | * | Timeline: Bug fix: Indexing on styles when loading files. | Jon Reid | 2012-06-26 |
| | | | | |||
| | | * | Merge remote-tracking branch 'ninja-jduran/TimelineUber' into timeline-local | Jon Reid | 2012-06-26 |
| | | |\ | |||
| | | * | | Timeline: Bug fix IKNINJA-1816 | Jon Reid | 2012-06-26 |
| | | | | | |||
| | * | | | Fix - deselect tweens when selecting a layer | Jonathan Duran | 2012-06-26 |
| | | | | | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com> | ||
| * | | | | Bug Fix: Fix Animation for Position & Size Props | Kruti Shah | 2012-06-27 |
| |/ / / | | | | | | | | | | Signed-off-by: Kruti Shah <kruti.shah@motorola.com> | ||
| * | | | Merge branch 'refs/heads/TimelineUberJD' into Timeline-local-kruti | Kruti Shah | 2012-06-26 |
| |\ \ \ | | |/ | |/| | |||
| | * | | Fix sub prop tween selection to select main tween | Jonathan Duran | 2012-06-26 |
| | |/ | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com> | ||
| | * | Fix sub prop animations | Jonathan Duran | 2012-06-26 |
| | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com> | ||
| | * | Fix end animation for style tracks | Jonathan Duran | 2012-06-26 |
| | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com> | ||
| | * | Fix animation to end at last keyframe | Jonathan Duran | 2012-06-26 |
| | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com> | ||
| * | | Bug Fix : Color Chip Position | Kruti Shah | 2012-06-26 |
| | | | | | | | | | Signed-off-by: Kruti Shah <kruti.shah@motorola.com> | ||
| * | | BugFix - Color Chip Positioning & Checking for null value of the current color | Kruti Shah | 2012-06-26 |
| |/ | | | | Signed-off-by: Kruti Shah <kruti.shah@motorola.com> | ||
| * | Fix play marker appearing in wrong position when clicking on a tween | Jonathan Duran | 2012-06-26 |
| | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com> | ||
| * | Move time marker when clicking anywhere in timeline tracks | Jonathan Duran | 2012-06-26 |
| | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com> | ||
| * | Merge branch 'refs/heads/timeline-local' into TimelineUber | Jonathan Duran | 2012-06-26 |
| |\ | |||
| | * | Timeline: bug fix: command-click now works for multi selecting layers on ↵ | Jon Reid | 2012-06-25 |
| | | | | | | | | | Macs. Also disabled control-click on macs. | ||
| | * | Timeline: Bug fix IKNINJA-1812, "Easing option switches to None | Jon Reid | 2012-06-25 |
| | | | | | | | | | automatically when moving a keyframe" | ||
| | * | Timeline: CSS fixes. | Jon Reid | 2012-06-25 |
| | | | |||
| * | | Timeline Bug fixes | Jonathan Duran | 2012-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-local | Jon Reid | 2012-06-25 |
| |\ | | | | | | | | | | | Conflicts: js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js Resolution: Use both. | ||
| | * | Timeline Fix - reopen subprop keyframes for Position and Size correctly | Jonathan Duran | 2012-06-25 |
| | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com> | ||
| | * | Timeline fix - remove unneeded binding | Jonathan Duran | 2012-06-22 |
| | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com> | ||
| | * | FIx - can't delete keyframes | Jonathan Duran | 2012-06-22 |
| | | | | | | | | | | | | | F5 now deletes the selected keyframe Signed-off-by: Jonathan Duran <jduran@motorola.com> | ||
| | * | Merge branch 'refs/heads/Timeline-local-kruti' into Timeline-merge-candidate | Jonathan Duran | 2012-06-21 |
| | |\ | |||
| | | * | Sub Property ADding KEyframe fixed | Kruti Shah | 2012-06-21 |
| | | | | | | | | | | | | | Signed-off-by: Kruti Shah <kruti.shah@motorola.com> | ||