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

Conflicts: Content/Blueprints/MyCharacter.uasset
2015-04-29 01:06:35 +09:00
parent 360946747e 6084119deb
commit 97b39bdd98
92 changed files with 0 additions and 0 deletions
--- a/Content/Blueprints/MyCharacter.uasset
+++ b/Content/Blueprints/MyCharacter.uasset
--- a/Content/FirstLevel/AsphaltNormal.uasset
+++ b/Content/FirstLevel/AsphaltNormal.uasset
--- a/Content/FirstLevel/BaseTexture/AsphaltNormal.uasset
+++ b/Content/FirstLevel/BaseTexture/AsphaltNormal.uasset
--- a/Content/FirstLevel/BaseTexture/BlackAsphalt.uasset
+++ b/Content/FirstLevel/BaseTexture/BlackAsphalt.uasset
--- a/Content/FirstLevel/BaseTexture/Line.uasset
+++ b/Content/FirstLevel/BaseTexture/Line.uasset
--- a/Content/FirstLevel/BaseTexture/WhiteAsphalt.uasset
+++ b/Content/FirstLevel/BaseTexture/WhiteAsphalt.uasset
--- a/Content/FirstLevel/BaseTexture/Window.uasset
+++ b/Content/FirstLevel/BaseTexture/Window.uasset
--- a/Content/FirstLevel/BaseTexture/WindowN.uasset
+++ b/Content/FirstLevel/BaseTexture/WindowN.uasset
--- a/Content/FirstLevel/BlackAsphalt.uasset
+++ b/Content/FirstLevel/BlackAsphalt.uasset
--- a/Content/FirstLevel/Buildings/109style.uasset
+++ b/Content/FirstLevel/Buildings/109style.uasset
--- a/Content/FirstLevel/Buildings/BasicBuilding.uasset
+++ b/Content/FirstLevel/Buildings/BasicBuilding.uasset
--- a/Content/FirstLevel/Buildings/BigBasicBuilding.uasset
+++ b/Content/FirstLevel/Buildings/BigBasicBuilding.uasset
--- a/Content/FirstLevel/Buildings/BigTower.uasset
+++ b/Content/FirstLevel/Buildings/BigTower.uasset
--- a/Content/FirstLevel/Buildings/M_BlueWindow.uasset
+++ b/Content/FirstLevel/Buildings/M_BlueWindow.uasset
--- a/Content/FirstLevel/Buildings/M_Concrete_Poured.uasset
+++ b/Content/FirstLevel/Buildings/M_Concrete_Poured.uasset
--- a/Content/FirstLevel/Buildings/ThinBasicBuilding.uasset
+++ b/Content/FirstLevel/Buildings/ThinBasicBuilding.uasset
--- a/Content/FirstLevel/Buildings/Window.uasset
+++ b/Content/FirstLevel/Buildings/Window.uasset
--- a/Content/FirstLevel/Buildings/WindowN.uasset
+++ b/Content/FirstLevel/Buildings/WindowN.uasset
--- a/Content/FirstLevel/Buildings/ikebukuroStyleTower.uasset
+++ b/Content/FirstLevel/Buildings/ikebukuroStyleTower.uasset
--- a/Content/FirstLevel/Buildings/reallyBigBuilding.uasset
+++ b/Content/FirstLevel/Buildings/reallyBigBuilding.uasset
--- a/Content/FirstLevel/Buildings/simpleTower.uasset
+++ b/Content/FirstLevel/Buildings/simpleTower.uasset
--- a/Content/FirstLevel/Buildings/triangleBuilding.uasset
+++ b/Content/FirstLevel/Buildings/triangleBuilding.uasset
--- a/Content/FirstLevel/Buildings/twinTower.uasset
+++ b/Content/FirstLevel/Buildings/twinTower.uasset
--- a/Content/FirstLevel/FirstLevel.umap
+++ b/Content/FirstLevel/FirstLevel.umap
--- a/Content/FirstLevel/M_Asphalt.uasset
+++ b/Content/FirstLevel/M_Asphalt.uasset
--- a/Content/FirstLevel/M_whiteAsphalt.uasset
+++ b/Content/FirstLevel/M_whiteAsphalt.uasset
--- 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/Materials/WhiteConcrete.uasset
+++ b/Content/FirstLevel/Materials/WhiteConcrete.uasset
--- a/Content/FirstLevel/WhiteAsphalt.uasset
+++ b/Content/FirstLevel/WhiteAsphalt.uasset
--- a/Content/FirstLevel/Window.uasset
+++ b/Content/FirstLevel/Window.uasset
--- a/Content/FirstLevel/WindowN.uasset
+++ b/Content/FirstLevel/WindowN.uasset
--- a/Content/FirstLevel/actors/StreetLight.uasset
+++ b/Content/FirstLevel/actors/StreetLight.uasset
--- a/Content/FirstLevel/actors/streetLight_BP.uasset
+++ b/Content/FirstLevel/actors/streetLight_BP.uasset
--- a/Content/FirstLevel/decoration/FullTube.uasset
+++ b/Content/FirstLevel/decoration/FullTube.uasset
--- a/Content/FirstLevel/decoration/Generator.uasset
+++ b/Content/FirstLevel/decoration/Generator.uasset
--- a/Content/FirstLevel/decoration/floorLight.uasset
+++ b/Content/FirstLevel/decoration/floorLight.uasset
--- a/Content/FirstLevel/decoration/halfTube.uasset
+++ b/Content/FirstLevel/decoration/halfTube.uasset
--- a/Content/FirstLevel/decoration/halfTubeToFullTube.uasset
+++ b/Content/FirstLevel/decoration/halfTubeToFullTube.uasset
--- a/Content/FirstLevel/decoration/streetBar.uasset
+++ b/Content/FirstLevel/decoration/streetBar.uasset
--- a/Content/FirstLevel/decoration/streetFance.uasset
+++ b/Content/FirstLevel/decoration/streetFance.uasset
--- a/Content/FirstLevel/decoration/streetSupport.uasset
+++ b/Content/FirstLevel/decoration/streetSupport.uasset
--- a/Content/FirstLevel/decoration/traficLight.uasset
+++ b/Content/FirstLevel/decoration/traficLight.uasset
--- a/Content/FirstLevel/decoration/treePlace.uasset
+++ b/Content/FirstLevel/decoration/treePlace.uasset
--- a/Content/FirstLevel/decoration/tubeJunction.uasset
+++ b/Content/FirstLevel/decoration/tubeJunction.uasset
--- a/Content/FirstLevel/decoration/wierdDecoration.uasset
+++ b/Content/FirstLevel/decoration/wierdDecoration.uasset
--- a/Content/FirstLevel/decoration/wierdDecoration2.uasset
+++ b/Content/FirstLevel/decoration/wierdDecoration2.uasset
--- a/Content/Maps/NewTuto.umap
+++ b/Content/Maps/NewTuto.umap
--- a/Content/Materials/PureWhiteFloor.uasset
+++ b/Content/Materials/PureWhiteFloor.uasset
--- a/Content/Materials/RibonMaterial.uasset
+++ b/Content/Materials/RibonMaterial.uasset
--- a/Content/Mesh/arrow.uasset
+++ b/Content/Mesh/arrow.uasset
--- a/OriginalContent/Asphalt/._AsphaltNormal.png
+++ b/OriginalContent/Asphalt/._AsphaltNormal.png
--- a/OriginalContent/Asphalt/._BlackAsphalt.png
+++ b/OriginalContent/Asphalt/._BlackAsphalt.png
--- a/OriginalContent/Asphalt/._Line.png
+++ b/OriginalContent/Asphalt/._Line.png
--- a/OriginalContent/Asphalt/._WhiteAsphalt.png
+++ b/OriginalContent/Asphalt/._WhiteAsphalt.png
--- a/OriginalContent/Asphalt/AsphaltNormal.png
+++ b/OriginalContent/Asphalt/AsphaltNormal.png
--- a/OriginalContent/Asphalt/BlackAsphalt.png
+++ b/OriginalContent/Asphalt/BlackAsphalt.png
--- a/OriginalContent/Asphalt/Line.png
+++ b/OriginalContent/Asphalt/Line.png
--- a/OriginalContent/Asphalt/WhiteAsphalt.png
+++ b/OriginalContent/Asphalt/WhiteAsphalt.png
--- a/OriginalContent/Window.png
+++ b/OriginalContent/Window.png
--- a/OriginalContent/WindowN.png
+++ b/OriginalContent/WindowN.png
--- a/OriginalContent/blends/buildings.blend
+++ b/OriginalContent/blends/buildings.blend
--- a/OriginalContent/blends/buildings.blend1
+++ b/OriginalContent/blends/buildings.blend1
--- a/OriginalContent/blends/city
+++ b/OriginalContent/blends/city
--- a/OriginalContent/blends/city
+++ b/OriginalContent/blends/city
--- a/OriginalContent/fbx/109style.fbx
+++ b/OriginalContent/fbx/109style.fbx
--- a/OriginalContent/fbx/BasicBuilding.fbx
+++ b/OriginalContent/fbx/BasicBuilding.fbx
--- a/OriginalContent/fbx/BigBasicBuilding.fbx
+++ b/OriginalContent/fbx/BigBasicBuilding.fbx
--- a/OriginalContent/fbx/BigTower.fbx
+++ b/OriginalContent/fbx/BigTower.fbx
--- a/OriginalContent/fbx/FullTube.fbx
+++ b/OriginalContent/fbx/FullTube.fbx
--- a/OriginalContent/fbx/Generator.fbx
+++ b/OriginalContent/fbx/Generator.fbx
--- a/OriginalContent/fbx/StreetLight.fbx
+++ b/OriginalContent/fbx/StreetLight.fbx
--- a/OriginalContent/fbx/ThinBasicBuilding.fbx
+++ b/OriginalContent/fbx/ThinBasicBuilding.fbx
--- a/OriginalContent/fbx/arrow.fbx
+++ b/OriginalContent/fbx/arrow.fbx
--- a/OriginalContent/fbx/floorLight.fbx
+++ b/OriginalContent/fbx/floorLight.fbx
--- a/OriginalContent/fbx/frontBuilding.fbx
+++ b/OriginalContent/fbx/frontBuilding.fbx
--- a/OriginalContent/fbx/halfTube.fbx
+++ b/OriginalContent/fbx/halfTube.fbx
--- a/OriginalContent/fbx/halfTubeToFullTube.fbx
+++ b/OriginalContent/fbx/halfTubeToFullTube.fbx
--- a/OriginalContent/fbx/ikebukuroStyleTower.fbx
+++ b/OriginalContent/fbx/ikebukuroStyleTower.fbx
--- a/OriginalContent/fbx/reallyBigBuilding.fbx
+++ b/OriginalContent/fbx/reallyBigBuilding.fbx
--- a/OriginalContent/fbx/simpleTower.fbx
+++ b/OriginalContent/fbx/simpleTower.fbx
--- a/OriginalContent/fbx/streetBar.fbx
+++ b/OriginalContent/fbx/streetBar.fbx
--- a/OriginalContent/fbx/streetFance.fbx
+++ b/OriginalContent/fbx/streetFance.fbx
--- a/OriginalContent/fbx/streetSupport.fbx
+++ b/OriginalContent/fbx/streetSupport.fbx
--- a/OriginalContent/fbx/traficLight.fbx
+++ b/OriginalContent/fbx/traficLight.fbx
--- a/OriginalContent/fbx/treePlace.fbx
+++ b/OriginalContent/fbx/treePlace.fbx
--- a/OriginalContent/fbx/triangleBuilding.fbx
+++ b/OriginalContent/fbx/triangleBuilding.fbx
--- a/OriginalContent/fbx/tubeJunction.fbx
+++ b/OriginalContent/fbx/tubeJunction.fbx
--- a/OriginalContent/fbx/twinTower.fbx
+++ b/OriginalContent/fbx/twinTower.fbx
--- a/OriginalContent/fbx/wierdDecoration.fbx
+++ b/OriginalContent/fbx/wierdDecoration.fbx
--- a/OriginalContent/fbx/wierdDecoration2.fbx
+++ b/OriginalContent/fbx/wierdDecoration2.fbx