| Commit message (Collapse) | Author | Age | |
|---|---|---|---|
| * | Merge remote-tracking branch 'ninja-jduran/TimelineUber' into timeline-local | Jon Reid | 2012-07-11 |
| |\ | |||
| | * | Fix layer array | Jonathan Duran | 2012-07-10 |
| | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com> | ||
| | * | Fix more missing char | Jonathan Duran | 2012-07-10 |
| | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com> | ||
| | * | Fix missing char and Temp fix missing image | Jonathan Duran | 2012-07-10 |
| | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com> | ||
| * | | Merge remote-tracking branch 'ninja-jduran/TimelineUber' into timeline-local | Jon Reid | 2012-07-09 |
| |\| | |||
| | * | remove commas from var lines | Jonathan Duran | 2012-07-09 |
| | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com> | ||
| | * | Merge branch 'refs/heads/TimelineUberJD' into Timeline-RefactorCode | Kruti Shah | 2012-07-09 |
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/panels/Timeline/PropertyTrack.reel/PropertyTrack.js js/panels/Timeline/Track.reel/Track.html js/panels/Timeline/Track.reel/Track.js js/panels/Timeline/Track.reel/css/Track.css js/panels/Timeline/TrackSpacer.reel/TrackSpacer.html js/panels/Timeline/TrackSpacer.reel/TrackSpacer.js js/panels/Timeline/TrackSpacer.reel/css/TrackSpacer.css Signed-off-by: Kruti Shah <kruti.shah@motorola.com> | ||
| | * | | Adding comments | Kruti Shah | 2012-07-09 |
| | | | | | | | | | | | | | Signed-off-by: Kruti Shah <kruti.shah@motorola.com> | ||
| | * | | Refactoring Code | Kruti Shah | 2012-07-09 |
| | | | | | | | | | | | | | Signed-off-by: Kruti Shah <kruti.shah@motorola.com> | ||
| | * | | Remove Comment | Kruti Shah | 2012-07-03 |
| | | | | | | | | | | | | | Signed-off-by: Kruti Shah <kruti.shah@motorola.com> | ||
| | * | | Merge branch 'refs/heads/TimelineUberJD' into Timeline-RefactorCode | Kruti Shah | 2012-07-03 |
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/panels/Timeline/PropertyTrack.reel/PropertyTrack.js Signed-off-by: Kruti Shah <kruti.shah@motorola.com> | ||
| | * | | | Refactor Code + Bug Fix for the Colorchip disappear between breadcrumb ↵ | Kruti Shah | 2012-07-03 |
| | | | | | | | | | | | | | | | | | | | | | | | | | navigation Signed-off-by: Kruti Shah <kruti.shah@motorola.com> | ||
| | * | | | Refactoring PropertyTrack.js & Span.js | Kruti Shah | 2012-07-03 |
| | | | | | | | | | | | | | | | | | Signed-off-by: Kruti Shah <kruti.shah@motorola.com> | ||
| * | | | | Timeline: Delete unused file. | Jon Reid | 2012-07-09 |
| | |_|/ |/| | | |||
| * | | | 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. | ||
| | * | | | Timeline: Refactor style and layer to use pointers to parent components. | Jon Reid | 2012-07-03 |
| | | | | | |||
| | * | | | Merge remote-tracking branch 'ninja-jduran/TimelineUber' into timeline-local | Jon Reid | 2012-07-03 |
| | |\ \ \ | | | |/ | | |/| | |||
| | * | | | Timeline: Code refactor for Style.js | Jon Reid | 2012-07-03 |
| | | | | | |||
| * | | | | 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 |
| | | | | | |||
| | * | | | Timeline: Better deselection of tweens when selecting/deselecting layers. | Jon Reid | 2012-06-28 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js Resolved: use mine (doesn't matter, affected code block is in commented out section) | ||
| * | | | | Merge branch 'refs/heads/timeline-local' into TimelineUber | Jonathan Duran | 2012-07-03 |
| |\ \ \ \ | | |/ / | |/| | | |||
| | * | | | Merge remote-tracking branch 'ninja-jduran/TimelineUber' into timeline-local | Jon Reid | 2012-07-03 |
| | |\ \ \ | |||
| | * | | | | Timeline: Code refactor for Layer.js | Jon Reid | 2012-07-03 |
| | | | | | | |||
| | * | | | | Timeline: Bug fix IKNINJA-1792, Cut pasting multiple selected objects throws | Jon Reid | 2012-07-02 |
| | | | | | | | | | | | | | | | | | | | | | error on console. | ||
| * | | | | | Cleanup PropertyTrack.js | Jonathan Duran | 2012-07-03 |
| | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com> | ||
| * | | | | | Cleanup Keyframe.js | Jonathan Duran | 2012-07-03 |
| | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com> | ||
| * | | | | | Cleanup Tween.js | Jonathan Duran | 2012-07-03 |
| | |/ / / |/| | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com> | ||
| * | | | | 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> | ||
| * | | Merge branch 'refs/heads/timeline-local' into TimelineUber | Jonathan Duran | 2012-07-02 |
| |\ \ | |||
| | * | | Timeline: Bug fix: Unable to reselect a layer with control-click that was | Jon Reid | 2012-06-29 |
| | | | | | | | | | | | | | previously just deselected with control-click. (Yes, that's a weird one.) | ||
| | * | | Timeline: Bug fix: IKNINJA-1857, "Using keyboard shortcut for chrome-preview | Jon Reid | 2012-06-29 |
| | | | | | | | | | | | | | | | | causes each layer in the timeline to remain selected even when clicking on another layer." | ||
| * | | | Fix 3d rotate tweens not showing up | Jonathan Duran | 2012-07-02 |
| | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com> | ||
| * | | | select keyframe when first created | Jonathan Duran | 2012-07-02 |
| |/ / | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com> | ||
| * | | Merge branch 'refs/heads/TimelineUberJD' into Timeline-local-kruti | Kruti Shah | 2012-06-28 |
| |\ \ | |||
| | * | | clean up | Jonathan Duran | 2012-06-28 |
| | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com> | ||
| | * | | Merge remote-tracking branch 'ninja-jduran/TimelineUber' into timeline-local | Jon Reid | 2012-06-28 |
| | |\| | | | | | | | | | | | | | | | | Conflicts: js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js Used Theirs, doesn't matter, code block is in commented-out section. | ||
| | * | | Timeline: Better deselection of tweens when selecting/deselecting layers. | Jon Reid | 2012-06-28 |
| | | | | |||
| * | | | Merge branch 'refs/heads/ninjainternalmaster' into Timeline-local-kruti | Kruti Shah | 2012-06-28 |
| |\ \ \ | | |/ | |/| | |||
| | * | | FIX layer selection bug | Jonathan Duran | 2012-06-28 |
| | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com> | ||
| * | | | Bug Fix : Hot text updates with keyframe selection | Kruti Shah | 2012-06-28 |
| |/ / | | | | | | | Signed-off-by: Kruti Shah <kruti.shah@motorola.com> | ||
| * / | Timeline: bug fix IKNINJA-1843 | Jon Reid | 2012-06-27 |
| |/ | |||
| * | Bug Fix : Hot Text change from the CSS panel | Kruti Shah | 2012-06-27 |
| | | | | | Signed-off-by: Kruti Shah <kruti.shah@motorola.com> | ||
| * | Merge branch 'refs/heads/TimelineUberJD' into Timeline-local-kruti | Kruti Shah | 2012-06-27 |
| |\ | |||
| | * | Merge branch 'refs/heads/timeline-local' into TimelineUber | Jonathan Duran | 2012-06-27 |
| | |\ | |||
| | | * | Timeline: Bug fix: Hintable should work better now. | Jon Reid | 2012-06-27 |
| | | | | |||
| | * | | Fix animation names breaking | Jonathan Duran | 2012-06-27 |
| | |/ | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com> | ||