aboutsummaryrefslogtreecommitdiff
path: root/js/panels/Timeline
Commit message (Collapse)AuthorAge
* Fix the paths to be case sensitive.Pacien TRAN-GIRARD2012-09-28
|
* Remove console logsJonathan Duran2012-07-24
| | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
* FIX IK-1485Jonathan Duran2012-07-24
| | | | | | Fix 3D bug IK 1485 Signed-off-by: Jonathan Duran <jduran@motorola.com>
* The zoom slider resets.Commented some codeKruti Shah2012-07-20
| | | | Signed-off-by: Kruti Shah <kruti.shah@motorola.com>
* 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>
* | FIx 3D animation workflowJonathan Duran2012-07-19
| | | | | | | | | | | | Can now add 3D to any keyframe and all the tween will initialize their 3D identity matrices 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>
* Merge branch 'refs/heads/Timeline-local-kruti' into TimelineUberJonathan Duran2012-07-17
|\
| * Multi Doc Zoom Slider HandlingKruti Shah2012-07-17
| | | | | | | | Signed-off-by: Kruti Shah <kruti.shah@motorola.com>
* | Timeline: Possible fix for new file/new style crash problem.Jon Reid2012-07-17
|/
* 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
|\ \
| * | Timeline: Ameliorate slowness when adding first keyframe to an element.Jon Reid2012-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.
| * | | Merge remote-tracking branch 'ninja-jduran/TimelineUber' into timeline-localJon Reid2012-07-11
| |\ \ \
| * \ \ \ Merge remote-tracking branch 'ninja-jduran/TimelineUber' into timeline-localJon Reid2012-07-09
| |\ \ \ \
| * | | | | Timeline: Delete unused file.Jon Reid2012-07-09
| | | | | |
* | | | | | 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/TimelineUberJD' into Timeline-local-krutiKruti Shah2012-07-11
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | Fix layer arrayJonathan Duran2012-07-10
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
| * | | | Fix more missing charJonathan Duran2012-07-10
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
| * | | | Fix missing char and Temp fix missing imageJonathan Duran2012-07-10
| | |/ / | |/| | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
* / | | Adding Zoom Control to Property TracksKruti Shah2012-07-10
|/ / / | | | | | | | | | Signed-off-by: Kruti Shah <kruti.shah@motorola.com>
* | | remove commas from var linesJonathan Duran2012-07-09
| | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
* | | Merge branch 'refs/heads/TimelineUberJD' into Timeline-RefactorCodeKruti Shah2012-07-09
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/panels/Timeline/PropertyTrack.reel/PropertyTrack.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 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.
| | * | Timeline: Refactor style and layer to use pointers to parent components.Jon Reid2012-07-03
| | | |
| | * | Merge remote-tracking branch 'ninja-jduran/TimelineUber' into timeline-localJon Reid2012-07-03
| | |\ \
| | * | | Timeline: Code refactor for Style.jsJon Reid2012-07-03
| | | | |
| * | | | 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)
* | | | Adding commentsKruti Shah2012-07-09
| | | | | | | | | | | | | | | | Signed-off-by: Kruti Shah <kruti.shah@motorola.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-01 02:03:28 +0000