aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* Timeline: Bug fix: Layer name gets doubled (spreadsheet)Jon Reid2012-05-24
|
* Timeline: Bug fix IKNINJA 1566: Adding a css style property makes the blowJon Reid2012-05-24
| | | | layer name disappear.
* collapse fix for restored style layersJonathan Duran2012-05-24
| | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
* Merge branch 'refs/heads/timeline-local' into TimelineUberJonathan Duran2012-05-24
|\
| * Timeline: Easing selection per keyframe.Jon Reid2012-05-23
| |
| * Merge remote-tracking branch 'ninja-jduran/TimelineUber' into timeline-localJon Reid2012-05-23
| |\
| * \ Merge remote-tracking branch 'ninja-jduran/TimelineUber' into timeline-localJon Reid2012-05-22
| |\ \
| * | | Timeline: New easing selector in spans.Jon Reid2012-05-22
| | | |
| * | | Merge remote-tracking branch 'ninja-jduran/TimelineUber' into timeline-localJon Reid2012-05-22
| |\ \ \
| * \ \ \ Merge remote-tracking branch 'ninja-jduran/TimelineUber' into timeline-localJon Reid2012-05-22
| |\ \ \ \
* | \ \ \ \ Merge branch 'refs/heads/NINJAmaster' into TimelineUberJonathan Duran2012-05-24
|\ \ \ \ \ \
| * \ \ \ \ \ Merge pull request #221 from ericmueller/3DBugsValerio Virgillito2012-05-22
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | 3 d bugs
| | * | | | | | Updates for WebGL/Canvas 2D authortime and runtime gradients.hwc4872012-05-18
| | | | | | | |
| | * | | | | | canvas 2d radial gradient render problem.hwc4872012-05-17
| | | | | | | |
| | * | | | | | Linear & radial gradients for runtime fixeshwc4872012-05-17
| | | | | | | |
| | * | | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into 3DBugshwc4872012-05-17
| | |\ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| | * | | | | | Gradient matching between WebGL and Canvas2Dhwc4872012-05-15
| | | | | | | |
| | * | | | | | base canvas 2d rendering of radial gradient on size of the filled region onlyhwc4872012-05-14
| | | | | | | |
| | * | | | | | removed console output.hwc4872012-05-14
| | | | | | | |
| | * | | | | | Drag plane not being set. Injection from a recent checkin of mine.hwc4872012-05-14
| | | | | | | |
| | * | | | | | removed some console output.hwc4872012-05-14
| | | | | | | |
| | * | | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into 3DBugshwc4872012-05-11
| | |\ \ \ \ \ \
| | * \ \ \ \ \ \ Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into 3DBugshwc4872012-05-11
| | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/lib/geom/circle.js js/lib/geom/rectangle.js
| | * \ \ \ \ \ \ \ Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into 3DBugshwc4872012-05-10
| | |\ \ \ \ \ \ \ \
| | * | | | | | | | | Fixed an inaccuracy snapping to the stage.hwc4872012-05-10
| | | | | | | | | | |
| | * | | | | | | | | code cleanup for linear gradients.hwc4872012-05-08
| | | | | | | | | | |
| | * | | | | | | | | WebGL linear gradients to match CSShwc4872012-05-08
| | | | | | | | | | |
| | * | | | | | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into 3DBugshwc4872012-05-08
| | |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Radial gradients to match CSShwc4872012-05-08
| | | | | | | | | | | |
* | | | | | | | | | | | recreating layer propsJonathan Duran2012-05-24
| |_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
* | | | | | | | | | | Diamond keyframesJonathan Duran2012-05-23
| |_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
* | | | | | | | | | update ease method to distinguish between main animation and prop animationsJonathan Duran2012-05-22
| |_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
* | | | | | | | | Merge branch 'refs/heads/timeline-local' into TimelineUberJonathan Duran2012-05-22
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / | |/| | | | | | |
| * | | | | | | | Timeline: Code cleanupJon Reid2012-05-18
| | | | | | | | |
| * | | | | | | | Timeline: Bug fixes for deleting elements.Jon Reid2012-05-18
| | | | | | | | |
| * | | | | | | | Timeline: Fix element insertion to use new TimelinePanel properties andJon Reid2012-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 Reid2012-05-17
| | | | | | | | |
| * | | | | | | | Timeline: Bug fixes for multiselectJon Reid2012-05-17
| | | | | | | | |
| * | | | | | | | Merge remote-tracking branch 'ninja-jduran/TimelineProps' into timeline-localJon Reid2012-05-17
| |\ \ \ \ \ \ \ \
| * | | | | | | | | Timeline: Multiselect improvements. New convenience methods. MultiselectJon Reid2012-05-17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | drag and drop.
| * | | | | | | | | Merge remote-tracking branch 'ninja-jduran/TimelineProps' into timeline-localJon Reid2012-05-16
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge remote-tracking branch 'ninja-jduran/TimelineUber' into ↵Jon Reid2012-05-15
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | timeline-multiselect
| * | | | | | | | | | | Timeline: Multiselect from the layer panel.Jon Reid2012-05-15
| | | | | | | | | | | |
| * | | | | | | | | | | Merge branch 'timeline-local' into timeline-multiselectJon Reid2012-05-15
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js resolved using theirs. (selectLayers)
| | * | | | | | | | | | | Timeline: Code cleanup. Improve efficiency for track scrolling.Jon Reid2012-05-15
| | | | | | | | | | | | |
| * | | | | | | | | | | | Timeline: Multiselect.Jon Reid2012-04-27
| | | | | | | | | | | | |
* | | | | | | | | | | | | Merge branch 'refs/heads/NINJAmaster' into TimelineUberJonathan Duran2012-05-22
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / / / / | |/| | | | | | | | | | / | |_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | |
| * | | | | | | | | | | Merge pull request #239 from mayhewinator/WorkingBranchValerio Virgillito2012-05-16
| |\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | Tool Options styling and Icon update
| | * | | | | | | | | | fixed bug with keyboard shortcut for fill/ink toolJohn Mayhew2012-05-16
| | | | | | | | | | | |
| | * | | | | | | | | | -added new images for the text tool optionsJohn Mayhew2012-05-15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |