aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
...
| | | | | | | | | | | | | | * | | | | | | | Merge branch 'master' into pentoolPushkar Joshi2012-03-05
| | | | | | | | | | | | | | |\ \ \ \ \ \ \ \
| | | | | | | | | | | | | | * \ \ \ \ \ \ \ \ Merge branch 'brushtool' into pentoolPushkar Joshi2012-03-02
| | | | | | | | | | | | | | |\ \ \ \ \ \ \ \ \
| | | | | | | | | | | | | | * | | | | | | | | | show feedback on mouseover on a part of the path where a new anchor will be ↵Pushkar Joshi2012-03-01
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | added if clicked
| | | | | | | | | | | | | * | | | | | | | | | | Merge branch 'master' into brushtoolPushkar Joshi2012-03-06
| | | | | | | | | | | | | |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | |_|_|/ / / / / / / | | | | | | | | | | | | | | |/| | | | | | | | |
| | | | | | | | | | | | | * | | | | | | | | | | draw brush stroke as concentric paths overlaid on top of each other...allows ↵Pushkar Joshi2012-03-06
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | us to simulate softness for circular brushes
| | | | | | | | | | | | | * | | | | | | | | | | Merge branch 'master' into brushtoolPushkar Joshi2012-03-05
| | | | | | | | | | | | | |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | |_|_|/ / / / / / / / | | | | | | | | | | | | | |/| | | / / / / / / / | | | | | | | | | | | | | | | |_|/ / / / / / / | | | | | | | | | | | | | | |/| | | | | | | |
| | | | | | | | | | | | | * | | | | | | | | | Merge branch 'master' into brushtoolPushkar Joshi2012-03-02
| | | | | | | | | | | | | |\ \ \ \ \ \ \ \ \ \
| | | | | | | | | | | | | * | | | | | | | | | | Catmull-Rom spline sampling for the brush stroke, and options for stroke ↵Pushkar Joshi2012-03-02
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | size, stroke hardness and both stroke colors (left and right --- temporarily using the stroke and fill colors respectively)
| | | | | | | | | | | | | * | | | | | | | | | | first attempt at rendering the brush stroke as a collection of polylines ↵Pushkar Joshi2012-03-01
| | | | | | | | | | | | | | |_|_|/ / / / / / / | | | | | | | | | | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (number of polylines equals the stroke width)
* | | | | | | | | | | | | | | | | | | | | | | Fix element delete causes keyframe addition failJonathan Duran2012-03-15
| |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
* | | | | | | | | | | | | | | | | | | | | | Optimize Tween component needsDraw callsJonathan Duran2012-03-14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
* | | | | | | | | | | | | | | | | | | | | | Squashed commit of the following:Jonathan Duran2012-03-14
| |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | merge master into timeline Signed-off-by: Jonathan Duran <jduran@motorola.com>
* | | | | | | | | | | | | | | | | | | | | Fix unassigned track element on document switchJonathan Duran2012-03-13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
* | | | | | | | | | | | | | | | | | | | | Timeline : Fixing deleting the layers and hash table and removing while ↵Jonathan Duran2012-03-12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | loops replacing with for loops Signed-off-by: Kruti Shah <kruti.shah@motorola.com> Signed-off-by: Jonathan Duran <jduran@motorola.com>
* | | | | | | | | | | | | | | | | | | | | Merge branch 'refs/heads/Timeline-local' into TimelineUberJonathan Duran2012-03-12
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge remote-tracking branch 'ninja-jduran/TimelineUber' into Timeline-localJon Reid2012-03-09
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | Timeline: new enablePanel() method on TimelinePanel class.Jon Reid2012-03-09
| | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | Merge branch 'refs/heads/NINJAmaster' into TimelineUberJonathan Duran2012-03-12
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / / / / / / / / / / |/| | / / / / / / / / / / / / / / / / / / / / | |