| Commit message (Collapse) | Author | Age |
|
|
|
| |
Signed-off-by: Kruti Shah <kruti.shah@motorola.com>
|
| |
|
|
|
|
| |
function key.
|
|\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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>
|
| | |
|
| |
| |
| |
| |
| |
| |
| | |
Was lower-case. Now upper-case.
Also fixed BOMs, trailing white-space, DOS line terminators. Did not
expand tabs to spaces.
|
| | |
|
| | |
|
| | |
|
| | |
|
| | |
|
| | |
|
|\ \ |
|
| |\ \
| | | |
| | | |
| | | |
| | | |
| | | | |
Conflicts:
js/panels/Timeline/PropertyTrack.reel/PropertyTrack.js
Resolved by using both; both were needed.
|
| | | |
| | | |
| | | |
| | | | |
handling. Fix some minor bugs.
|
| |/ /
|/| |
| | |
| | |
| | |
| | | |
(left,top,width,height) changing it now changes the element on stage
Signed-off-by: Kruti Shah <kruti.shah@motorola.com>
|
|/ /
| |
| |
| | |
Signed-off-by: Kruti Shah <kruti.shah@motorola.com>
|
|\ \
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Conflicts:
js/panels/Timeline/Layer.reel/Layer.js
js/panels/Timeline/Style.reel/Style.js
js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
Signed-off-by: Jonathan Duran <jduran@motorola.com>
|
| | |
| | |
| | |
| | | |
to PropertyTrack, TimelineTrack, and Tween classes.
|
|\ \ \
| |/ /
|/| /
| |/
| |
| |
| | |
Conflicts:
js/panels/Timeline/Layer.reel/Layer.js
Signed-off-by: Jonathan Duran <jduran@motorola.com>
|
| | |
|
| |
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
Resolved: use mine (doesn't matter, affected code block is in
commented out section)
|
| |
| |
| |
| | |
error on console.
|
| |
| |
| |
| | |
previously just deselected with control-click. (Yes, that's a weird one.)
|
| |
| |
| |
| |
| | |
causes each layer in the timeline to remain selected even when clicking on
another layer."
|
| |
| |
| |
| | |
Signed-off-by: Jonathan Duran <jduran@motorola.com>
|
|\|
| |
| |
| |
| |
| | |
Conflicts:
js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
Used Theirs, doesn't matter, code block is in commented-out section.
|
| |
| |
| |
| | |
Signed-off-by: Jonathan Duran <jduran@motorola.com>
|
| | |
|
|/ |
|
|
|
|
|
|
| |
deselection help apply style property
Signed-off-by: Kruti Shah <kruti.shah@motorola.com>
|
|
|
|
| |
Signed-off-by: Jonathan Duran <jduran@motorola.com>
|
|\ |
|
| |\ |
|
| | |
| | |
| | |
| | | |
Signed-off-by: Jonathan Duran <jduran@motorola.com>
|
| |/
|/|
| |
| | |
including splitting tweens.
|
|/ |
|
|
|
|
| |
Macs. Also disabled control-click on macs.
|
| |
|
|\
| |
| |
| |
| |
| | |
Conflicts:
js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
Resolution: Use both.
|
| |
| |
| |
| | |
Signed-off-by: Jonathan Duran <jduran@motorola.com>
|
| |
| |
| |
| |
| |
| | |
F5 now deletes the selected keyframe
Signed-off-by: Jonathan Duran <jduran@motorola.com>
|
| |
| |
| |
| | |
Signed-off-by: Jonathan Duran <jduran@motorola.com>
|
| |\
| | |
| | |
| | |
| | |
| | |
| | | |
Conflicts:
js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
Signed-off-by: Kruti Shah <kruti.shah@motorola.com>
|
| |\ \ |
|
| | | |
| | | |
| | | |
| | | | |
Signed-off-by: Kruti Shah <kruti.shah@motorola.com>
|
| | | |
| | | |
| | | |
| | | | |
Signed-off-by: Kruti Shah <kruti.shah@motorola.com>
|
| | | |
| | | |
| | | |
| | | | |
Signed-off-by: Kruti Shah <kruti.shah@motorola.com>
|
| | | |
| | | |
| | | |
| | | | |
are made to the DOM.
|
| | | |
| | | |
| | | |
| | | | |
(Injection from fix of IKNINJA-1783)
|