aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAge
* 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-IntegrationJose Antonio Marquez2012-03-09
| |\ \
| * | | Fixing Issues for Windows LibJose Antonio Marquez2012-03-09
| * | | Merge pull request #33 from ericmueller/integrationJose Antonio Marquez Russo2012-03-09
| |\ \ \
| | * | | remap hard coded strings in rdge internal code.hwc4872012-03-09
| | * | | Merge branch 'FileIO-Integration' of github.com:joseeight/ninja-internal into...hwc4872012-03-09
| | |\ \ \
| | * | | | further removal of authortime asset path replacement.hwc4872012-03-09
| * | | | | Removing duplicate fileJose Antonio Marquez2012-03-09
| | |/ / / | |/| | |
| * | | | Clean upJose Antonio Marquez2012-03-09
| * | | | Merge pull request #32 from ericmueller/integrationJose Antonio Marquez Russo2012-03-09
| |\| | |
| | * | | Removed asset path replacement at authortime.hwc4872012-03-09
| | * | | Added asset folder replacement to runtime load.hwc4872012-03-09
| * | | | Adding missing file for webGL, still need a fix for runtimeJose Antonio Marquez2012-03-09
| |/ / /
| * | | Merge branch 'refs/heads/Ninja-Internal' into FileIO-IntegrationJose Antonio Marquez2012-03-09
| |\ \ \
| * | | | Adding webGL I/O runtime functionalityJose Antonio Marquez2012-03-09
| * | | | Merge branch 'refs/heads/integration' into FileIO-IntegrationJose Antonio Marquez2012-03-09
| |\ \ \ \
| | * | | | Canvas IOhwc4872012-03-08
* | | | | | 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 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
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
* | | | | | | | | | | | | | | | | | | | | | Merge branch 'refs/heads/Ninja-Internal' into FileIO-Build-CandidateJose Antonio Marquez2012-03-09
|\| | | | | | | | | | | | | | | | | | | | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internalValerio Virgillito2012-03-09
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'refs/heads/master' into montage-integrationValerio Virgillito2012-03-08
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | integrating v0.7 montage into ninjaValerio Virgillito2012-03-08
* | | | | | | | | | | | | | | | | | | | | | | Merge branch 'refs/heads/Ninja-Internal' into FileIOJose Antonio Marquez2012-03-08
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | Merge pull request #102 from dhg637/PanelsValerio Virgillito2012-03-08
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-04 17:07:51 +0000