aboutsummaryrefslogtreecommitdiff
path: root/js/panels/Timeline
Commit message (Collapse)AuthorAge
* update ease method to distinguish between main animation and prop animationsJonathan Duran2012-05-22
| | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
* Merge branch 'refs/heads/timeline-local' into TimelineUberJonathan Duran2012-05-22
|\
| * Timeline: Code cleanupJon Reid2012-05-18
| |
| * Timeline: Bug fixes for deleting elements.Jon Reid2012-05-18
| |
| * Timeline: Fix element insertion to use new TimelinePanel properties andJon Reid2012-05-18
| | | | | | | | | | multiselect. Fix Property Panel so changing an ID there will actually change an ID on the element (broken by switch from id to data-montage-id change).
| * Timeline: More bug fixes and code cleanup for multiselect.Jon Reid2012-05-17
| |
| * Timeline: Bug fixes for multiselectJon Reid2012-05-17
| |
| * Merge remote-tracking branch 'ninja-jduran/TimelineProps' into timeline-localJon Reid2012-05-17
| |\
| * | Timeline: Multiselect improvements. New convenience methods. MultiselectJon Reid2012-05-17
| | | | | | | | | | | | drag and drop.
| * | Merge remote-tracking branch 'ninja-jduran/TimelineProps' into timeline-localJon Reid2012-05-16
| |\ \
| * \ \ Merge remote-tracking branch 'ninja-jduran/TimelineUber' into ↵Jon Reid2012-05-15
| |\ \ \ | | | | | | | | | | | | | | | timeline-multiselect
| * | | | Timeline: Multiselect from the layer panel.Jon Reid2012-05-15
| | | | |
| * | | | Merge branch 'timeline-local' into timeline-multiselectJon Reid2012-05-15
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js resolved using theirs. (selectLayers)
| | * | | | Timeline: Code cleanup. Improve efficiency for track scrolling.Jon Reid2012-05-15
| | | | | |
| * | | | | Timeline: Multiselect.Jon Reid2012-04-27
| | | | | |
* | | | | | more sub prop doc open supportJonathan Duran2012-05-22
| |_|_|_|/ |/| | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
* | | | | Fix restore tween for main layer track with multiple animation namesJonathan Duran2012-05-16
| |_|_|/ |/| | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
* | | | methods for setting simple ease and splitting sub prop spansJonathan Duran2012-05-16
| | | | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
* | | | Remove span highlighting and start syncing pos tracks and main track keyframesJonathan Duran2012-05-16
| | | | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
* | | | CSS pixel fix for prop tracksJonathan Duran2012-05-16
| | | | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
* | | | remove old methodJonathan Duran2012-05-15
| |_|/ |/| | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
* | | fix keyframe splittingJonathan Duran2012-05-15
| | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
* | | remove console logs. add retrieve tweens method for prop tracksJonathan Duran2012-05-15
| | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
* | | update stage element on sub prop keyframe selectJonathan Duran2012-05-15
| | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
* | | fix bug with animation names string not reset on open docJonathan Duran2012-05-15
| |/ |/| | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
* | support width and height tween prop on re-opening saved docJonathan Duran2012-05-15
| | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
* | handle more prop types in subgroup keyframe rulesJonathan Duran2012-05-14
| | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
* | fix keyframe bug when adding keyframes to sub propertiesJonathan Duran2012-05-14
| | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
* | handle style changes on keyframesJonathan Duran2012-05-14
| | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
* | style keyframe rule additionJonathan Duran2012-05-14
| | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
* | Squashed commit of the following:Jonathan Duran2012-05-14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | commit b23502b8ed6856981d09577d4cf24283e5db8afa Author: Kruti Shah <kruti.shah@motorola.com> Date: Mon May 14 10:48:16 2012 -0700 Removed Debugger Signed-off-by: Kruti Shah <kruti.shah@motorola.com> commit c0b531a074e9cf9a964da0cda496bba8d7453ec1 Author: Kruti Shah <kruti.shah@motorola.com> Date: Fri May 11 13:55:18 2012 -0700 Changing Doc Layer Name Signed-off-by: Kruti Shah <kruti.shah@motorola.com> Signed-off-by: Jonathan Duran <jduran@motorola.com>
* | repetition fixJonathan Duran2012-05-11
| | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
* | Merge branch 'refs/heads/TimelineUber' into TimelinePropsJonathan Duran2012-05-11
|\ \
| * | Timeline: Bug fixes for keyframe drag and drop.Jon Reid2012-05-09
| | |
| * | Merge branch 'refs/heads/timeline-local' into TimelineUberJonathan Duran2012-05-09
| |\ \
| | * | Timeline: Automatic scrolling during dragging of keyframes.Jon Reid2012-05-08
| | | |
| | * | Timeline: Bug fix: Account for horizontal scroll when dragging keyframes.Jon Reid2012-05-08
| | | |
| | * | Timeline: Update drag and drop handlers to be unique for drag and drop type.Jon Reid2012-05-08
| | | |
| | * | Timeline: Move keyframe dragover and drop listeners to TimelinePanel forJon Reid2012-05-07
| | | | | | | | | | | | | | | | interaction improvements.
| * | | Merge branch 'refs/heads/NINJAmaster' into TimelineUberJonathan Duran2012-05-09
| |\ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | Conflicts: js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html Signed-off-by: Jonathan Duran <jduran@motorola.com>
| | * | temporary commenting a timeline bug preventing nested selectionValerio Virgillito2012-05-04
| | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | * | Removing unused components referencesValerio Virgillito2012-05-03
| | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* | | | Fix a bug in span splitting interaction and remove console logsJonathan Duran2012-05-11
| | | | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
* | | | allow splitting existing spans with new keyframeJonathan Duran2012-05-11
| | | | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
* | | | Timeline: Bug fix: tweens now hide when their container collapses.Jonathan Duran2012-05-10
| | | | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
* | | | Some sub prop updatesJonathan Duran2012-05-10
| | | | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
* | | | sub property additionsJonathan Duran2012-05-09
| | | | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
* | | | Update timeline CSS to allow longer layer labels by defaultJonathan Duran2012-05-08
| | | | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
* | | | Change sub property track arraysJonathan Duran2012-05-08
| | | | | | | | | | | | | | | | | | | | | | | | Remove transform section and move width and height into Position section. rename position section Position and Size. additional support for generic prop tweens Signed-off-by: Jonathan Duran <jduran@motorola.com>
* | | | more sub prop additionsJonathan Duran2012-05-04
| | | | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>