| Commit message (Collapse) | Author | Age | |
|---|---|---|---|
| * | FIx - hook up play button in timeline to live preview | Jonathan Duran | 2012-06-26 |
| | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com> | ||
| * | Locked Elements. Layer Controls | Kruti Shah | 2012-06-19 |
| | | | | | Signed-off-by: Kruti Shah <kruti.shah@motorola.com> | ||
| * | Remove obsolete absolute/relative options from timeline config menu | Jonathan Duran | 2012-06-15 |
| | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com> | ||
| * | Timeline: fix serialization error. | Jon Reid | 2012-06-14 |
| | | |||
| * | Timeline: New popup menu for easing choices. | Jon Reid | 2012-06-12 |
| | | |||
| * | Timeline: Bug fix: Account for horizontal scroll when dragging keyframes. | Jon Reid | 2012-05-08 |
| | | |||
| * | Timeline: Initial keyframe drag-and-drop interaction. | Jon Reid | 2012-05-01 |
| | | |||
| * | Timeline: Replace id with data-montage-id in all reels. | Jon Reid | 2012-04-27 |
| | | |||
| * | Merge cleanup | Valerio Virgillito | 2012-04-27 |
| | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| * | 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 | ||
| * | | Add flag for abs/rel position | Jonathan Duran | 2012-04-18 |
| | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com> | ||
| * | | Timeline: Change Master Layer configuration menu to be on click; bug fix: | Jon Reid | 2012-04-11 |
| | | | | | | | | | | | Master Layer config menu does not scroll with layers. Bug fix: New layers do not take into account "show only animated layers" feature. | ||
| * | | Timeline: New Features: Tag name now present in each layer. Configuration | Jon Reid | 2012-04-10 |
| | | | | | | | | | dropdown in Master Layer; Show Only Animated Layers toggle. | ||
| * | | 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> | ||
| * | | | Timeline: Drag and Drop of layers. | Jon Reid | 2012-03-26 |
| |/ / | |||
| * | | Timeline: fix layer and style select problems. | Jon Reid | 2012-03-20 |
| | | | |||
| * | | Merge branch 'Timeline-local' into Timeline-local-2 | Jon Reid | 2012-03-16 |
| |\ \ | | | | | | | | | | | | | Conflicts: js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js | ||
| | * | | Timeline: Hook up data binding for changes on subproperties. | Jon Reid | 2012-03-16 |
| | |/ | |||
| * / | Bug fix and cleanup | Jonathan Duran | 2012-03-16 |
| |/ | | | | | | Cleaning up unneeded code for one element per layer support and fixing some bugs with selection and layer sync. Signed-off-by: Jonathan Duran <jduran@motorola.com> | ||
| * | Timeline: new enablePanel() method on TimelinePanel class. | Jon Reid | 2012-03-09 |
| | | |||
| * | Timeline: Fixes for layer numbering problem, document switching events. | Jon Reid | 2012-03-08 |
| | | |||
| * | 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> | ||
| * | Timeline: Code cleanup. Fix bug with unfound property in serialization. | Jon Reid | 2012-03-06 |
| | | |||
| * | Timeline: Serialization of all Collapser components | Jon Reid | 2012-03-02 |
| | | |||
| * | Timeline: Merge arrlayers and arrtracks into one object. | Jon Reid | 2012-03-01 |
| | | | | | Redefine collapser to use property binding instead of events. | ||
| * | Timeline: Document switching and code restructuring. | Jon Reid | 2012-03-01 |
| | | |||
| * | Merge remote-tracking branch 'ninja-jduran/Timeline' into Timeline-local | Jon Reid | 2012-02-27 |
| |\ | |||
| | * | 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: further work on clearTimeline method. | Jon Reid | 2012-02-27 |
| |/ / | |||
| * | | 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> | ||
| * | | Timeline: Add hottext fields to layers and serialize them throughout. | Jon Reid | 2012-02-23 |
| |/ | |||
| * | Redo timeline resize code | Jonathan Duran | 2012-02-23 |
| | | | | | Signed-off-by: Jonathan Duran <jduran@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> | ||
| * | Merge branch 'refs/heads/NinjaInternal' into FileIO | Jose Antonio Marquez | 2012-02-10 |
| |\ | | | | | | | | | | | Conflicts: js/ninja.reel/ninja.html js/stage/stage.reel/stage.html | ||
| | * | Squashed commit of the following: | Jonathan Duran | 2012-02-08 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | commit 46292bddbfbe7415c6852142dd10fd02a276722a Author: Jon Reid <tjh487@motorola.com> Date: Wed Feb 8 14:32:22 2012 -0800 Timeline: turn off console logging. commit b8de88393182bc6e819c3d6a290ade2f804236ac Merge: e651344 37b952c Author: Jon Reid <tjh487@motorola.com> Date: Wed Feb 8 14:10:06 2012 -0800 Merge branch 'Timeline-jduran' into Timeline-jreid commit e651344d5d6c2911b31a54510c65a349c4d52db2 Author: Jon Reid <tjh487@motorola.com> Date: Wed Feb 8 14:08:25 2012 -0800 Timeline: Bug fixes IKNINJA-947: Weird behavior with adding layers with an empty layer name selected IKNINJA-990: Multiple styles can be highlighted at the same time even when they are under different layers IKNINJA-1063: Styles can be added while style column is collapsed IKNINJA-970: When there is no style added yet, the arrow sign should be in a collapsed mode Signed-off-by: Jonathan Duran <jduran@motorola.com> | ||
| | * | Timeline: Finish focus/blur for left side of panel. Add new methods ↵ | Jon Reid | 2012-02-07 |
| | | | | | | | | | selectLayer, getLayerIndexByID and getLayerIndexByName. | ||
| | * | Timeline: select/deselect layers. Work on focus/blur for layers. | Jon Reid | 2012-02-07 |
| | | | |||
| | * | Fix Timeline layer resizer from being inversed | Jonathan Duran | 2012-02-06 |
| | | | | | | | | | | | | | layer resizer now works in the correct direction when dragging Signed-off-by: Jonathan Duran <jduran@motorola.com> | ||
| | * | merge new timeline | Jonathan Duran | 2012-02-06 |
| | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com> | ||
| * | | Merged old FileIO | Jose Antonio Marquez | 2012-01-27 |
| |/ | |||
| * | First commit of Ninja to ninja-internal | Pierre Frisch | 2012-01-27 |
| Signed-off-by: Valerio Virgillito <rmwh84@motorola.com> | |||