Merge branch 'master' of github.com:teamMadScientist/celerity

2015-06-04 02:27:45 +09:00 · 2015-06-04 02:27:45 +09:00 · 080efa1ca8
commit 080efa1ca8
parent 83142c4749 d33f5effd8
10 changed files with 0 additions and 0 deletions
--- a/Content/FirstLevel/Buildings/BigBasicBuilding.uasset
+++ b/Content/FirstLevel/Buildings/BigBasicBuilding.uasset
--- a/Content/FirstLevel/FirstLevel.umap
+++ b/Content/FirstLevel/FirstLevel.umap
--- a/Content/FirstLevel/Materials/M_BlackWindow.uasset
+++ b/Content/FirstLevel/Materials/M_BlackWindow.uasset
--- a/Content/FirstLevel/Materials/M_BlueWindow.uasset
+++ b/Content/FirstLevel/Materials/M_BlueWindow.uasset
--- a/Content/FirstLevel/Materials/M_WindowBuilding.uasset
+++ b/Content/FirstLevel/Materials/M_WindowBuilding.uasset
--- a/Content/FirstLevel/actors/streetLight_BP.uasset
+++ b/Content/FirstLevel/actors/streetLight_BP.uasset
--- a/OriginalContent/blends/four.blend
+++ b/OriginalContent/blends/four.blend
--- a/OriginalContent/fbx/car1.fbx
+++ b/OriginalContent/fbx/car1.fbx
--- a/OriginalContent/fbx/car2.fbx
+++ b/OriginalContent/fbx/car2.fbx
--- a/OriginalContent/fbx/car3.fbx
+++ b/OriginalContent/fbx/car3.fbx