aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
...
| | * | | | | | | | | | | | | Fixing IKNINJA-1634Jose Antonio Marquez2012-07-10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adding a fix for referencing the stop from all elements on the gradient stop itself.
| * | | | | | | | | | | | | | Update Readme.md to fix some typosSan Khong2012-07-13
| | |_|_|/ / / / / / / / / / | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | Merge branch 'refs/heads/master' into v0.7.1Valerio Virgillito2012-07-12
|\| | | | | | | | | | | | |
| * | | | | | | | | | | | | Merge pull request #389 from ericmueller/GridFixesValerio Virgillito2012-07-12
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / / / | |/| | | | | | | | | | | | Grid fixes
| | * | | | | | | | | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja into GridFixeshwc4872012-07-11
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: assets/shaders/radialBlur.frag.glsl
| | * | | | | | | | | | | | re-wrote the radial blur shader. Changed tolerances in the deformation shaders.hwc4872012-07-11
| | | | | | | | | | | | | |
| | * | | | | | | | | | | | Tweak to an edge case in grid drawing.hwc4872012-07-10
| | | | | | | | | | | | | |
| | * | | | | | | | | | | | Grid drawing changeshwc4872012-07-10
| | | | | | | | | | | | | |
| | * | | | | | | | | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵hwc4872012-07-10
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | GridFixes
| | * | | | | | | | | | | | Grid drawing fixeshwc4872012-07-10
| | | | | | | | | | | | | |
| | * | | | | | | | | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵hwc4872012-07-09
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | GridFixes Conflicts: js/helper-classes/3D/StageLine.js
| | * | | | | | | | | | | | | Grid drawing fixes.hwc4872012-07-09
| | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵hwc4872012-07-09
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|_|_|_|/ | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | GridFixes
| | * | | | | | | | | | | | | fix for grid drawing.hwc4872012-07-09
| | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵hwc4872012-07-03
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | GridFixes
| | * | | | | | | | | | | | | | fixes for grid drawing.hwc4872012-07-03
| | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵hwc4872012-07-02
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|_|_|/ / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | GridFixes
| | * | | | | | | | | | | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵hwc4872012-06-29
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|_|_|_|/ / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | GridFixes
* | | / | | | | | | | | | | | | Creating a v0.7.1 branch and updating the manifest.json accordinglyValerio Virgillito2012-07-12
|/ / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Created a v.0.7.1 branch for critical bug fixes. Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* | | | | | | | | | | | | | | Update masterSan Khong2012-07-11
| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | Update masterSan Khong2012-07-11
| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | Update masterSan Khong2012-07-11
| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge pull request #388 from mayhewinator/masterValerio Virgillito2012-07-10
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | final updates for Chrome App store release
| * | | | | | | | | | | | | | | Fix for incorrect doctype in last commitJohn Mayhew2012-07-10
| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | final updates for Chrome App store releaseJohn Mayhew2012-07-10
|/ / / / / / / / / / / / / / /
* | | | | | | | / / / / / / / Updating the Readme.Valerio Virgillito2012-07-10
| |_|_|_|_|_|_|/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* | | | | | | | | | | | | | Merge pull request #385 from ericmueller/ShadersRemovedValerio Virgillito2012-07-10
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / / / / / |/| | | | | | | | | | | | | Removed the shaders that we do not have rights to.
| * | | | | | | | | | | | | Removed the shaders that we do not have rights to.hwc4872012-07-10
|/ / / / / / / / / / / / /
* | | | | | | | | | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internalValerio Virgillito2012-07-09
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge pull request #384 from mayhewinator/masterValerio Virgillito2012-07-09
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | removed company name from app name in credits and license files
| | * | | | | | | | | | | | | removed unnecessary company string in app name for license and creditsJohn Mayhew2012-07-09