aboutsummaryrefslogtreecommitdiff
path: root/js/panels/Timeline/TimelinePanel.reel
Commit message (Collapse)AuthorAge
* Merge branch 'refs/heads/NINJA-master' into TimelineUberJonathan Duran2012-07-20
|\ | | | | | | | | | | | | | | Conflicts: js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html js/panels/Timeline/TimelinePanel.reel/css/TimelinePanel.css Signed-off-by: Jonathan Duran <jduran@motorola.com>
| * Timeline: updated livePreview to timeline play. Hide canvas and draw red outlineValerio Virgillito2012-07-19
| | | | | | | | | | | | | | | | - Changed the play button to a toggle button - livePreview code in stage activated via bindings - Draw a red outline of the canvas when in play Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* | Improve keyframe selection by moving playhead marker to lower z-indexJonathan Duran2012-07-19
| | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
* | Merge branch 'refs/heads/Timeline-local-kruti' into TimelineUberJonathan Duran2012-07-19
|\ \ | |/ |/|
| * The zoom slider position remembered between multi doc switchKruti Shah2012-07-18
| | | | | | | | Signed-off-by: Kruti Shah <kruti.shah@motorola.com>
* | fixing the copyrights on the timeline branch pull request.Valerio Virgillito2012-07-18
|/ | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* Multi Doc Zoom Slider HandlingKruti Shah2012-07-17
| | | | Signed-off-by: Kruti Shah <kruti.shah@motorola.com>
* Timeline: Style zoom slider.Jon Reid2012-07-17
|
* Timeline: Bug fix: Now able to add first keyframe to an element usingJon Reid2012-07-17
| | | | function key.
* 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
|\ \
| * \ Merge remote-tracking branch 'ninja-jduran/TimelineUber' into timeline-localJon Reid2012-07-16
| |\ \ | | | | | | | | | | | | | | | | | | | | Conflicts: js/panels/Timeline/PropertyTrack.reel/PropertyTrack.js Resolved by using both; both were needed.
| * | | Timeline: Disable drag-and-drop on subproperty keyframes. Better errorJon Reid2012-07-16
| | | | | | | | | | | | | | | | handling. Fix some minor bugs.
* | | | 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>
* | | Zooming the tweensKruti Shah2012-07-12
|/ / | | | | | | 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
| |
| * Timeline: Better deselection of tweens when selecting/deselecting layers.Jon Reid2012-06-28
| | | | | | | | | | | | | | | | Conflicts: js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js Resolved: use mine (doesn't matter, affected code block is in commented out section)
* | Timeline: Bug fix IKNINJA-1792, Cut pasting multiple selected objects throwsJon Reid2012-07-02
| | | | | | | | error on console.
* | Timeline: Bug fix: Unable to reselect a layer with control-click that wasJon Reid2012-06-29
| | | | | | | | previously just deselected with control-click. (Yes, that's a weird one.)
* | Timeline: Bug fix: IKNINJA-1857, "Using keyboard shortcut for chrome-previewJon Reid2012-06-29
| | | | | | | | | | causes each layer in the timeline to remain selected even when clicking on another layer."
* | clean upJonathan Duran2012-06-28
| | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
* | Merge remote-tracking branch 'ninja-jduran/TimelineUber' into timeline-localJon Reid2012-06-28
|\| | | | | | | | | | | Conflicts: js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js Used Theirs, doesn't matter, code block is in commented-out section.
| * FIX layer selection bugJonathan Duran2012-06-28
| | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
| * Timeline: bug fix IKNINJA-1843Jon Reid2012-06-27
| |
* | Timeline: Better deselection of tweens when selecting/deselecting layers.Jon Reid2012-06-28
|/
* Bug Fix : PI changes in Position updates the hottest in timeline & Keyframes ↵Kruti Shah2012-06-27
| | | | | | deselection help apply style property Signed-off-by: Kruti Shah <kruti.shah@motorola.com>
* FIx - hook up play button in timeline to live previewJonathan Duran2012-06-26
| | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
* Merge remote-tracking branch 'ninja-jduran/TimelineUber' into timeline-localJon Reid2012-06-26
|\
| * Merge branch 'refs/heads/timeline-local' into TimelineUberJonathan Duran2012-06-26
| |\
| * | Fix - deselect tweens when selecting a layerJonathan Duran2012-06-26
| | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
* | | Timeline: Bug fix: Keyboard shortcut now works for adding keyframes,Jon Reid2012-06-26
| |/ |/| | | | | including splitting tweens.
* | Timeline: Bug fix IKNINJA-1816Jon Reid2012-06-26
|/
* Timeline: bug fix: command-click now works for multi selecting layers on ↵Jon Reid2012-06-25
| | | | Macs. Also disabled control-click on macs.
* Timeline: CSS fixes.Jon Reid2012-06-25
|
* 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 - remove unneeded bindingJonathan Duran2012-06-22
| | | | | | | | 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>
| * remove bad fileJonathan Duran2012-06-20
| | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
| * Merge branch 'refs/heads/TimelineUberJD' into Timeline-local-krutiKruti Shah2012-06-20
| |\ | | | | | | | | | | | | | | | | | | Conflicts: js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js Signed-off-by: Kruti Shah <kruti.shah@motorola.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-19 10:02:06 +0000