aboutsummaryrefslogtreecommitdiff
path: root/js/panels/Timeline/TimelineTrack.reel
Commit message (Collapse)AuthorAge
...
* | F6 support for keyframesJonathan Duran2012-06-15
| | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
* | Merge branch 'refs/heads/TimelineUberjd' into TimelineUberKruti Shah2012-06-12
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/controllers/elements/element-controller.js js/document/_toDelete/html-document.js js/panels/Timeline/Layer.reel/Layer.js Signed-off-by: Kruti Shah <kruti.shah@motorola.com>
| * | remove unneeded serializationJonathan Duran2012-06-12
| | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
| * | montage v10 serialization updates for timelineJonathan Duran2012-06-12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com> Conflicts: js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js Signed-off-by: Jonathan Duran <jduran@motorola.com>
| * | remove some console logs and simply the prop tween retrieval conditionsJonathan Duran2012-06-12
| | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
| * | changes to reopen sub property functionsJonathan Duran2012-06-11
| | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
| * | Fix references to documentController.activeDocument to currentDocument.modelJonathan Duran2012-06-06
| | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
| * | Fix error when opening file with no animationsJonathan Duran2012-06-05
| | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
| * | Merge branch 'refs/heads/timeline-local' into TimelineUberJonathan Duran2012-06-05
| |\ \
| | * | Timeline: Bug fixes for deleting styles and their associated tracksJon Reid2012-05-31
| | | | | | | | | | | | | | | | correctly.
| * | | Merge branch 'refs/heads/NINJAmaster' into TimelineUberJonathan Duran2012-06-05
| |\ \ \ | | |/ / | |/| / | | |/ | | | | | | | | | | | | | | | Conflicts: js/controllers/elements/element-controller.js js/panels/Timeline/Layer.reel/Layer.js js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js Signed-off-by: Jonathan Duran <jduran@motorola.com>
| | * document bindings phase 1Valerio Virgillito2012-05-29
| | | | | | | | | | | | | | | | | | | | | | | | - using array controller to bind the current document to all ninja components - removed open document event - removed references to the document controller Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* | | Sub propertyKruti Shah2012-06-07
|/ / | | | | | | Signed-off-by: Kruti Shah <kruti.shah@motorola.com>
* | Merge branch 'refs/heads/NINJAmaster' into TimelineUberJonathan Duran2012-05-31
|\| | | | | | | | | | | | | | | | | Conflicts: js/panels/Timeline/Layer.reel/Layer.js js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js js/panels/properties.reel/properties.js Signed-off-by: Jonathan Duran <jduran@motorola.com>
| * Merge branch 'refs/heads/Ninja-DOM-Architecture' into DocumentJose Antonio Marquez2012-05-24
| |\ | | | | | | | | | | | | | | | | | | Conflicts: js/document/document-html.js js/helper-classes/3D/view-utils.js js/stage/stage.reel/stage.js
| | * Timeline triggerBinding needs to be set to false in the track data.Nivesh Rajbhandari2012-05-23
| | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| * | Cleaning up referencing to 'documentRoot' and '_document'Jose Antonio Marquez2012-05-24
| |/ | | | | | | Moved to reference new model in DOM architecture rework. This should not affect anything, just moving the references, and also the setting to the render methods in the design view.
| * Fixing the dirty document flag. Disabling the stylesheets dirty flag because ↵Valerio Virgillito2012-05-10
| | | | | | | | | | | | === true on document open. Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* | fix to set default prop for tweenJonathan Duran2012-05-29
| | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
* | Merge branch 'refs/heads/timeline-local' into TimelineUberJonathan Duran2012-05-25
|\ \
| * | Timeline: Better fix for keeping styles/tracks in synch when adding stylesJon Reid2012-05-25
| | | | | | | | | | | | on document open.
* | | animation name string fixJonathan Duran2012-05-25
| | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
* | | remove console logsJonathan Duran2012-05-25
| | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
* | | update retrieveStoredTweens methodJonathan Duran2012-05-25
|/ / | | | | | | | | | | change the method to retrieve the keyframe styles for each keyframe generically instead of hard coding for top, left, width and height Signed-off-by: Jonathan Duran <jduran@motorola.com>
* | collapse fix for restored style layersJonathan Duran2012-05-24
| | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
* | Merge branch 'refs/heads/timeline-local' into TimelineUberJonathan Duran2012-05-24
|\ \
| * | Timeline: Easing selection per keyframe.Jon Reid2012-05-23
| | |
| * | Merge remote-tracking branch 'ninja-jduran/TimelineUber' into timeline-localJon Reid2012-05-23
| |\ \
| * | | Timeline: New easing selector in spans.Jon Reid2012-05-22
| | | |
| * | | Merge remote-tracking branch 'ninja-jduran/TimelineUber' into timeline-localJon Reid2012-05-22
| |\ \ \
* | | | | recreating layer propsJonathan Duran2012-05-24
| |_|/ / |/| | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
* | | | Diamond keyframesJonathan Duran2012-05-23
| | | | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
* | | | Merge branch 'refs/heads/timeline-local' into TimelineUberJonathan Duran2012-05-22
|\| | | | |/ / |/| |
| * | 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.
* | | | 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>
* | CSS pixel fix for prop tracksJonathan Duran2012-05-16
| | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
* | fix keyframe splittingJonathan 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>
* | fix keyframe bug when adding keyframes to sub propertiesJonathan 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>
* | 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: 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.
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-05 06:45:13 +0000