aboutsummaryrefslogtreecommitdiff
path: root/js/panels/Timeline/TimelineTrack.reel
Commit message (Collapse)AuthorAge
* Multi Doc Zoom Slider HandlingKruti Shah2012-07-17
| | | | Signed-off-by: Kruti Shah <kruti.shah@motorola.com>
* 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
| |
| * Remove trailing spacesKris Kowal2012-07-06
| |
| * Expand tabsKris Kowal2012-07-06
| |
* | Merge branch 'refs/heads/TimelineUberJD' into Timeline-local-krutiKruti Shah2012-07-16
|\ \
| * | Timeline: Disable drag-and-drop on subproperty keyframes. Better errorJon Reid2012-07-16
| | | | | | | | | | | | handling. Fix some minor bugs.
| * | Fix missing char and Temp fix missing imageJonathan Duran2012-07-10
| | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
* | | Styling of Zoom Slider + Grid Cut off limit taken care of + Hot text Bug ↵Kruti Shah2012-07-16
| | | | | | | | | | | | | | | | | | (left,top,width,height) changing it now changes the element on stage Signed-off-by: Kruti Shah <kruti.shah@motorola.com>
* | | Adding Zoom Control to Property TracksKruti Shah2012-07-10
|/ / | | | | | | Signed-off-by: Kruti Shah <kruti.shah@motorola.com>
* | Merge branch 'refs/heads/timeline-local' into TimelineUberJonathan Duran2012-07-09
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | 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>
| * | Timeline: First pass at cleaning up TimelineTrack code. Changes propagatedJon Reid2012-07-03
| | | | | | | | | | | | to PropertyTrack, TimelineTrack, and Tween classes.
* | | 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 TimelineTrack.jsJonathan Duran2012-07-03
| | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
* | Fix re-open 3D tweens correctlyJonathan Duran2012-07-03
| | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
* | Fix performance bug when moving between nested levelsJonathan Duran2012-07-02
|/ | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
* Fix animation names breakingJonathan Duran2012-06-27
| | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
* Timeline: Bug fix: Adding or splitting tweens on multiple layers at onceJon Reid2012-06-26
| | | | will no longer change the selection.
* Timeline: Bug fix: Keyboard shortcut now works for adding keyframes,Jon Reid2012-06-26
| | | | including splitting tweens.
* Timeline: Bug fix: Indexing on styles when loading files.Jon Reid2012-06-26
|
* Fix animation to end at last keyframeJonathan Duran2012-06-26
| | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
* Fix play marker appearing in wrong position when clicking on a tweenJonathan Duran2012-06-26
| | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
* Move time marker when clicking anywhere in timeline tracksJonathan Duran2012-06-26
| | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
* Timeline Bug fixesJonathan Duran2012-06-26
| | | | | | Fix keyframe selection updating stage for sub props. Fix tween 0 for sub props on re-open. Fix repetition mismatch for styles and position tracks. Signed-off-by: Jonathan Duran <jduran@motorola.com>
* Merge remote-tracking branch 'ninja-jduran/TimelineUber' into timeline-localJon Reid2012-06-25
|\ | | | | | | | | | | Conflicts: js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js Resolution: Use both.
| * Timeline Fix - reopen subprop keyframes for Position and Size correctlyJonathan Duran2012-06-25
| | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
| * FIx - can't delete keyframesJonathan Duran2012-06-22
| | | | | | | | | | | | F5 now deletes the selected keyframe Signed-off-by: Jonathan Duran <jduran@motorola.com>
* | Timeline: Bug Fix: Document switching was doubling position tracks.Jon Reid2012-06-21
|/
* remove obsolete functionsJonathan Duran2012-06-19
| | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
* Lock Position and Size keyframes to main track keyframesJonathan Duran2012-06-19
| | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
* Fix position tracks collapser to use unique elementJonathan Duran2012-06-19
| | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
* Timeline: Enable splitting of keyframes with F6 interaction.Jon Reid2012-06-18
| | | | Bug fix: Error on console if you press F6 with no layer selected.
* Timeline: Default easing for new animation keyframes set to "none" per CSSJon Reid2012-06-18
| | | | standard.
* Timeline: Bug FixesJon Reid2012-06-18
| | | | | | - Splitting tweens now works again for shift-click interaction - Fixed visual "jump" in keyframes and spans when splitting tweens - Set default easing to "none" to match CSS standard.
* Timeline: Bug fix: Document switching no longer causes multiple styles to beJon Reid2012-06-15
| | | | added.
* Timeline: Bug fix: Correctly maintain expand/collapse state of layers andJon Reid2012-06-15
| | | | subproperties across document switching.
* Timeline: Bug fix: When adding a new keyframe, easing is set to "undefined".Jon Reid2012-06-15
|
* Timeline: Bug fix IKNINJA 1716, "Ease options are not correctly displayed inJon Reid2012-06-15
| | | | Timeline after a file is saved and re-opened."
* Timeline: Replace currentSelectedContainer with new model.domContainer.Jon Reid2012-06-15
|
* Merge remote-tracking branch 'ninja-internal/master' into test-mergeJon Reid2012-06-15
|\ | | | | | | | | | | | | Conflicts: js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js
| * montage v10 serialization updates for timelineJonathan Duran2012-06-12
| | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
| * Timeline: Fix document switching under Montage v.10Jon Reid2012-06-12
| |
| * adding more missing properties to the timelineValerio Virgillito2012-06-12
| | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* | F6 support for keyframesJonathan Duran2012-06-15
| | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>