aboutsummaryrefslogtreecommitdiff
Commit message (Expand)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 a...Pushkar Joshi2012-03-01
| | | * | | | | | | | | | | | | | | | 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
| | | * | | | | | | | | | | | | | | | 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 size...Pushkar Joshi2012-03-02
| | | * | | | | | | | | | | | | | | | first attempt at rendering the brush stroke as a collection of polylines (num...Pushkar Joshi2012-03-01
| | | | |_|_|/ / / / / / / / / / / / | | | |/| | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | Conversion to JSON based file IO for canvas2D and WebGL renderinghwc4872012-03-16
| |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | Corrections for Uber shader IOhwc4872012-03-14
* | | | | | | | | | | | | | | | | Fixed BumpMetal materialhwc4872012-03-13
* | | | | | | | | | | | | | | | | Merge pull request #5 from joseeight/FileIO-IntegrationEric2012-03-13
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Cleaning up webGL runtimeJose Antonio Marquez2012-03-13
| * | | | | | | | | | | | | | | | Clean up and TODOsJose Antonio Marquez2012-03-12
* | | | | | | | | | | | | | | | | Uber material changes for IOhwc4872012-03-12
* | | | | | | | | | | | | | | | | Merge branch 'integration' of github.com:ericmueller/ninja-internal into inte...hwc4872012-03-12
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | Merge pull request #4 from joseeight/FileIO-IntegrationEric2012-03-12
| |\| | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | Fix for 2D Canvas runtimeJose Antonio Marquez2012-03-12
| | * | | | | | | | | | | | | | | | Merge branch 'refs/heads/FileIO-Integration' into FileIOJose Antonio Marquez2012-03-11
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | | | Add temp delay for webGL previewJose Antonio Marquez2012-03-10
| | | * | | | | | | | | | | | | | | | Merge branch 'refs/heads/FileIO-Integration' into FileIO-Build-CandidateJose Antonio Marquez2012-03-10
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | | | | | Temp Runtime WebGL FixJose Antonio Marquez2012-03-10
| | | | * | | | | | | | | | | | | | | | Setting local path to assetsJose Antonio Marquez2012-03-10
| | | | * | | | | | | | | | | | | | | | Merge branch 'refs/heads/Ninja-Internal' into FileIO-IntegrationJose Antonio Marquez2012-03-09
| | | | |\| | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | Merge branch 'refs/heads/Ninja-Internal' into FileIO-Build-CandidateJose Antonio Marquez2012-03-09
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / / / / / / / / | | | | |/| | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | reverting old pi dataValerio Virgillito2012-03-09
| | | * | | | | | | | | | | | | | | | | Merge branch 'refs/heads/Ninja-Internal' into FileIO-Build-CandidateJose Antonio Marquez2012-03-09
| | | |\| | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | Merge branch 'refs/heads/Ninja-Internal' into FileIO-Build-CandidateJose Antonio Marquez2012-03-09
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |_|_|_|_|_|_|_|_|_|_|_|/ / / / | | | | |/| | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | reverting old pi dataValerio Virgillito2012-03-09
| | * | | | | | | | | | | | | | | | | | Merge branch 'refs/heads/Ninja-Internal' into FileIOJose Antonio Marquez2012-03-09
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|/ / / / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | Merge branch 'refs/heads/Ninja-Internal' into FileIOJose Antonio Marquez2012-03-09
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / / / / / / / / / | | |/| | / / / / / / / / / / / / / / / | | | | |/ / / / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | Merge branch 'integration' of github.com:ericmueller/ninja-internal into inte...hwc4872012-03-09
|\| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | Merge pull request #3 from joseeight/FileIO-IntegrationEric2012-03-09
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | Merge branch 'refs/heads/Ninja-Internal' into FileIO-IntegrationJose Antonio Marquez2012-03-09
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|/ / / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | |