Merge branch 'master' of https://github.com/opencog/unity3d-opencog-game

githart · Oct 30, 2013 · cbd4612 · cbd4612
2 parents f48bcd8 + adc2d56
commit cbd4612
Show file tree

Hide file tree

Showing 13 changed files with 35 additions and 0 deletions.
diff --git a/Assets/StreamingAssets/TestScene3.meta b/Assets/StreamingAssets/TestScene3.meta
diff --git a/Assets/StreamingAssets/TestScene3/data.meta b/Assets/StreamingAssets/TestScene3/data.meta
diff --git a/Assets/StreamingAssets/TestScene3/data/villages.dat b/Assets/StreamingAssets/TestScene3/data/villages.dat
diff --git a/Assets/StreamingAssets/TestScene3/data/villages.dat.meta b/Assets/StreamingAssets/TestScene3/data/villages.dat.meta
diff --git a/Assets/StreamingAssets/TestScene3/level.dat b/Assets/StreamingAssets/TestScene3/level.dat
diff --git a/Assets/StreamingAssets/TestScene3/level.dat.meta b/Assets/StreamingAssets/TestScene3/level.dat.meta
diff --git a/Assets/StreamingAssets/TestScene3/level.dat_old b/Assets/StreamingAssets/TestScene3/level.dat_old
diff --git a/Assets/StreamingAssets/TestScene3/level.dat_old.meta b/Assets/StreamingAssets/TestScene3/level.dat_old.meta
diff --git a/Assets/StreamingAssets/TestScene3/region.meta b/Assets/StreamingAssets/TestScene3/region.meta
diff --git a/Assets/StreamingAssets/TestScene3/region/r.0.0.mca b/Assets/StreamingAssets/TestScene3/region/r.0.0.mca
diff --git a/Assets/StreamingAssets/TestScene3/region/r.0.0.mca.meta b/Assets/StreamingAssets/TestScene3/region/r.0.0.mca.meta
diff --git a/Assets/StreamingAssets/TestScene3/session.lock b/Assets/StreamingAssets/TestScene3/session.lock
diff --git a/Assets/StreamingAssets/TestScene3/session.lock.meta b/Assets/StreamingAssets/TestScene3/session.lock.meta