| Commit message (Collapse) | Author | Age | ||
|---|---|---|---|---|
| ... | ||||
| | * | | | 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> | |||
| * | | | | Fix subproperty keyframe selection | Jonathan Duran | 2012-05-04 | |
| | | | | | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com> | |||
| * | | | | update data bindings for subproperty tracks | Jonathan Duran | 2012-05-04 | |
| | | | | | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com> | |||
| * | | | | apply old stash to new branch | Jonathan Duran | 2012-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/TimelineUber | Valerio Virgillito | 2012-05-03 | |
| |\| | | | | | | | | Timeline uber | |||
| | * | | Timeline: bug fix: disable bread crumb setlevel. | Jon Reid | 2012-04-30 | |
| | | | | ||||
| | * | | Timeline: Change serialization parameters for some component properties. | Jon Reid | 2012-04-30 | |
| | | | | ||||
| | * | | Timeline: Replace id with data-montage-id in all reels. | Jon Reid | 2012-04-27 | |
| | | | | ||||
| * | | | Dom Manipulation | Kruti Shah | 2012-05-03 | |
| |/ / | | | | | | | Signed-off-by: Kruti Shah <kruti.shah@motorola.com> | |||
| * | | Merge cleanup | Valerio Virgillito | 2012-04-27 | |
| | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | |||
| * | | Merge branch 'refs/heads/serialization' | Valerio Virgillito | 2012-04-27 | |
| |\ \ | |/ |/| | ||||
| | * | Removing all "module" declarations and replaced with "prototype" in ↵ | John Mayhew | 2012-04-26 | |
| | | | | | | | | | preparation for montage converting to the new "prototype" format fully | |||
| * | | Fix WEbGL not rendering on stage with timeline | Jonathan Duran | 2012-04-26 | |
| | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com> | |||
| * | | Timeline: Deleting elements now deletes associated layers. | Jon Reid | 2012-04-26 | |
| | | | ||||
| * | | Timeline: comment out a conditional debugger; re-enable layer name storage. | Jon Reid | 2012-04-26 | |
| | | | ||||
| * | | Timeline: Decouple Timeline and Breadcrumb. Remove most document change | Jon Reid | 2012-04-26 | |
| | | | | | | | | | event handlers. Bind Timeline to currentSelectedElement. Various bug fixes. | |||
| * | | Merge remote-tracking branch 'ninja-jduran/TimelineUber' into timeline-local | Jon Reid | 2012-04-25 | |
| |\ \ | ||||
| | * | | Timeline Bug Fix : 1541 | Kruti Shah | 2012-04-25 | |
| | | | | | | | | | | | | | Signed-off-by: Kruti Shah <kruti.shah@motorola.com> | |||
| * | | | Timeline: Handling of multiselect of elements from stage. | Jon Reid | 2012-04-25 | |
| | | | | ||||
| * | | | Timeline: New tracking for multiple selected layers. | Jon Reid | 2012-04-25 | |
| |/ / | ||||
| * | | Turn on width and height as tweenable properties | Jonathan Duran | 2012-04-24 | |
| | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com> | |||
| * | | Change sublayer property names to match css property names | Jonathan Duran | 2012-04-23 | |
| | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com> | |||
| * | | Fix Select All bug and remove debuggers | Jonathan Duran | 2012-04-23 | |
| | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com> | |||
| * | | Breadcrumb Fix | Kruti Shah | 2012-04-20 | |
| | | | | | | | | | Signed-off-by: Kruti Shah <kruti.shah@motorola.com> | |||
| * | | Timeline: More bug fixes for selection with multiple documents opening and | Jon Reid | 2012-04-19 | |
| | | | | | | | | | closing. | |||
| * | | Timeline: Bug fix: check for uninitialized currentDocument in intialization | Jon Reid | 2012-04-19 | |
| | | | | | | | | | routine. | |||
| * | | Merge remote-tracking branch 'ninja-jduran/TimelineUber' into timeline-local | Jon Reid | 2012-04-19 | |
| |\ \ | | | | | | | | | | | | | | | | | | | Conflicts: js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js Used mine. | |||
| | * \ | Merge branch 'timeline-local' of github.com:ntfx47/ninja-internal into ↵ | Jonathan Duran | 2012-04-19 | |
| | |\ \ | | | | | | | | | | | | | TimelineUber | |||
| | | * | | BreadCrumb Bug Fix | Kruti Shah | 2012-04-19 | |
| | | | | | | | | | | | | | | | | | Signed-off-by: Kruti Shah <kruti.shah@motorola.com> | |||
| * | | | | Timeline: Bug fix: Maintain selection between document switching. | Jon Reid | 2012-04-19 | |
| |/ / / | ||||