aboutsummaryrefslogtreecommitdiff
path: root/js/panels/Timeline
Commit message (Collapse)AuthorAge
...
| * | | 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>
* | | | Merge branch 'refs/heads/TimelineUber' into TimelinePropsJonathan Duran2012-05-04
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js Signed-off-by: Jonathan Duran <jduran@motorola.com>
| * | | Timeline: True drag-and-drop of keyframesJon Reid2012-05-04
| | | |
| * | | Timeline: Restore event handler for selectionChange.Jon Reid2012-05-04
| | | |
| * | | Merge remote-tracking branch 'ninja-jduran/TimelineUber' into timeline-localJon Reid2012-05-04
| |\ \ \
| | * | | Timeline: More fixes to selection changing and document switching.Jon Reid2012-05-04
| | |/ /
| * | | Timeline: More work on tween drag-and-dropJon Reid2012-05-03
| | | |
| * | | Timeline: Bug fix: Master Duration not updating when all documents areJon Reid2012-05-03
| | | | | | | | | | | | | | | | closed.
| * | | Timeline: Initial keyframe drag-and-drop interaction.Jon Reid2012-05-01
| | | |
| * | | Timeline: Expand/collapse state of layers now mantained across documentJon Reid2012-05-01
| | | | | | | | | | | | | | | | switching.
* | | | property track additions to serialization data objectJonathan Duran2012-05-04
| | | | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
* | | | Fix subproperty keyframe selectionJonathan Duran2012-05-04
| | | | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
* | | | update data bindings for subproperty tracksJonathan Duran2012-05-04
| | | | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
* | | | apply old stash to new branchJonathan Duran2012-05-03
| |/ / |/| | | | | | | | | | | | | | initial work and stubs for sub property support. serialization for property track components and classes Signed-off-by: Jonathan Duran <jduran@motorola.com>
* | | Merge pull request #191 from imix23ways/TimelineUberValerio Virgillito2012-05-03
|\| | | | | | | | Timeline uber
| * | Timeline: bug fix: disable bread crumb setlevel.Jon Reid2012-04-30
| | |
| * | Timeline: Change serialization parameters for some component properties.Jon Reid2012-04-30
| | |
| * | Timeline: Replace id with data-montage-id in all reels.Jon Reid2012-04-27
| | |
* | | Dom ManipulationKruti Shah2012-05-03
|/ / | | | | | | Signed-off-by: Kruti Shah <kruti.shah@motorola.com>
* | Merge cleanupValerio Virgillito2012-04-27
| | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* | Merge branch 'refs/heads/serialization'Valerio Virgillito2012-04-27
|\ \ | |/ |/|
| * Removing all "module" declarations and replaced with "prototype" in ↵John Mayhew2012-04-26
| | | | | | | | preparation for montage converting to the new "prototype" format fully
* | Fix WEbGL not rendering on stage with timelineJonathan Duran2012-04-26
| | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
* | Timeline: Deleting elements now deletes associated layers.Jon Reid2012-04-26
| |
* | Timeline: comment out a conditional debugger; re-enable layer name storage.Jon Reid2012-04-26
| |
* | Timeline: Decouple Timeline and Breadcrumb. Remove most document changeJon Reid2012-04-26
| | | | | | | | event handlers. Bind Timeline to currentSelectedElement. Various bug fixes.
* | Merge remote-tracking branch 'ninja-jduran/TimelineUber' into timeline-localJon Reid2012-04-25
|\ \
| * | Timeline Bug Fix : 1541Kruti Shah2012-04-25
| | | | | | | | | | | | Signed-off-by: Kruti Shah <kruti.shah@motorola.com>
* | | Timeline: Handling of multiselect of elements from stage.Jon Reid2012-04-25
| | |
* | | Timeline: New tracking for multiple selected layers.Jon Reid2012-04-25
|/ /
* | Turn on width and height as tweenable propertiesJonathan Duran2012-04-24
| | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
* | Change sublayer property names to match css property namesJonathan Duran2012-04-23
| | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
* | Fix Select All bug and remove debuggersJonathan Duran2012-04-23
| | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
* | Breadcrumb FixKruti Shah2012-04-20
| | | | | | | | Signed-off-by: Kruti Shah <kruti.shah@motorola.com>
* | Timeline: More bug fixes for selection with multiple documents opening andJon Reid2012-04-19
| | | | | | | | closing.
* | Timeline: Bug fix: check for uninitialized currentDocument in intializationJon Reid2012-04-19
| | | | | | | | routine.
* | Merge remote-tracking branch 'ninja-jduran/TimelineUber' into timeline-localJon Reid2012-04-19
|\ \ | | | | | | | | | | | | | | | | | | Conflicts: js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js Used mine.
| * \ Merge branch 'timeline-local' of github.com:ntfx47/ninja-internal into ↵Jonathan Duran2012-04-19
| |\ \ | | | | | | | | | | | | TimelineUber
| | * | BreadCrumb Bug FixKruti Shah2012-04-19
| | | | | | | | | | | | | | | | Signed-off-by: Kruti Shah <kruti.shah@motorola.com>
* | | | Timeline: Bug fix: Maintain selection between document switching.Jon Reid2012-04-19
|/ / /