| Commit message (Collapse) | Author | Age | |
|---|---|---|---|
| * | Merge branch 'refs/heads/timeline-local' into TimelineUber | Jonathan Duran | 2012-05-24 |
| |\ | |||
| | * | Timeline: Easing selection per keyframe. | Jon Reid | 2012-05-23 |
| | | | |||
| | * | Merge remote-tracking branch 'ninja-jduran/TimelineUber' into timeline-local | Jon Reid | 2012-05-23 |
| | |\ | |||
| | * \ | Merge remote-tracking branch 'ninja-jduran/TimelineUber' into timeline-local | Jon Reid | 2012-05-22 |
| | |\ \ | |||
| | * | | | Timeline: New easing selector in spans. | Jon Reid | 2012-05-22 |
| | | | | | |||
| | * | | | Merge remote-tracking branch 'ninja-jduran/TimelineUber' into timeline-local | Jon Reid | 2012-05-22 |
| | |\ \ \ | |||
| | * \ \ \ | Merge remote-tracking branch 'ninja-jduran/TimelineUber' into timeline-local | Jon Reid | 2012-05-22 |
| | |\ \ \ \ | |||
| * | \ \ \ \ | Merge branch 'refs/heads/NINJAmaster' into TimelineUber | Jonathan Duran | 2012-05-24 |
| |\ \ \ \ \ \ | |||
| | * \ \ \ \ \ | Merge pull request #221 from ericmueller/3DBugs | Valerio Virgillito | 2012-05-22 |
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | 3 d bugs | ||
| | | * | | | | | | Updates for WebGL/Canvas 2D authortime and runtime gradients. | hwc487 | 2012-05-18 |
| | | | | | | | | | |||
| | | * | | | | | | canvas 2d radial gradient render problem. | hwc487 | 2012-05-17 |
| | | | | | | | | | |||
| | | * | | | | | | Linear & radial gradients for runtime fixes | hwc487 | 2012-05-17 |
| | | | | | | | | | |||
| | | * | | | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into 3DBugs | hwc487 | 2012-05-17 |
| | | |\ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | |||
| | | * | | | | | | Gradient matching between WebGL and Canvas2D | hwc487 | 2012-05-15 |
| | | | | | | | | | |||
| | | * | | | | | | base canvas 2d rendering of radial gradient on size of the filled region only | hwc487 | 2012-05-14 |
| | | | | | | | | | |||
| | | * | | | | | | removed console output. | hwc487 | 2012-05-14 |
| | | | | | | | | | |||
| | | * | | | | | | Drag plane not being set. Injection from a recent checkin of mine. | hwc487 | 2012-05-14 |
| | | | | | | | | | |||
| | | * | | | | | | removed some console output. | hwc487 | 2012-05-14 |
| | | | | | | | | | |||
| | | * | | | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into 3DBugs | hwc487 | 2012-05-11 |
| | | |\ \ \ \ \ \ | |||
| | | * \ \ \ \ \ \ | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into 3DBugs | hwc487 | 2012-05-11 |
| | | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/lib/geom/circle.js js/lib/geom/rectangle.js | ||
| | | * \ \ \ \ \ \ \ | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into 3DBugs | hwc487 | 2012-05-10 |
| | | |\ \ \ \ \ \ \ \ | |||
| | | * | | | | | | | | | Fixed an inaccuracy snapping to the stage. | hwc487 | 2012-05-10 |
| | | | | | | | | | | | | |||
| | | * | | | | | | | | | code cleanup for linear gradients. | hwc487 | 2012-05-08 |
| | | | | | | | | | | | | |||
| | | * | | | | | | | | | WebGL linear gradients to match CSS | hwc487 | 2012-05-08 |
| | | | | | | | | | | | | |||
| | | * | | | | | | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into 3DBugs | hwc487 | 2012-05-08 |
| | | |\ \ \ \ \ \ \ \ \ | |||
| | | * | | | | | | | | | | Radial gradients to match CSS | hwc487 | 2012-05-08 |
| | | | | | | | | | | | | | |||
| * | | | | | | | | | | | | recreating layer props | Jonathan Duran | 2012-05-24 |
| | |_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com> | ||
| * | | | | | | | | | | | Diamond keyframes | Jonathan Duran | 2012-05-23 |
| | |_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com> | ||
| * | | | | | | | | | | update ease method to distinguish between main animation and prop animations | Jonathan Duran | 2012-05-22 |
| | |_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com> | ||
| * | | | | | | | | | Merge branch 'refs/heads/timeline-local' into TimelineUber | Jonathan Duran | 2012-05-22 |
| |\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / | |/| | | | | | | | |||
| | * | | | | | | | | Timeline: Code cleanup | Jon Reid | 2012-05-18 |
| | | | | | | | | | | |||
| | * | | | | | | | | Timeline: Bug fixes for deleting elements. | Jon Reid | 2012-05-18 |
| | | | | | | | | | | |||
| | * | | | | | | | | Timeline: Fix element insertion to use new TimelinePanel properties and | Jon Reid | 2012-05-18 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | multiselect. Fix Property Panel so changing an ID there will actually change an ID on the element (broken by switch from id to data-montage-id change). | ||
| | * | | | | | | | | Timeline: More bug fixes and code cleanup for multiselect. | Jon Reid | 2012-05-17 |
| | | | | | | | | | | |||
| | * | | | | | | | | Timeline: Bug fixes for multiselect | Jon Reid | 2012-05-17 |
| | | | | | | | | | | |||
| | * | | | | | | | | Merge remote-tracking branch 'ninja-jduran/TimelineProps' into timeline-local | Jon Reid | 2012-05-17 |
| | |\ \ \ \ \ \ \ \ | |||
| | * | | | | | | | | | Timeline: Multiselect improvements. New convenience methods. Multiselect | Jon Reid | 2012-05-17 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | drag and drop. | ||
| | * | | | | | | | | | Merge remote-tracking branch 'ninja-jduran/TimelineProps' into timeline-local | Jon Reid | 2012-05-16 |
| | |\ \ \ \ \ \ \ \ \ | |||
| | * \ \ \ \ \ \ \ \ \ | Merge remote-tracking branch 'ninja-jduran/TimelineUber' into ↵ | Jon Reid | 2012-05-15 |
| | |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | timeline-multiselect | ||
| | * | | | | | | | | | | | Timeline: Multiselect from the layer panel. | Jon Reid | 2012-05-15 |
| | | | | | | | | | | | | | |||
| | * | | | | | | | | | | | Merge branch 'timeline-local' into timeline-multiselect | Jon Reid | 2012-05-15 |
| | |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js resolved using theirs. (selectLayers) | ||
| | | * | | | | | | | | | | | Timeline: Code cleanup. Improve efficiency for track scrolling. | Jon Reid | 2012-05-15 |
| | | | | | | | | | | | | | | |||
| | * | | | | | | | | | | | | Timeline: Multiselect. | Jon Reid | 2012-04-27 |
| | | | | | | | | | | | | | | |||
| * | | | | | | | | | | | | | Merge branch 'refs/heads/NINJAmaster' into TimelineUber | Jonathan Duran | 2012-05-22 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / / / / | |/| | | | | | | | | | / | |_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | |||
| | * | | | | | | | | | | | Merge pull request #239 from mayhewinator/WorkingBranch | Valerio Virgillito | 2012-05-16 |
| | |\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | Tool Options styling and Icon update | ||
| | | * | | | | | | | | | | fixed bug with keyboard shortcut for fill/ink tool | John Mayhew | 2012-05-16 |
| | | | | | | | | | | | | | |||
| | | * | | | | | | | | | | -added new images for the text tool options | John Mayhew | 2012-05-15 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | -simplified text options CSS -fixed styling to accommodate new images | ||
| | | * | | | | | | | | | | updated object 3D options bar to use the new radio styles | John Mayhew | 2012-05-15 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |||