Commit message (Collapse) | Author | Age | ||
---|---|---|---|---|
... | ||||
| | * | | | | | | | | | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja | John Mayhew | 2012-07-16 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / | |/| | | | | | | | | | | | | ||||
| | * | | | | | | | | | | | | Trademark Update - added trademarked Ninja name to the splash screen and ↵ | John Mayhew | 2012-07-16 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | about box. | |||
* | | | | | | | | | | | | | | Merge branch 'refs/heads/master' into v0.7.1 | Valerio Virgillito | 2012-07-16 | |
|\| | | | | | | | | | | | | | ||||
| * | | | | | | | | | | | | | Merge pull request #391 from joseeight/Color | Valerio Virgillito | 2012-07-14 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / | |/| | | | | | | | | | | | | Fix: IKNINJA-1634 | |||
| | * | | | | | | | | | | | | Merge branch 'refs/heads/Ninja-Master' into Color | Jose Antonio Marquez | 2012-07-11 | |
| | |\| | | | | | | | | | | | ||||
| | * | | | | | | | | | | | | Merge branch 'refs/heads/Ninja-Master' into Color | Jose Antonio Marquez | 2012-07-10 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ | ||||
| | * | | | | | | | | | | | | | Fixing IKNINJA-1634 | Jose Antonio Marquez | 2012-07-10 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adding a fix for referencing the stop from all elements on the gradient stop itself. | |||
| * | | | | | | | | | | | | | | Update Readme.md to fix some typos | San Khong | 2012-07-13 | |
| | |_|_|/ / / / / / / / / / | |/| | | | | | | | | | | | | ||||
* | | | | | | | | | | | | | | Merge branch 'refs/heads/master' into v0.7.1 | Valerio Virgillito | 2012-07-12 | |
|\| | | | | | | | | | | | | | ||||
| * | | | | | | | | | | | | | Merge pull request #389 from ericmueller/GridFixes | Valerio Virgillito | 2012-07-12 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / / / | |/| | | | | | | | | | | | | Grid fixes | |||
| | * | | | | | | | | | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja into GridFixes | hwc487 | 2012-07-11 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: assets/shaders/radialBlur.frag.glsl | |||
| | * | | | | | | | | | | | | re-wrote the radial blur shader. Changed tolerances in the deformation shaders. | hwc487 | 2012-07-11 | |
| | | | | | | | | | | | | | | ||||
| | * | | | | | | | | | | | | Tweak to an edge case in grid drawing. | hwc487 | 2012-07-10 | |
| | | | | | | | | | | | | | | ||||
| | * | | | | | | | | | | | | Grid drawing changes | hwc487 | 2012-07-10 | |
| | | | | | | | | | | | | | | ||||
| | * | | | | | | | | | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵ | hwc487 | 2012-07-10 | |
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | GridFixes | |||
| | * | | | | | | | | | | | | Grid drawing fixes | hwc487 | 2012-07-10 | |
| | | | | | | | | | | | | | | ||||
| | * | | | | | | | | | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵ | hwc487 | 2012-07-09 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | GridFixes Conflicts: js/helper-classes/3D/StageLine.js | |||
| | * | | | | | | | | | | | | | Grid drawing fixes. | hwc487 | 2012-07-09 | |
| | | | | | | | | | | | | | | | ||||
| | * | | | | | | | | | | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵ | hwc487 | 2012-07-09 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|_|_|_|/ | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | GridFixes | |||
| | * | | | | | | | | | | | | | fix for grid drawing. | hwc487 | 2012-07-09 | |
| | | | | | | | | | | | | | | | ||||
| | * | | | | | | | | | | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵ | hwc487 | 2012-07-03 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | GridFixes | |||
| | * | | | | | | | | | | | | | | fixes for grid drawing. | hwc487 | 2012-07-03 | |
| | | | | | | | | | | | | | | | | ||||
| | * | | | | | | | | | | | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵ | hwc487 | 2012-07-02 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|_|_|/ / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | GridFixes | |||
| | * | | | | | | | | | | | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵ | hwc487 | 2012-06-29 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|_|_|_|/ / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | GridFixes | |||
* | | / | | | | | | | | | | | | | Creating a v0.7.1 branch and updating the manifest.json accordingly | Valerio Virgillito | 2012-07-12 | |
|/ / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Created a v.0.7.1 branch for critical bug fixes. Signed-off-by: Valerio Virgillito <valerio@motorola.com> | |||
* | | | | | | | | | | | | | | | Update master | San Khong | 2012-07-11 | |
| | | | | | | | | | | | | | | | ||||
* | | | | | | | | | | | | | | | Update master | San Khong | 2012-07-11 | |
| | | | | | | | | | | | | | | | ||||
* | | | | | | | | | | | | | | | Update master | San Khong | 2012-07-11 | |
| | | | | | | | | | | | | | | | ||||
* | | | | | | | | | | | | | | | Merge pull request #388 from mayhewinator/master | Valerio Virgillito | 2012-07-10 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | final updates for Chrome App store release | |||
| * | | | | | | | | | | | | | | | Fix for incorrect doctype in last commit | John Mayhew | 2012-07-10 | |
| | | | | | | | | | | | | | | | | ||||
| * | | | | | | | | | | | | | | | final updates for Chrome App store release | John Mayhew | 2012-07-10 | |
|/ / / / / / / / / / / / / / / |