aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* Merge branch 'pentool' into brushtoolPushkar Joshi2012-03-06
|\
| * merge Valerio's architecture changes into pen toolPushkar Joshi2012-03-06
| |
| * Merge branch 'master' into pentoolPushkar Joshi2012-03-06
| |\
| * \ 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
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internalValerio Virgillito2012-03-06
| |\ \ \ \
| | * \ \ \ Merge pull request #98 from mencio/panelsValerio Virgillito2012-03-06
| | |\ \ \ \ | | | | | | | | | | | | | | Panels - removing repetition from the panel container and using a static list of panels.
| | | * \ \ \ Merge branch 'refs/heads/master' into panelsValerio Virgillito2012-03-06
| | | |\ \ \ \ | | | |/ / / / | | |/| | | |
| | | * | | | Merge branch 'refs/heads/master' into panelsValerio Virgillito2012-03-06
| | | |\ \ \ \
| | | * | | | | Adding drag and dropValerio Virgillito2012-03-05
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | | * | | | | remove console logValerio Virgillito2012-03-05
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | | * | | | | removing repetition from the panel container and using a static list of panels.Valerio Virgillito2012-03-05
| | | | |_|_|/ | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Fixing the bugs associated with the repetition of component and PI problems. Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | / | | | Squashed commit FileIO-Build-Candidate into MasterValerio Virgillito2012-03-06
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixing issues with HTML and CSS URLs. Adjusted RegEx logic. Also code a mirror update and undo/redo changes were merged into this request. Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | / / / Fixing WebGL not available bugJose Antonio Marquez2012-03-06
| | |/ / / | |/| | |
| * | | | Squashed commit of preload-fix into MasterValerio Virgillito2012-03-06
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | - Requiring all the previously pre-loaded files - RDGE, Codemirror and gl-matrix are not included via a script tag. Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* | | | 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 pull request #93 from imix23ways/TimelineValerio Virgillito2012-03-02
| |\ \ | | | | | | | | Timeline: Critical bug fixes
| | * | Timeline Fix timing functionJonathan Duran2012-03-02
| | | | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
| | * | Timeline: Fix for animation iteration countJonathan Duran2012-03-02
| | | | | | | | | | | | | | | | | | | | | | | | Add default webkit css properties to allow animations with integer iteration counts. Signed-off-by: Jonathan Duran <jduran@motorola.com>
| | * | Merge branch 'refs/heads/NINJAmaster' into TimelineJonathan Duran2012-03-01
| | |\ \
| | * \ \ Merge branch 'Timeline-main' into Timeline-localJon Reid2012-03-01
| | |\ \ \
| | | * | | Set doc dirty flag when adding tweens or modifying animationsJonathan Duran2012-03-01
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
| | | * | | Update master track on duration change instead of tween add.Jonathan Duran2012-03-01
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds support for updating the master track duration on file open as well as when adding tweens to already opened files. Signed-off-by: Jonathan Duran <jduran@motorola.com>
| | | * | | Timeline: Track Duration FixJonathan Duran2012-03-01
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Kruti Shah <kruti.shah@motorola.com> Signed-off-by: Jonathan Duran <jduran@motorola.com>
| | * | | | Timeline: efficiency improvements to collapser. Document switching.Jon Reid2012-03-01
| | | | | |
| | * | | | Timeline: Merge. Set collapser heights.Jon Reid2012-03-01
| | | | | |
| | * | | | Merge branch 'Timeline-main' into Timeline-newdocJon Reid2012-03-01
| | |\| | |
| | | * | | Merge branch 'refs/heads/NINJAmaster' into TimelineJonathan Duran2012-03-01
| | | |\ \ \
| | | * | | | Squashed commit of the following:Jonathan Duran2012-02-29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |