aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
...
| | * | | | | | | | | | | Merge pull request #179 from joseeight/FileIOValerio Virgillito2012-04-26
| | |\ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / | | |/| | | | | | | | | | Fixing duplicate layer bug
| | | * | | | | | | | | | Merge branch 'refs/heads/Ninja-Internal' into FileIOJose Antonio Marquez2012-04-26
| | | |\| | | | | | | | |
| | | * | | | | | | | | | Fixing duplicate layer errorJose Antonio Marquez2012-04-26
| | | | | | | | | | | | |
| | | * | | | | | | | | | Fixing duplicate layer bugJose Antonio Marquez2012-04-26
| | | | | | | | | | | | |
| | | * | | | | | | | | | Merge branch 'refs/heads/Ninja-Internal' into FileIOJose Antonio Marquez2012-04-24
| | | |\ \ \ \ \ \ \ \ \ \ | | | | | |_|_|/ / / / / / | | | | |/| | | | | | | |
| | | * | | | | | | | | | Merge branch 'refs/heads/Ninja-Internal' into FileIOJose Antonio Marquez2012-04-20
| | | |\ \ \ \ \ \ \ \ \ \ | | | | | |_|_|_|/ / / / / | | | | |/| | | | | | | |
| | | * | | | | | | | | | Merge branch 'refs/heads/Ninja-Internal' into FileIOJose Antonio Marquez2012-04-20
| | | |\ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ Merge branch 'refs/heads/Ninja-Internal' into FileIOJose Antonio Marquez2012-04-16
| | | |\ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'refs/heads/Ninja-Internal' into FileIOJose Antonio Marquez2012-04-11
| | | |\ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'refs/heads/Ninja-Internal' into FileIOJose Antonio Marquez2012-04-10
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'refs/heads/Ninja-Internal' into FileIOJose Antonio Marquez2012-04-04
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'refs/heads/Ninja-Internal' into FileIOJose Antonio Marquez2012-04-04
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |_|_|_|_|_|_|_|_|_|_|_|/ / | | | | |/| | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | Merge branch 'refs/heads/Ninja-Internal' into FileIOJose Antonio Marquez2012-04-02
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'refs/heads/Ninja-Internal' into FileIOJose Antonio Marquez2012-03-28
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |_|_|_|_|_|_|_|_|_|_|_|_|/ / | | | | |/| | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | Merge branch 'refs/heads/Ninja-Internal' into FileIOJose Antonio Marquez2012-03-27
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |_|_|_|_|_|_|_|_|_|_|_|_|/ / | | | | |/| | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | Merge branch 'refs/heads/Ninja-Internal' into FileIOJose Antonio Marquez2012-03-26
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | | | | Adding Ninja URL method to io-mediatorJose Antonio Marquez2012-03-22
| | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | Merge branch 'refs/heads/Ninja-Internal' into FileIOJose Antonio Marquez2012-03-21
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge pull request #177 from mqg734/WebGLMaterialsValerio Virgillito2012-04-26
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / | | |/| | | | | | | | | | | | | | | | | | Fixed some rectangle radius bugs in canvas 2d mode. Also changed canvas 2d gradients to match what the browser renders for a div's background.
| | | * | | | | | | | | | | | | | | | | | Merge branch 'refs/heads/ninja-internal' into WebGLMaterialsNivesh Rajbhandari2012-04-25
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | Updating the canvas runtime files for gradient and rectangle radius fixes.Nivesh Rajbhandari2012-04-25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| | | * | | | | | | | | | | | | | | | | | IKNinja-406 - Strange behavior when changing the corner radius to the ↵Nivesh Rajbhandari2012-04-25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | maximum value. IKNinja-1236 - Corner radius is not applied if stroke size is >= 2 times the corner radius. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| | | * | | | | | | | | | | | | | | | | | Changing canvas-2d gradient drawing to more closely match div's ↵Nivesh Rajbhandari2012-04-25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | background-image gradient support. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| | | * | | | | | | | | | | | | | | | | | Merge branch 'refs/heads/ninja-internal' into WebGLMaterialsNivesh Rajbhandari2012-04-25
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / | | | | |/| | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | Fixed materials editor popup not refreshing correctly.Nivesh Rajbhandari2012-04-16
| | | | |_|_|_|_|_|_|_|_|_|_|/ / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| * | | | | | | | | | | | | | | | | | | Merge branch 'refs/heads/timeline-local' into TimelineUberJonathan Duran2012-04-26
|