Commit message (Collapse) | Author | Age | ||
---|---|---|---|---|
... | ||||
| * | | | | Merge remote-tracking branch 'ninja-jduran/TimelineUber' into ↵ | Jon Reid | 2012-05-15 | |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | timeline-multiselect | |||
| * | | | | | Timeline: Multiselect from the layer panel. | Jon Reid | 2012-05-15 | |
| | | | | | | ||||
| * | | | | | Merge branch 'timeline-local' into timeline-multiselect | Jon Reid | 2012-05-15 | |
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js resolved using theirs. (selectLayers) | |||
| | * | | | | | Timeline: Code cleanup. Improve efficiency for track scrolling. | Jon Reid | 2012-05-15 | |
| | | | | | | | ||||
| * | | | | | | Timeline: Multiselect. | Jon Reid | 2012-04-27 | |
| | | | | | | | ||||
* | | | | | | | more sub prop doc open support | Jonathan Duran | 2012-05-22 | |
| |_|_|_|/ / |/| | | | | | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com> | |||
* | | | | | | Fix restore tween for main layer track with multiple animation names | Jonathan Duran | 2012-05-16 | |
| |_|_|/ / |/| | | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com> | |||
* | | | | | methods for setting simple ease and splitting sub prop spans | Jonathan Duran | 2012-05-16 | |
| | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com> | |||
* | | | | | Remove span highlighting and start syncing pos tracks and main track keyframes | Jonathan Duran | 2012-05-16 | |
| | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com> | |||
* | | | | | CSS pixel fix for prop tracks | Jonathan Duran | 2012-05-16 | |
| | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com> | |||
* | | | | | remove old method | Jonathan Duran | 2012-05-15 | |
| |_|/ / |/| | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com> | |||
* | | | | fix keyframe splitting | Jonathan Duran | 2012-05-15 | |
| | | | | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com> | |||
* | | | | remove console logs. add retrieve tweens method for prop tracks | Jonathan Duran | 2012-05-15 | |
| | | | | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com> | |||
* | | | | update stage element on sub prop keyframe select | Jonathan Duran | 2012-05-15 | |
| | | | | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com> | |||
* | | | | fix bug with animation names string not reset on open doc | Jonathan Duran | 2012-05-15 | |
| |/ / |/| | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com> | |||
* | | | support width and height tween prop on re-opening saved doc | Jonathan Duran | 2012-05-15 | |
| | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com> | |||
* | | | handle more prop types in subgroup keyframe rules | Jonathan Duran | 2012-05-14 | |
| | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com> | |||
* | | | fix keyframe bug when adding keyframes to sub properties | Jonathan Duran | 2012-05-14 | |
| | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com> | |||
* | | | handle style changes on keyframes | Jonathan Duran | 2012-05-14 | |
| | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com> | |||
* | | | style keyframe rule addition | Jonathan Duran | 2012-05-14 | |
| | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com> | |||
* | | | Squashed commit of the following: | Jonathan Duran | 2012-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 fix | Jonathan Duran | 2012-05-11 | |
| | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com> | |||
* | | | Merge branch 'refs/heads/TimelineUber' into TimelineProps | Jonathan Duran | 2012-05-11 | |
|\ \ \ | ||||
| * | | | Timeline: Bug fixes for keyframe drag and drop. | Jon Reid | 2012-05-09 | |
| | | | | ||||
| * | | | Merge branch 'refs/heads/timeline-local' into TimelineUber | Jonathan Duran | 2012-05-09 | |
| |\ \ \ | ||||
| | * | | | Timeline: Automatic scrolling during dragging of keyframes. | Jon Reid | 2012-05-08 | |
| | | | | | ||||
| | * | | | Timeline: Bug fix: Account for horizontal scroll when dragging keyframes. | Jon Reid | 2012-05-08 | |
| | | | | | ||||
| | * | | | Timeline: Update drag and drop handlers to be unique for drag and drop type. | Jon Reid | 2012-05-08 | |
| | | | | | ||||
| | * | | | Timeline: Move keyframe dragover and drop listeners to TimelinePanel for | Jon Reid | 2012-05-07 | |
| | | | | | | | | | | | | | | | | | | | | interaction improvements. | |||
| * | | | | Merge branch 'refs/heads/NINJAmaster' into TimelineUber | Jonathan Duran | 2012-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 selection | Valerio Virgillito | 2012-05-04 | |
| | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | |||
| | * | | Removing unused components references | Valerio Virgillito | 2012-05-03 | |
| | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | |||
* | | | | Fix a bug in span splitting interaction and remove console logs | Jonathan Duran | 2012-05-11 | |
| | | | | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com> | |||
* | | | | allow splitting existing spans with new keyframe | Jonathan Duran | 2012-05-11 | |
| | | | | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com> | |||
* | | | | Timeline: Bug fix: tweens now hide when their container collapses. | Jonathan Duran | 2012-05-10 | |
| | | | | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com> | |||
* | | | | Some sub prop updates | Jonathan Duran | 2012-05-10 | |
| | | | | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com> | |||
* | | | | sub property additions | Jonathan Duran | 2012-05-09 | |
| | | | | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com> | |||
* | | | | Update timeline CSS to allow longer layer labels by default | Jonathan Duran | 2012-05-08 | |
| | | | | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com> | |||
* | | | | Change sub property track arrays | Jonathan Duran | 2012-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 additions | Jonathan Duran | 2012-05-04 | |
| | | | | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com> | |||
* | | | | Merge branch 'refs/heads/TimelineUber' into TimelineProps | Jonathan Duran | 2012-05-04 | |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js Signed-off-by: Jonathan Duran <jduran@motorola.com> | |||
| * | | | Timeline: True drag-and-drop of keyframes | Jon Reid | 2012-05-04 | |
| | | | | ||||
| * | | | Timeline: Restore event handler for selectionChange. | Jon Reid | 2012-05-04 | |
| | | | | ||||
| * | | | Merge remote-tracking branch 'ninja-jduran/TimelineUber' into timeline-local | Jon Reid | 2012-05-04 | |
| |\ \ \ | ||||
| | * | | | Timeline: More fixes to selection changing and document switching. | Jon Reid | 2012-05-04 | |
| | |/ / | ||||
| * | | | Timeline: More work on tween drag-and-drop | Jon Reid | 2012-05-03 | |
| | | | | ||||
| * | | | Timeline: Bug fix: Master Duration not updating when all documents are | Jon Reid | 2012-05-03 | |
| | | | | | | | | | | | | | | | | closed. | |||
| * | | | Timeline: Initial keyframe drag-and-drop interaction. | Jon Reid | 2012-05-01 | |
| | | | | ||||
| * | | | Timeline: Expand/collapse state of layers now mantained across document | Jon Reid | 2012-05-01 | |
| | | | | | | | | | | | | | | | | switching. | |||
* | | | | property track additions to serialization data object | Jonathan Duran | 2012-05-04 | |
| | | | | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com> |