aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAge
* Corrections for Uber shader IOhwc4872012-03-14
* Fixed BumpMetal materialhwc4872012-03-13
* Merge pull request #5 from joseeight/FileIO-IntegrationEric2012-03-13
|\
| * Cleaning up webGL runtimeJose Antonio Marquez2012-03-13
| * Clean up and TODOsJose Antonio Marquez2012-03-12
* | Uber material changes for IOhwc4872012-03-12
* | Merge branch 'integration' of github.com:ericmueller/ninja-internal into inte...hwc4872012-03-12
|\ \
| * | Merge pull request #4 from joseeight/FileIO-IntegrationEric2012-03-12
| |\|
| | * Fix for 2D Canvas runtimeJose Antonio Marquez2012-03-12
| | * Merge branch 'refs/heads/FileIO-Integration' into FileIOJose Antonio Marquez2012-03-11
| | |\
| | | * Add temp delay for webGL previewJose Antonio Marquez2012-03-10
| | | * Merge branch 'refs/heads/FileIO-Integration' into FileIO-Build-CandidateJose Antonio Marquez2012-03-10
| | | |\
| | | | * Temp Runtime WebGL FixJose Antonio Marquez2012-03-10
| | | | * Setting local path to assetsJose Antonio Marquez2012-03-10
| | | | * Merge branch 'refs/heads/Ninja-Internal' into FileIO-IntegrationJose Antonio Marquez2012-03-09
| | | | |\
| | | * | \ Merge branch 'refs/heads/Ninja-Internal' into FileIO-Build-CandidateJose Antonio Marquez2012-03-09
| | | |\ \ \ | | | | | |/ | | | | |/|
| | | | * | reverting old pi dataValerio Virgillito2012-03-09
| | | * | | Merge branch 'refs/heads/Ninja-Internal' into FileIO-Build-CandidateJose Antonio Marquez2012-03-09
| | | |\| |
| | | * | | Merge branch 'refs/heads/Ninja-Internal' into FileIO-Build-CandidateJose Antonio Marquez2012-03-09
| | | |\ \ \
| | * | | | | reverting old pi dataValerio Virgillito2012-03-09
| | * | | | | Merge branch 'refs/heads/Ninja-Internal' into FileIOJose Antonio Marquez2012-03-09
| | |\ \ \ \ \ | | | | |_|/ / | | | |/| | |
| | * | | | | Merge branch 'refs/heads/Ninja-Internal' into FileIOJose Antonio Marquez2012-03-09
| | |\ \ \ \ \ | | | |_|/ / / | | |/| | / / | | | | |/ / | | | |/| |
* | | | | | Merge branch 'integration' of github.com:ericmueller/ninja-internal into inte...hwc4872012-03-09
|\| | | | |
| * | | | | Merge pull request #3 from joseeight/FileIO-IntegrationEric2012-03-09
| |\ \ \ \ \ | | | |_|_|/ | | |/| | |
| | * | | | Merge branch 'refs/heads/Ninja-Internal' into FileIO-IntegrationJose Antonio Marquez2012-03-09
| | |\ \ \ \ | | | | |_|/ | | | |/| |
| | | * | | Merge pull request #106 from joseeight/ColorValerio Virgillito2012-03-09
| | | |\ \ \ | | | | |_|/ | | | |/| |
| | | | * | Temp Gradient FixJose Antonio Marquez2012-03-09
| | | | * | Merge branch 'refs/heads/Ninja-Internal' into ColorJose Antonio Marquez2012-03-09
| | | | |\ \ | | | | |/ / | | | |/| |
| | | | * | Merge branch 'refs/heads/Ninja-Internal' into ColorJose Antonio Marquez2012-02-29
| | | | |\ \
| | | | * \ \ Merge branch 'refs/heads/NinjaInternal' into ColorJose Antonio Marquez2012-02-28
| | | | |\ \ \
| | | | * \ \ \ Merge branch 'refs/heads/NinjaInternal' into ColorJose Antonio Marquez2012-02-23
| | | | |\ \ \ \
| | | | * \ \ \ \ Merge branch 'refs/heads/NinjaInternal' into ColorJose Antonio Marquez2012-02-22
| | | | |\ \ \ \ \
| | | | * \ \ \ \ \ Merge branch 'refs/heads/NinjaInternal' into ColorJose Antonio Marquez2012-02-21
| | | | |\ \ \ \ \ \
| | | | * \ \ \ \ \ \ Merge branch 'refs/heads/NinjaInternal' into ColorJose Antonio Marquez2012-02-17
| | | | |\ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ \ Merge branch 'refs/heads/NinjaInternal' into ColorJose Antonio Marquez2012-02-17
| | | | |\ \ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ \ \ Merge branch 'refs/heads/NinjaInternal' into ColorJose Antonio Marquez2012-02-16
| | | | |\ \ \ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ \ \ \ Merge branch 'refs/heads/NinjaInternal' into ColorJose Antonio Marquez2012-02-15
| | | | |\ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | Bug FixesJose Antonio Marquez2012-02-11
| | | | * | | | | | | | | | | Merge branch 'refs/heads/NinjaInternal' into ColorJose Antonio Marquez2012-02-11
| | | | |\ \ \ \ \ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'refs/heads/NinjaInternal' into ColorJose Antonio Marquez2012-02-08
| | | | |\ \ \ \ \ \ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'refs/heads/NinjaInternal' into ColorJose Antonio Marquez2012-02-08
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'refs/heads/NinjaInternal' into ColorJose Antonio Marquez2012-02-04
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'refs/heads/NinjaInternal' into ColorJose Antonio Marquez2012-02-02
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge pull request #2 from mqg734/NiveshColorJose Antonio Marquez Russo2012-02-01
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'refs/heads/NinjaInternal' into ColorJose Antonio Marquez2012-02-01
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge pull request #1 from mqg734/NiveshColorJose Antonio Marquez Russo2012-01-31
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | | | | | Fixing Issues for Windows LibJose Antonio Marquez2012-03-09
| | * | | | | | | | | | | | | | | | | | | | | Merge pull request #33 from ericmueller/integrationJose Antonio Marquez Russo2012-03-09
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | Merge branch 'FileIO-Integration' of github.com:joseeight/ninja-internal into...hwc4872012-03-09
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / / |/| / / / / / / / / / / / / / / / / / / / / / | |/ / / / / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | | | | Removing duplicate fileJose Antonio Marquez2012-03-09
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-23 17:49:54 +0000