Commit message (Collapse) | Author | Age | ||
---|---|---|---|---|
... | ||||
* | | Merge branch 'refs/heads/NINJAmaster' into Timeline | Jonathan Duran | 2012-03-01 | |
|\ \ | |/ |/| | ||||
| * | Squashed commit of the workspace-bugs | Valerio Virgillito | 2012-03-01 | |
| | | | | | | | | | | | | - Panels fixes. Signed-off-by: Valerio Virgillito <valerio@motorola.com> | |||
* | | Merge branch 'Timeline-main' into Timeline-local | Jon Reid | 2012-03-01 | |
|\ \ | ||||
| * | | Set doc dirty flag when adding tweens or modifying animations | Jonathan Duran | 2012-03-01 | |
| | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com> | |||
| * | | Update master track on duration change instead of tween add. | Jonathan Duran | 2012-03-01 | |
| | | | | | | | | | | | | | | | | | | Adds support for updating the master track duration on file open as well as when adding tweens to already opened files. Signed-off-by: Jonathan Duran <jduran@motorola.com> | |||
| * | | Timeline: Track Duration Fix | Jonathan Duran | 2012-03-01 | |
| | | | | | | | | | | | | | | | Signed-off-by: Kruti Shah <kruti.shah@motorola.com> Signed-off-by: Jonathan Duran <jduran@motorola.com> | |||
* | | | Timeline: efficiency improvements to collapser. Document switching. | Jon Reid | 2012-03-01 | |
| | | | ||||
* | | | Timeline: Merge. Set collapser heights. | Jon Reid | 2012-03-01 | |
| | | | ||||
* | | | Merge branch 'Timeline-main' into Timeline-newdoc | Jon Reid | 2012-03-01 | |
|\| | | ||||
| * | | Timeline:Revert back to earlier code | Kruti Shah | 2012-02-29 | |
| | | | | | | | | | | | | Signed-off-by: Kruti Shah <kruti.shah@motorola.com> | |||
| * | | TImeline: Cleanup | Kruti Shah | 2012-02-29 | |
| | | | | | | | | | | | | Signed-off-by: Kruti Shah <kruti.shah@motorola.com> | |||
| * | | Timeline: Changed the variables names to resolve issues.And removed the alert. | Kruti Shah | 2012-02-29 | |
| |/ | | | | | | | Signed-off-by: Kruti Shah <kruti.shah@motorola.com> | |||
* | | Timeline: Document switching and code restructuring. | Jon Reid | 2012-03-01 | |
| | | ||||
* | | Merge remote-tracking branch 'ninja-jduran/Timeline' into Timeline-newdoc | Jon Reid | 2012-02-29 | |
|\| | | | | | | | | | Conflicts: js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js | |||
| * | Timeline: Fix Selection , Partially Fix adding element to an already ↵ | Kruti Shah | 2012-02-28 | |
| | | | | | | | | | | | | animated track with one element Signed-off-by: Kruti Shah <kruti.shah@motorola.com> | |||
* | | Timeline: document switching + new document. | Jon Reid | 2012-02-29 | |
|/ | ||||
* | Timeline : Deleting Layer deletes the element, Deleting Layer selects ↵ | Jonathan Duran | 2012-02-28 | |
| | | | | | | | another layer Signed-off-by: Kruti Shah <kruti.shah@motorola.com> Signed-off-by: Jonathan Duran <jduran@motorola.com> | |||
* | Fix element selection on open doc | Jonathan Duran | 2012-02-28 | |
| | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com> | |||
* | Timeline: Basic document switching. | Jon Reid | 2012-02-28 | |
| | ||||
* | Fix to animation names to support multiclassed elements | Jonathan Duran | 2012-02-28 | |
| | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com> | |||
* | remove comment | Jonathan Duran | 2012-02-28 | |
| | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com> | |||
* | todo note | Jonathan Duran | 2012-02-28 | |
| | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com> | |||
* | Fix re-reopened animation duration and milliseconds | Jonathan Duran | 2012-02-28 | |
| | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com> | |||
* | Timeline: Successfully unbind event listeners in tweens when clearing timeline. | Jon Reid | 2012-02-27 | |
| | ||||
* | Timeline: try to clean up bogus events manually. | Jon Reid | 2012-02-27 | |
| | ||||
* | Timeline: More work on clear timeline method. | Jon Reid | 2012-02-27 | |
| | ||||
* | Merge remote-tracking branch 'ninja-jduran/Timeline' into Timeline-local | Jon Reid | 2012-02-27 | |
|\ | ||||
| * | Timeline : Reopening Doc has layer 1 default fix | Jonathan Duran | 2012-02-27 | |
| | | | | | | | | | | Signed-off-by: Kruti Shah <kruti.shah@motorola.com> Signed-off-by: Jonathan Duran <jduran@motorola.com> | |||
| * | Timeline: RetrieveStoredTweens calling fixed | Jonathan Duran | 2012-02-27 | |
| | | | | | | | | | | Signed-off-by: Kruti Shah <kruti.shah@motorola.com> Signed-off-by: Jonathan Duran <jduran@motorola.com> | |||
| * | Merge branch 'refs/heads/integration-candidate' into Timeline | Jonathan Duran | 2012-02-27 | |
| |\ | ||||
| | * | clearing the old local setting and using the new version/prefix local settings. | Valerio Virgillito | 2012-02-24 | |
| | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | |||
| * | | Timeline : Selection Fix | Jonathan Duran | 2012-02-27 | |
| | | | | | | | | | | | | | | | Signed-off-by: Kruti Shah <kruti.shah@motorola.com> Signed-off-by: Jonathan Duran <jduran@motorola.com> | |||
* | | | Timeline: further work on clearTimeline method. | Jon Reid | 2012-02-27 | |
|/ / | ||||
* | | Timeline: Order of tweens and corresponding layers taken care over | Jonathan Duran | 2012-02-25 | |
| | | | | | | | | | | Signed-off-by: Kruti Shah <kruti.shah@motorola.com> Signed-off-by: Jonathan Duran <jduran@motorola.com> | |||
* | | Timeline : Adding Tweens Properties | Jonathan Duran | 2012-02-25 | |
| | | | | | | | | | | Signed-off-by: Kruti Shah <kruti.shah@motorola.com> Signed-off-by: Jonathan Duran <jduran@motorola.com> | |||
* | | Timeline: Add grids to property tracks. First take on clearTimeline method ↵ | Jon Reid | 2012-02-24 | |
| | | | | | | | | on TimelinePanel class. | |||
* | | Timeline: Bug fixes: Delete corresponding track when a style is deleted from ↵ | Jon Reid | 2012-02-24 | |
| | | | | | | | | a layer, and fix serialization variable problem. | |||
* | | Merge remote-tracking branch 'ninja-internal/master' into Timeline-local | Jon Reid | 2012-02-24 | |
|\| | ||||
| * | Adding some missing copyrights | Valerio Virgillito | 2012-02-24 | |
| | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | |||
* | | Merge remote-tracking branch 'ninja-internal/master' into Timeline-local | Jon Reid | 2012-02-23 | |
|\| | | | | | | | | | Conflicts: js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js | |||
| * | Merge pull request #67 from ntfx47/PullRequest-Timeline | Valerio Virgillito | 2012-02-23 | |
| |\ | | | | | | | Timeline : Fix for the split and element model error | |||
| | * | Timeline : Fix for the split and element model error | Kruti Shah | 2012-02-23 | |
| | | | | | | | | | | | | | | | | | | Timeline Signed-off-by: Kruti Shah <kruti.shah@motorola.com> | |||
* | | | Timeline: Add hottext fields to layers and serialize them throughout. | Jon Reid | 2012-02-23 | |
| | | | ||||
* | | | add back layer selection | Jonathan Duran | 2012-02-23 | |
| | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com> | |||
* | | | Remove unneeded selection code | Jonathan Duran | 2012-02-23 | |
| | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com> | |||
* | | | Move element selection to click handler | Jonathan Duran | 2012-02-23 | |
|/ / | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com> | |||
* / | Remove selection calls from timelinepanel.js | Jonathan Duran | 2012-02-23 | |
|/ | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com> | |||
* | Fix for tween repetition arrays getting overwritten on file open | Jonathan Duran | 2012-02-23 | |
| | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com> | |||
* | Timeline: Reopen Doc Restore TimeLine | Jonathan Duran | 2012-02-23 | |
| | | | | | | | | | | | Signed-off-by: Kruti Shah <kruti.shah@motorola.com> Conflicts: js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js Signed-off-by: Jonathan Duran <jduran@motorola.com> | |||
* | New Doc | Jonathan Duran | 2012-02-23 | |
| | | | | | Signed-off-by: Kruti Shah <kruti.shah@motorola.com> Signed-off-by: Jonathan Duran <jduran@motorola.com> |