aboutsummaryrefslogtreecommitdiff
path: root/js
Commit message (Collapse)AuthorAge
...
| * | | | | | | | | | Merge branch 'refs/heads/NinjaInternal' into ColorJose Antonio Marquez2012-02-17
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'refs/heads/NinjaInternal' into ColorJose Antonio Marquez2012-02-16
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'refs/heads/NinjaInternal' into ColorJose Antonio Marquez2012-02-15
| |\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Bug FixesJose Antonio Marquez2012-02-11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | IKNINJA-1101 IKNINJA-1079 IKNINJA-1144
| * | | | | | | | | | | | | Merge branch 'refs/heads/NinjaInternal' into ColorJose Antonio Marquez2012-02-11
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'refs/heads/NinjaInternal' into ColorJose Antonio Marquez2012-02-08
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'refs/heads/NinjaInternal' into ColorJose Antonio Marquez2012-02-08
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/controllers/elements/shapes-controller.js js/data/pi/pi-data.js js/panels/properties/content.reel/content.js
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'refs/heads/NinjaInternal' into ColorJose Antonio Marquez2012-02-02
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/controllers/elements/shapes-controller.js js/data/pi/pi-data.js js/panels/properties/content.reel/content.js
* | | | | | | | | | | | | | | | | | seemingly working version of the calligraphic brush (seems to work with ↵Pushkar Joshi2012-03-12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | transparency and large stroke widths...seems to work better with smoothing)
* | | | | | | | | | | | | | | | | | bug fixes for spline interpolationPushkar Joshi2012-03-12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | AND Laplacian smoothing for denoising AND code cleanup (removing blocks of commented code)
* | | | | | | | | | | | | | | | | | brush stroke options for calligraphic brush stylePushkar Joshi2012-03-08
| | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | implement stroke hardness such that it is percentage of the stroke width ↵Pushkar Joshi2012-03-07
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | that's fully the color of the brush AND add a smoothing flag for the brush options
* | | | | | | | | | | | | | | | | | merge Valerio's architecture changesPushkar Joshi2012-03-06
| | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | 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 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
| | | | | | | | | | | | | | |