| Commit message (Collapse) | Author | Age | |
|---|---|---|---|
| * | Merge branch 'refs/heads/Ninja-Master' into Document | Jose Antonio Marquez | 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 | ||
| * | | | | | | | | | Improving Document Bar UI | Jose Antonio Marquez | 2012-07-12 |
| |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | Setting up new document bar UI to then set up switching document view modes. Improving layout of component and cleaning up. Added icons and button UI. | ||
| * | | | | | | | | 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 |
| |/ / / / / / / / | |||
| * | | | | | | | | Updating the Readme. | Valerio Virgillito | 2012-07-10 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| * | | | | | | | | Merge pull request #385 from ericmueller/ShadersRemoved | Valerio Virgillito | 2012-07-10 |
| |\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | | | Removed the shaders that we do not have rights to. | ||
| | * | | | | | | | Removed the shaders that we do not have rights to. | hwc487 | 2012-07-10 |
| |/ / / / / / / | |||
| * | | | | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal | Valerio Virgillito | 2012-07-09 |
| |\ \ \ \ \ \ \ | |||
| | * \ \ \ \ \ \ | Merge pull request #384 from mayhewinator/master | Valerio Virgillito | 2012-07-09 |
| | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | removed company name from app name in credits and license files | ||
| | | * | | | | | | | removed unnecessary company string in app name for license and credits | John Mayhew | 2012-07-09 |
| | | | | | | | | | | |||
| * | | | | | | | | | Add some <li> to the copyright notice | Valerio Virgillito | 2012-07-09 |
| |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| * | | | | | | | | Merge pull request #382 from mayhewinator/master | Valerio Virgillito | 2012-07-09 |
| |\| | | | | | | | | | | | | | | | | | | | | | | | fixed remaining copyrights and fixed capitalization for doctype tag | ||
| | * | | | | | | | fixed incorrect capitalization for DOCTYPE html | John Mayhew | 2012-07-09 |
| | | | | | | | | | |||
| | * | | | | | | | cleaned up remaining copyrights for release | John Mayhew | 2012-07-09 |
| | | | | | | | | | |||
| | * | | | | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal | John Mayhew | 2012-07-09 |
| | |\ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | |||
| * | | | | | | | | Merge pull request #381 from kriskowal/normalize | Valerio Virgillito | 2012-07-09 |
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Normalize HTML DOCTYPE | ||
| | * | | | | | | | | Normalize HTML DOCTYPE | Kris Kowal | 2012-07-09 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Was lower-case. Now upper-case. Also fixed BOMs, trailing white-space, DOS line terminators. Did not expand tabs to spaces. | ||
| | | * | | | | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal | John Mayhew | 2012-07-09 |
| | | |\ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: manifest.json | ||
| * | | | | | | | | | Merge pull request #380 from ananyasen/codemirror-custom-theme-removal | Valerio Virgillito | 2012-07-09 |
| |\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | | Codemirror custom theme removal | ||
| | * | | | | | | | | Merge branch 'refs/heads/ninja-internal-master' into ↵ | Ananya Sen | 2012-07-09 |
| | |\ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | codemirror-custom-theme-removal Conflicts: js/code-editor/codemirror-ninja/theme/lesser-dark-ninja.css js/code-editor/codemirror-ninja/theme/xq-dark-ninja.css Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com> | ||
| * | | | | | | | | | Merge branch 'refs/heads/Ninja-Internal' into Analytics | Jose Antonio Marquez | 2012-07-09 |
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| | * \ \ \ \ \ \ \ \ | Merge pull request #376 from kriskowal/bsd | Valerio Virgillito | 2012-07-09 |
| | |\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ | |/| | | | | | | | | BSD License | ||
| | | * | | | | | | | | BSD License | Kris Kowal | 2012-07-09 |
| | |/ / / / / / / / | |||
| * / / / / / / / / | Adding Google Analytics | Jose Antonio Marquez | 2012-07-09 |
| |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: index.html js/ninja.reel/ninja.html | ||
| * | | | | | | | | Merge branch 'normalize' of https://github.com/kriskowal/ninja-internal | Valerio Virgillito | 2012-07-09 |
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |||