| Commit message (Collapse) | Author | Age | ||
|---|---|---|---|---|
| ... | ||||
| * | | | | | 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> | |||
| | * | | | | 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 | |
| | | | |_|/ | | |/| | | ||||
| * | | | | | 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> | |||
| | * | | | | 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> | |||
| * | | | | | 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> | |||
| * / / / | 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/NINJAmaster' into TimelineUber | Jonathan Duran | 2012-06-29 | |
| |\ \ \ \ | |/ / / |/| / / | |/ / | | | | | | | | | | Conflicts: js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js Signed-off-by: Jonathan Duran <jduran@motorola.com> | |||
| | * | | Merge pull request #358 from jreid01/timeline-pr | Valerio Virgillito | 2012-06-28 | |
| | |\ \ | | | | | | | | | Timeline: Fix for deselect bug. | |||
| | | * | | 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 pull request #361 from ericguzman/PresetsUpdate_6_28 | Valerio Virgillito | 2012-06-28 | |
| | |\ \ \ | | | | | | | | | | | Presets/CSS Panel - Update css panel with preset class. | |||
| | | * | | | Presets/CSS Panel - Update css panel with preset class. | Eric Guzman | 2012-06-28 | |
| | | |/ / | ||||
| | * | | | Merge pull request #354 from mencio/IKNINJA-1829 | Valerio Virgillito | 2012-06-28 | |
| | |\ \ \ | | |/ / | |/| | | Fixing the button for the shape pi | |||
| | | * | | removing some comments | Valerio Virgillito | 2012-06-28 | |
| | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | |||
| | | * | | Fixing the button for the shape pi | Valerio Virgillito | 2012-06-28 | |
| | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | |||
| | * | | | Fixing body PI background getter | Jose Antonio Marquez | 2012-06-28 | |
| | | | | | ||||
| | * | | | Fixing chips updating with alpha change | Jose Antonio Marquez | 2012-06-28 | |
| | | | | | ||||
| | * | | | Merge branch 'refs/heads/Ninja-Internal' into Color | Jose Antonio Marquez | 2012-06-28 | |
| | |\| | | ||||
| | * | | | Fixing body background bug | Jose Antonio Marquez | 2012-06-28 | |
| | | | | | ||||
| | * | | | Fixing init alpha issue | Jose Antonio Marquez | 2012-06-28 | |
| | | | | | ||||
| | * | | | Fixing color panel sliders updating | Jose Antonio Marquez | 2012-06-28 | |
| | | | | | ||||
| | * | | | Merge branch 'refs/heads/Ninja-Internal' into Color | Jose Antonio Marquez | 2012-06-28 | |
| | |\ \ \ | ||||
| | * | | | | Fixing history bug | Jose Antonio Marquez | 2012-06-27 | |
| | | | | | | ||||
| | * | | | | Merge branch 'refs/heads/Ninja-Internal' into Color | Jose Antonio Marquez | 2012-06-27 | |
| | |\ \ \ \ | ||||
| | * | | | | | Fixing minor color history bug | Jose Antonio Marquez | 2012-06-27 | |
| | | | | | | | ||||
| | * | | | | | Merge branch 'refs/heads/Ninja-Internal' into Color | Jose Antonio Marquez | 2012-06-27 | |
| | |\ \ \ \ \ | ||||
| | * | | | | | | Adding a dismiss step when switching popups | Jose Antonio Marquez | 2012-06-27 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is needed to allow for model to change during draw routines | |||