aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
...
| * | | | | | | | | | | | | | Merge branch 'refs/heads/Ninja-Master' into DocumentJose Antonio Marquez2012-07-12
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / / / / | | |/| | | | | | | | | | | |
| * | | | | | | | | | | | | | Improving Document Bar UIJose Antonio Marquez2012-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.
* | | | | | | | | | | | | | Merge pull request #394 from mayhewinator/masterValerio Virgillito2012-07-16
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / / / |/| | | | | | | | | | | | | Fixed incorrect comment blocks around our open source copyright notice
| * | | | | | | | | | | | | Added back one copyright block so it is properly included in the ninja.css ↵John Mayhew2012-07-16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | output file from SASS
| * | | | | | | | | | | | | Fixed incorrect comment blocks around our open source copyright notice. ↵John Mayhew2012-07-16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These incorrect comments kept us from being able to create the ninja.css file via SASS
* | | | | | | | | | | | | | Merge pull request #393 from mayhewinator/masterValerio Virgillito2012-07-16
|\| | | | | | | | | | | | | | |_|_|/ / / / / / / / / / |/| | | | | | | | | | | | Trademark Update-Added trademarked Ninja app name to about box and splash screen
| * | | | | | | | | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninjaJohn Mayhew2012-07-16
| |\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / |/| | | | | | | | | | | |
* | | | | | | | | | | | | Merge pull request #391 from joseeight/ColorValerio Virgillito2012-07-14
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix: IKNINJA-1634
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'refs/heads/Ninja-Master' into ColorJose Antonio Marquez2012-07-11
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / | | |/| | | | | | | | | | |
| * | | | | | | | | | | | | Merge branch 'refs/heads/Ninja-Master' into ColorJose Antonio Marquez2012-07-10
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Fixing IKNINJA-1634Jose Antonio Marquez2012-07-10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adding a fix for referencing the stop from all elements on the gradient stop itself.
| | | | * | | | | | | | | | | Trademark Update - added trademarked Ninja name to the splash screen and ↵John Mayhew2012-07-16
| |_|_|/ / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | about box.
* | | | | | | | | | | | | | Update Readme.md to fix some typosSan Khong2012-07-13
| |_|_|/ / / / / / / / / / |/| | | | | | | | | | | |
* | | | | | | | | | | | | 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
* | | | | | | | | | | | | 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
|/ / / / / / / / / / /
| * | | | | | | | | | 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
* | | | | | | | | | | 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
| | | | | | | | | | | | |
* | | | | | | | | | | | | Add some <li> to the copyright noticeValerio Virgillito2012-07-09
|/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* | | | | | | | | | | | Merge pull request #382 from mayhewinator/masterValerio Virgillito2012-07-09
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fixed remaining copyrights and fixed capitalization for doctype tag
| * | |