Commit message (Collapse) | Author | Age | ||
---|---|---|---|---|
... | ||||
* | | Merge branch 'refs/heads/TimelineUber' into TimelineProps | Jonathan Duran | 2012-05-04 | |
|\ \ | | | | | | | | | | | | | | | | | | | Conflicts: js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js Signed-off-by: Jonathan Duran <jduran@motorola.com> | |||
| * | | Timeline: True drag-and-drop of keyframes | Jon Reid | 2012-05-04 | |
| | | | ||||
| * | | Timeline: More work on tween drag-and-drop | Jon Reid | 2012-05-03 | |
| |/ | ||||
* / | Fix subproperty keyframe selection | Jonathan Duran | 2012-05-04 | |
|/ | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com> | |||
* | Timeline: Change serialization parameters for some component properties. | Jon Reid | 2012-04-30 | |
| | ||||
* | Timeline: Replace id with data-montage-id in all reels. | Jon Reid | 2012-04-27 | |
| | ||||
* | Merge branch 'refs/heads/serialization' | Valerio Virgillito | 2012-04-27 | |
|\ | ||||
| * | Removing all "module" declarations and replaced with "prototype" in ↵ | John Mayhew | 2012-04-26 | |
| | | | | | | | | preparation for montage converting to the new "prototype" format fully | |||
* | | Turn on width and height as tweenable properties | Jonathan Duran | 2012-04-24 | |
| | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com> | |||
* | | Remove unneeded require | Jonathan Duran | 2012-04-19 | |
| | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com> | |||
* | | FIX for layer selection when adding a keyframe in unselected layer | Jonathan Duran | 2012-04-18 | |
| | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com> | |||
* | | More Absolute vs Relative changes and cleanup | Jonathan Duran | 2012-04-11 | |
| | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com> | |||
* | | Abs. vs. Rel. animation postion functions | Jonathan Duran | 2012-04-10 | |
| | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com> | |||
* | | Merge branch 'refs/heads/NINJAmaster' into TimelineUber | Jonathan Duran | 2012-04-04 | |
|\| | | | | | | | | | | | | | | | Conflicts: js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js js/tools/SelectionTool.js Signed-off-by: Jonathan Duran <jduran@motorola.com> | |||
| * | Squashed commit of Preparing for the montage undo-manager: Architecture changes | Valerio Virgillito | 2012-04-04 | |
| | | | | | | | | | | | | | | | | | | Reworked the add and remove elements into 1 function which can take 1 or more elements. Removed the _element from the selection array Many other changes related to those 2 changes Undo/Redo shortcuts are now using montage undo/redo manager. Signed-off-by: Valerio Virgillito <valerio@motorola.com> | |||
* | | Timeline: Initial implementation of timeline zoom. | Jon Reid | 2012-04-03 | |
| | | ||||
* | | TImeline : Bug Fix 1429 & The zoom tweendata | Kruti Shah | 2012-04-02 | |
| | | | | | | | | Signed-off-by: Kruti Shah <kruti.shah@motorola.com> | |||
* | | Merge branch 'Timeline-latest-change' of github.com:ntfx47/ninja-internal ↵ | Jonathan Duran | 2012-03-27 | |
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | into TimelineUber Conflicts: js/panels/Timeline/TimelinePanel.reel/css/TimelinePanel.css Signed-off-by: Jonathan Duran <jduran@motorola.com> | |||
| * | | Timeline : Adding Zoom Slider | Kruti Shah | 2012-03-26 | |
| |/ | | | | | | | Signed-off-by: Kruti Shah <kruti.shah@motorola.com> | |||
* / | Fix bug with track properties getting over written | Jonathan Duran | 2012-03-26 | |
|/ | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com> | |||
* | Optimize Tween component needsDraw calls | Jonathan Duran | 2012-03-14 | |
| | | | | 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> | |||
* | 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 Fix for layer/element selection | Jonathan Duran | 2012-03-06 | |
| | | | | 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> | |||
* | 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 | |
| | ||||
* | Adding some missing copyrights | Valerio Virgillito | 2012-02-24 | |
| | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | |||
* | Timeline Reset to clean Master branch. Code scrub. | Jonathan Duran | 2012-02-23 | |
| | | | | | | Fresh copy of ninja-internal/master with Timeline folder copied in to resolved merge issues. Signed-off-by: Jonathan Duran <jduran@motorola.com> | |||
* | Cleaning up more code and adding more models for timeline | Jonathan Duran | 2012-02-09 | |
| | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com> | |||
* | Add Span color highlight for animated spans and restyle keyframes | Jonathan Duran | 2012-02-07 | |
| | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com> | |||
* | merge new timeline | Jonathan Duran | 2012-02-06 | |
Signed-off-by: Jonathan Duran <jduran@motorola.com> |