Commit message (Collapse) | Author | Age | |
---|---|---|---|
* | FIx 3D animation workflow | Jonathan Duran | 2012-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> | ||
* | fixing the copyrights on the timeline branch pull request. | Valerio Virgillito | 2012-07-18 |
| | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
* | Multi Doc Zoom Slider Handling | Kruti Shah | 2012-07-17 |
| | | | | Signed-off-by: Kruti Shah <kruti.shah@motorola.com> | ||
* | Merge branch 'refs/heads/TimelineUberJD' into Timeline-local-kruti | Kruti Shah | 2012-07-16 |
|\ | |||
| * | Timeline: Disable drag-and-drop on subproperty keyframes. Better error | Jon Reid | 2012-07-16 |
| | | | | | | | | handling. Fix some minor bugs. | ||
| * | Fix missing char and Temp fix missing image | Jonathan Duran | 2012-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 Shah | 2012-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 Tracks | Kruti Shah | 2012-07-10 |
|/ | | | | Signed-off-by: Kruti Shah <kruti.shah@motorola.com> | ||
* | Merge branch 'refs/heads/timeline-local' into TimelineUber | Jonathan Duran | 2012-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 propagated | Jon Reid | 2012-07-03 |
| | | | | | | | | to PropertyTrack, TimelineTrack, and Tween classes. | ||
* | | Merge branch 'refs/heads/NINJAmaster' into TimelineUber | Jonathan Duran | 2012-07-09 |
|\ \ | |/ |/| | | | | | | | | | Conflicts: js/panels/Timeline/Layer.reel/Layer.js Signed-off-by: Jonathan Duran <jduran@motorola.com> | ||
| * | Update copyright boilerplate | Kris Kowal | 2012-07-06 |
| | | |||
* | | Cleanup TimelineTrack.js | Jonathan Duran | 2012-07-03 |
| | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com> | ||
* | | Fix re-open 3D tweens correctly | Jonathan Duran | 2012-07-03 |
| | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com> | ||
* | | Fix performance bug when moving between nested levels | Jonathan Duran | 2012-07-02 |
|/ | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com> | ||
* | Fix animation names breaking | Jonathan Duran | 2012-06-27 |
| | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com> | ||
* | Timeline: Bug fix: Adding or splitting tweens on multiple layers at once | Jon Reid | 2012-06-26 |
| | | | | will no longer change the selection. | ||
* | Timeline: Bug fix: Keyboard shortcut now works for adding keyframes, | Jon Reid | 2012-06-26 |
| | | | | including splitting tweens. | ||
* | Timeline: Bug fix: Indexing on styles when loading files. | Jon Reid | 2012-06-26 |
| | |||
* | Fix animation to end at last keyframe | Jonathan Duran | 2012-06-26 |
| | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com> | ||
* | Fix play marker appearing in wrong position when clicking on a tween | Jonathan Duran | 2012-06-26 |
| | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com> | ||
* | Move time marker when clicking anywhere in timeline tracks | Jonathan Duran | 2012-06-26 |
| | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com> | ||
* | Timeline Bug fixes | Jonathan Duran | 2012-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-local | Jon Reid | 2012-06-25 |
|\ | | | | | | | | | | | Conflicts: js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js Resolution: Use both. | ||
| * | Timeline Fix - reopen subprop keyframes for Position and Size correctly | Jonathan Duran | 2012-06-25 |
| | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com> | ||
| * | FIx - can't delete keyframes | Jonathan Duran | 2012-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 Reid | 2012-06-21 |
|/ | |||
* | remove obsolete functions | Jonathan Duran | 2012-06-19 |
| | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com> | ||
* | Lock Position and Size keyframes to main track keyframes | Jonathan Duran | 2012-06-19 |
| | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com> | ||
* | Fix position tracks collapser to use unique element | Jonathan Duran | 2012-06-19 |
| | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com> | ||
* | Timeline: Enable splitting of keyframes with F6 interaction. | Jon Reid | 2012-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 CSS | Jon Reid | 2012-06-18 |
| | | | | standard. | ||
* | Timeline: Bug Fixes | Jon Reid | 2012-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 be | Jon Reid | 2012-06-15 |
| | | | | added. | ||
* | Timeline: Bug fix: Correctly maintain expand/collapse state of layers and | Jon Reid | 2012-06-15 |
| | | | | subproperties across document switching. | ||
* | Timeline: Bug fix: When adding a new keyframe, easing is set to "undefined". | Jon Reid | 2012-06-15 |
| | |||
* | Timeline: Bug fix IKNINJA 1716, "Ease options are not correctly displayed in | Jon Reid | 2012-06-15 |
| | | | | Timeline after a file is saved and re-opened." | ||
* | Merge remote-tracking branch 'ninja-internal/master' into test-merge | Jon Reid | 2012-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 timeline | Jonathan Duran | 2012-06-12 |
| | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com> | ||
| * | Timeline: Fix document switching under Montage v.10 | Jon Reid | 2012-06-12 |
| | | |||
| * | adding more missing properties to the timeline | Valerio Virgillito | 2012-06-12 |
| | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
* | | F6 support for keyframes | Jonathan Duran | 2012-06-15 |
| | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com> | ||
* | | Merge branch 'refs/heads/TimelineUberjd' into TimelineUber | Kruti Shah | 2012-06-12 |
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/controllers/elements/element-controller.js js/document/_toDelete/html-document.js js/panels/Timeline/Layer.reel/Layer.js Signed-off-by: Kruti Shah <kruti.shah@motorola.com> | ||
| * | | montage v10 serialization updates for timeline | Jonathan Duran | 2012-06-12 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com> Conflicts: js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js Signed-off-by: Jonathan Duran <jduran@motorola.com> | ||
| * | | remove some console logs and simply the prop tween retrieval conditions | Jonathan Duran | 2012-06-12 |
| | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com> | ||
| * | | changes to reopen sub property functions | Jonathan Duran | 2012-06-11 |
| | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com> | ||
| * | | Fix references to documentController.activeDocument to currentDocument.model | Jonathan Duran | 2012-06-06 |
| | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com> | ||
| * | | Fix error when opening file with no animations | Jonathan Duran | 2012-06-05 |
| | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com> | ||
| * | | Merge branch 'refs/heads/timeline-local' into TimelineUber | Jonathan Duran | 2012-06-05 |
| |\ \ | |||
| | * | | Timeline: Bug fixes for deleting styles and their associated tracks | Jon Reid | 2012-05-31 |
| | | | | | | | | | | | | | | | | correctly. |