Commit message (Expand) | Author | Age | |
---|---|---|---|
* | Merge pull request #5 from joseeight/FileIO-Integration | Eric | 2012-03-13 |
|\ | |||
| * | Cleaning up webGL runtime | Jose Antonio Marquez | 2012-03-13 |
| * | Clean up and TODOs | Jose Antonio Marquez | 2012-03-12 |
* | | Uber material changes for IO | hwc487 | 2012-03-12 |
* | | Merge branch 'integration' of github.com:ericmueller/ninja-internal into inte... | hwc487 | 2012-03-12 |
|\ \ | |||
| * | | Merge pull request #4 from joseeight/FileIO-Integration | Eric | 2012-03-12 |
| |\| | |||
| | * | Fix for 2D Canvas runtime | Jose Antonio Marquez | 2012-03-12 |
| | * | Merge branch 'refs/heads/FileIO-Integration' into FileIO | Jose Antonio Marquez | 2012-03-11 |
| | |\ | |||
| | | * | Add temp delay for webGL preview | Jose Antonio Marquez | 2012-03-10 |
| | | * | Merge branch 'refs/heads/FileIO-Integration' into FileIO-Build-Candidate | Jose Antonio Marquez | 2012-03-10 |
| | | |\ | |||
| | | | * | Temp Runtime WebGL Fix | Jose Antonio Marquez | 2012-03-10 |
| | | | * | Setting local path to assets | Jose Antonio Marquez | 2012-03-10 |
| | | | * | Merge branch 'refs/heads/Ninja-Internal' into FileIO-Integration | Jose Antonio Marquez | 2012-03-09 |
| | | | |\ | |||
| | | * | \ | Merge branch 'refs/heads/Ninja-Internal' into FileIO-Build-Candidate | Jose Antonio Marquez | 2012-03-09 |
| | | |\ \ \ | | | | | |/ | | | | |/| | |||
| | | | * | | reverting old pi data | Valerio Virgillito | 2012-03-09 |
| | | * | | | Merge branch 'refs/heads/Ninja-Internal' into FileIO-Build-Candidate | Jose Antonio Marquez | 2012-03-09 |
| | | |\| | | |||
| | | * | | | Merge branch 'refs/heads/Ninja-Internal' into FileIO-Build-Candidate | Jose Antonio Marquez | 2012-03-09 |
| | | |\ \ \ | |||
| | * | | | | | reverting old pi data | Valerio Virgillito | 2012-03-09 |
| | * | | | | | Merge branch 'refs/heads/Ninja-Internal' into FileIO | Jose Antonio Marquez | 2012-03-09 |
| | |\ \ \ \ \ | | | | |_|/ / | | | |/| | | | |||
| | * | | | | | Merge branch 'refs/heads/Ninja-Internal' into FileIO | Jose Antonio Marquez | 2012-03-09 |
| | |\ \ \ \ \ | | | |_|/ / / | | |/| | / / | | | | |/ / | | | |/| | | |||
* | | | | | | Merge branch 'integration' of github.com:ericmueller/ninja-internal into inte... | hwc487 | 2012-03-09 |
|\| | | | | | |||
| * | | | | | Merge pull request #3 from joseeight/FileIO-Integration | Eric | 2012-03-09 |
| |\ \ \ \ \ | | | |_|_|/ | | |/| | | | |||
| | * | | | | Merge branch 'refs/heads/Ninja-Internal' into FileIO-Integration | Jose Antonio Marquez | 2012-03-09 |
| | |\ \ \ \ | | | | |_|/ | | | |/| | | |||
| | | * | | | Merge pull request #106 from joseeight/Color | Valerio Virgillito | 2012-03-09 |
| | | |\ \ \ | | | | |_|/ | | | |/| | | |||
| | | | * | | Temp Gradient Fix | Jose Antonio Marquez | 2012-03-09 |
| | | | * | | Merge branch 'refs/heads/Ninja-Internal' into Color | Jose Antonio Marquez | 2012-03-09 |
| | | | |\ \ | | | | |/ / | | | |/| | | |||
| | | | * | | Merge branch 'refs/heads/Ninja-Internal' into Color | Jose Antonio Marquez | 2012-02-29 |
| | | | |\ \ | |||
| | | | * \ \ | Merge branch 'refs/heads/NinjaInternal' into Color | Jose Antonio Marquez | 2012-02-28 |
| | | | |\ \ \ | |||
| | | | * \ \ \ | Merge branch 'refs/heads/NinjaInternal' into Color | Jose Antonio Marquez | 2012-02-23 |
| | | | |\ \ \ \ | |||
| | | | * \ \ \ \ | Merge branch 'refs/heads/NinjaInternal' into Color | Jose Antonio Marquez | 2012-02-22 |
| | | | |\ \ \ \ \ | |||
| | | | * \ \ \ \ \ | Merge branch 'refs/heads/NinjaInternal' into Color | Jose Antonio Marquez | 2012-02-21 |
| | | | |\ \ \ \ \ \ | |||
| | | | * \ \ \ \ \ \ | Merge branch 'refs/heads/NinjaInternal' into Color | Jose Antonio Marquez | 2012-02-17 |
| | | | |\ \ \ \ \ \ \ | |||
| | | | * \ \ \ \ \ \ \ | Merge branch 'refs/heads/NinjaInternal' into Color | Jose Antonio Marquez | 2012-02-17 |
| | | | |\ \ \ \ \ \ \ \ | |||
| | | | * \ \ \ \ \ \ \ \ | Merge branch 'refs/heads/NinjaInternal' into Color | Jose Antonio Marquez | 2012-02-16 |
| | | | |\ \ \ \ \ \ \ \ \ | |||
| | | | * \ \ \ \ \ \ \ \ \ | Merge branch 'refs/heads/NinjaInternal' into Color | Jose Antonio Marquez | 2012-02-15 |
| | | | |\ \ \ \ \ \ \ \ \ \ | |||
| | | | * | | | | | | | | | | | Bug Fixes | Jose Antonio Marquez | 2012-02-11 |
| | | | * | | | | | | | | | | | Merge branch 'refs/heads/NinjaInternal' into Color | Jose Antonio Marquez | 2012-02-11 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ | |||
| | | | * \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'refs/heads/NinjaInternal' into Color | Jose Antonio Marquez | 2012-02-08 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ | |||
| | | | * \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'refs/heads/NinjaInternal' into Color | Jose Antonio Marquez | 2012-02-08 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'refs/heads/NinjaInternal' into Color | Jose Antonio Marquez | 2012-02-04 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'refs/heads/NinjaInternal' into Color | Jose Antonio Marquez | 2012-02-02 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge pull request #2 from mqg734/NiveshColor | Jose Antonio Marquez Russo | 2012-02-01 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'refs/heads/NinjaInternal' into Color | Jose Antonio Marquez | 2012-02-01 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge pull request #1 from mqg734/NiveshColor | Jose Antonio Marquez Russo | 2012-01-31 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| | * | | | | | | | | | | | | | | | | | | | | | Fixing Issues for Windows Lib | Jose Antonio Marquez | 2012-03-09 |
| | * | | | | | | | | | | | | | | | | | | | | | Merge pull request #33 from ericmueller/integration | Jose Antonio Marquez Russo | 2012-03-09 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | |||
* | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'FileIO-Integration' of github.com:joseeight/ninja-internal into... | hwc487 | 2012-03-09 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / / |/| / / / / / / / / / / / / / / / / / / / / / | |/ / / / / / / / / / / / / / / / / / / / / | |||
| * | | | | | | | | | | | | | | | | | | | | | Removing duplicate file | Jose Antonio Marquez | 2012-03-09 |
* | | | | | | | | | | | | | | | | | | | | | | remap hard coded strings in rdge internal code. | hwc487 | 2012-03-09 |
* | | | | | | | | | | | | | | | | | | | | | | Merge branch 'FileIO-Integration' of github.com:joseeight/ninja-internal into... | hwc487 | 2012-03-09 |
|\| | | | | | | | | | | | | | | | | | | | | |