Commit message (Collapse) | Author | Age | |
---|---|---|---|
* | Merge remote-tracking branch 'ninja-kruti/SerialKiller-branch1' into ↵ | Jon Reid | 2012-03-08 |
|\ | | | | | | | | | | | | | Timeline-local Conflicts: js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js | ||
| * | Timeline : Changing the order of the arrLayers being built | Kruti Shah | 2012-03-08 |
| | | | | | | | | Signed-off-by: Kruti Shah <kruti.shah@motorola.com> | ||
* | | Merge remote-tracking branch 'ninja-jduran/SerialKiller' into Timeline-local | Jon Reid | 2012-03-08 |
|\| | |||
| * | Remove unnecessary needsDraw calls | Jonathan Duran | 2012-03-08 |
| | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com> | ||
* | | Merge branch 'Timeline-serialkiller' into Timeline-local | Jon Reid | 2012-03-07 |
|\| | |||
| * | cleanup | Jonathan Duran | 2012-03-07 |
| | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com> | ||
| * | Bigfixes and cleanup from optimization | Jonathan Duran | 2012-03-07 |
| | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com> | ||
| * | Bugfixes from optimization | Jonathan Duran | 2012-03-07 |
| | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com> | ||
| * | Optimize Timeline serialization | Jonathan Duran | 2012-03-07 |
| | | | | | | | | | | | | Change all serialized properties into one big object to reduce bindings Signed-off-by: Jonathan Duran <jduran@motorola.com> | ||
| * | Optimize serialization bindings for Tween component | Jonathan Duran | 2012-03-07 |
| | | | | | | | | | | | | Move all serialized properties of Tween component into on data object with one binding instead of multiple properties with individual bindings Signed-off-by: Jonathan Duran <jduran@motorola.com> | ||
* | | Timeline: Bug fix: IKNINJA-1283 When a second document is open and closed, ↵ | Jon Reid | 2012-03-07 |
|/ | | | | the first document gets wiped out and Timeline is no longer functional. | ||
* | Merge branch 'refs/heads/Timeline-b4-latest' into TimelineUber | Jonathan Duran | 2012-03-06 |
|\ | | | | | | | | | | | | | Conflicts: js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js Signed-off-by: Jonathan Duran <jduran@motorola.com> | ||
| * | Timeline: Storing Hashtable for element Mapping | Kruti Shah | 2012-03-06 |
| | | | | | | | | Signed-off-by: Kruti Shah <kruti.shah@motorola.com> | ||
| * | Timeline:Storing HashTable for switching docs | Kruti Shah | 2012-03-06 |
| | | | | | | | | Signed-off-by: Kruti Shah <kruti.shah@motorola.com> | ||
| * | Timeline: Fixing the layer switching | Kruti Shah | 2012-03-05 |
| | | | | | | | | Signed-off-by: Kruti Shah <kruti.shah@motorola.com> | ||
| * | Timeline: Removing Events for Adding and Deleting Layer, Taking care of ↵ | Kruti Shah | 2012-03-05 |
| | | | | | | | | | | | | BreadCrumb Signed-off-by: Kruti Shah <kruti.shah@motorola.com> | ||
* | | Timeline: Code cleanup. Fix bug with unfound property in serialization. | Jon Reid | 2012-03-06 |
| | | |||
* | | Merge branch 'Timeline-uber' into timeline-serialized | Jon Reid | 2012-03-06 |
|\ \ | |||
| * \ | Merge remote-tracking branch 'ninja-jduran/TimelineUber' into Timeline-uber | Jon Reid | 2012-03-06 |
| |\ \ | |||
| | * | | Timeline Fix for layer/element selection | Jonathan Duran | 2012-03-06 |
| | |/ | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com> | ||
| * | | Merge remote-tracking branch 'ninja-jduran/TimelineUber' into Timeline-uber | Jon Reid | 2012-03-02 |
| |\| | |||
* | | | Merge remote-tracking branch 'ninja-jduran/TimelineUber' into ↵ | Jon Reid | 2012-03-02 |
|\ \ \ | | |/ | |/| | | | | timeline-serialized | ||
| * | | Support writing and reading of animation duration with millseconds | Jonathan Duran | 2012-03-02 |
| | | | | | | | | | | | | | | | | | | Removed math rounding so that animation durations won't round to full seconds anymore. Signed-off-by: Jonathan Duran <jduran@motorola.com> | ||
| * | | Timeline Fix timing function | Jonathan Duran | 2012-03-02 |
| | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com> | ||
| * | | Timeline: Fix for animation iteration count | Jonathan Duran | 2012-03-02 |
| | | | | | | | | | | | | | | | | | | Add default webkit css properties to allow animations with integer iteration counts. Signed-off-by: Jonathan Duran <jduran@motorola.com> | ||
* | | | Timeline: Serialization of all Collapser components | Jon Reid | 2012-03-02 |
| |/ |/| | |||
* | | Timeline: Fix TODOs for consolidating repetition objects. | Jon Reid | 2012-03-02 |
|/ | |||
* | Remove console log | Jonathan Duran | 2012-03-02 |
| | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com> | ||
* | Cleanup | Jonathan Duran | 2012-03-02 |
| | | | | | | remove commented lines Signed-off-by: Jonathan Duran <jduran@motorola.com> | ||
* | Start looping over tweened properties generically | Jonathan Duran | 2012-03-02 |
| | | | | | | No longer hard coding for top and left properties. Instead, looping over all tweened properties generically and building keyframe strings. Signed-off-by: Jonathan Duran <jduran@motorola.com> | ||
* | Timeline bug fixes and cleanup | Jonathan Duran | 2012-03-01 |
| | | | | | | Deselect tweens on every selection change. Replace JS alerts with console logs. Cleanup obsolete models and references. Signed-off-by: Jonathan Duran <jduran@motorola.com> | ||
* | Fix for selection change event handler | Jonathan Duran | 2012-03-01 |
| | | | | | | event handler wasn't being executed because of incorrect handler function name Signed-off-by: Jonathan Duran <jduran@motorola.com> | ||
* | Merge branch 'refs/heads/Timeline-local' into TimelineUber | Jonathan Duran | 2012-03-01 |
|\ | |||
| * | Timeline: Merge arrlayers and arrtracks into one object. | Jon Reid | 2012-03-01 |
| | | | | | | | | Redefine collapser to use property binding instead of events. | ||
* | | 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 |
|/ |