aboutsummaryrefslogtreecommitdiff
path: root/js/panels/Timeline/Keyframe.reel
Commit message (Collapse)AuthorAge
* Merge branch 'refs/heads/NINJA-master' into TimelineUberJonathan Duran2012-07-17
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/panels/Timeline/DragDrop.js js/panels/Timeline/Keyframe.reel/Keyframe.js js/panels/Timeline/Layer.reel/Layer.js js/panels/Timeline/PropertyTrack.reel/PropertyTrack.js js/panels/Timeline/Span.reel/Span.js js/panels/Timeline/Style.reel/Style.js js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js js/panels/Timeline/Track.reel/Track.html js/panels/Timeline/Track.reel/Track.js js/panels/Timeline/Track.reel/css/Track.css js/panels/Timeline/TrackSpacer.reel/TrackSpacer.html js/panels/Timeline/TrackSpacer.reel/TrackSpacer.js js/panels/Timeline/TrackSpacer.reel/css/TrackSpacer.css js/panels/Timeline/Tween.reel/Tween.js Signed-off-by: Jonathan Duran <jduran@motorola.com>
| * fixed incorrect capitalization for DOCTYPE htmlJohn Mayhew2012-07-09
| |
| * Normalize HTML DOCTYPEKris Kowal2012-07-09
| | | | | | | | | | | | | | Was lower-case. Now upper-case. Also fixed BOMs, trailing white-space, DOS line terminators. Did not expand tabs to spaces.
| * BSD LicenseKris Kowal2012-07-09
| |
| * Normalize HTML doctypeKris Kowal2012-07-06
| |
| * Remove byte order markers (BOM)Kris Kowal2012-07-06
| |
| * Remove trailing spacesKris Kowal2012-07-06
| |
| * Expand tabsKris Kowal2012-07-06
| |
* | Timeline: Ameliorate slowness when adding first keyframe to an element.Jon Reid2012-07-16
| |
* | Timeline: Disable drag-and-drop on subproperty keyframes. Better errorJon Reid2012-07-16
| | | | | | | | handling. Fix some minor bugs.
* | Merge branch 'refs/heads/NINJAmaster' into TimelineUberJonathan Duran2012-07-09
|\| | | | | | | | | | | | | Conflicts: js/panels/Timeline/Layer.reel/Layer.js Signed-off-by: Jonathan Duran <jduran@motorola.com>
| * Update copyright boilerplateKris Kowal2012-07-06
| |
* | Cleanup Keyframe.jsJonathan Duran2012-07-03
|/ | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
* Fix keyframe selection stickinessJonathan Duran2012-06-26
| | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
* Fix sub prop tween selection to select main tweenJonathan Duran2012-06-26
| | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
* Clean upKruti Shah2012-06-12
| | | | Signed-off-by: Kruti Shah <kruti.shah@motorola.com>
* Sub PropsKruti Shah2012-06-12
| | | | Signed-off-by: Kruti Shah <kruti.shah@motorola.com>
* Color chip in TPKruti Shah2012-06-08
| | | | Signed-off-by: Kruti Shah <kruti.shah@motorola.com>
* fancy keyframe selectionJonathan Duran2012-05-30
| | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
* Timeline: Easing selection per keyframe.Jon Reid2012-05-23
|
* Diamond keyframesJonathan Duran2012-05-23
| | | | 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
| |
* | 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: True drag-and-drop of keyframesJon Reid2012-05-04
|
* Timeline: Initial keyframe drag-and-drop interaction.Jon Reid2012-05-01
|
* Timeline: Replace id with data-montage-id in all reels.Jon Reid2012-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
* Adding some missing copyrightsValerio Virgillito2012-02-24
| | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* Timeline Reset to clean Master branch. Code scrub.Jonathan Duran2012-02-23
| | | | | | Fresh copy of ninja-internal/master with Timeline folder copied in to resolved merge issues. Signed-off-by: Jonathan Duran <jduran@motorola.com>
* Fixes for animation element assignmentJonathan Duran2012-02-09
| | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
* Display time reading above layers and code clean upJonathan Duran2012-02-08
| | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
* Add Span color highlight for animated spans and restyle keyframesJonathan Duran2012-02-07
| | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
* Change keyframe to use element mediator when repositioning animated elements ↵Jonathan Duran2012-02-06
| | | | | | on stage Signed-off-by: Jonathan Duran <jduran@motorola.com>
* merge new timelineJonathan Duran2012-02-06
Signed-off-by: Jonathan Duran <jduran@motorola.com>