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

Browse Source

Conflicts:
	Content/Blueprints/MyCharacter.uasset

...

This commit is contained in:

keb

2015-04-29 01:06:35 +09:00

parent 360946747e 6084119deb

commit 97b39bdd98

92 changed files with 0 additions and 0 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

Content/Blueprints/MyCharacter.uasset

BIN

Binary file not shown.

Content/FirstLevel/AsphaltNormal.uasset

BIN

Binary file not shown.

Content/FirstLevel/BaseTexture/AsphaltNormal.uasset

BIN

Binary file not shown.

Content/FirstLevel/BaseTexture/BlackAsphalt.uasset

BIN

Binary file not shown.

Content/FirstLevel/BaseTexture/Line.uasset

BIN

Binary file not shown.

Content/FirstLevel/BaseTexture/WhiteAsphalt.uasset

BIN

Binary file not shown.

Content/FirstLevel/BaseTexture/Window.uasset

BIN

Binary file not shown.

Content/FirstLevel/BaseTexture/WindowN.uasset

BIN

Binary file not shown.

Content/FirstLevel/BlackAsphalt.uasset

BIN

Binary file not shown.

Content/FirstLevel/Buildings/109style.uasset

BIN

Binary file not shown.

Content/FirstLevel/Buildings/BasicBuilding.uasset

BIN

Binary file not shown.

Content/FirstLevel/Buildings/BigBasicBuilding.uasset

BIN

Binary file not shown.

Content/FirstLevel/Buildings/BigTower.uasset

BIN

Binary file not shown.

Content/FirstLevel/Buildings/M_BlueWindow.uasset

BIN

Binary file not shown.

Content/FirstLevel/Buildings/M_Concrete_Poured.uasset

BIN

Binary file not shown.

Content/FirstLevel/Buildings/ThinBasicBuilding.uasset

BIN

Binary file not shown.

Content/FirstLevel/Buildings/Window.uasset

BIN

Binary file not shown.

Content/FirstLevel/Buildings/WindowN.uasset

BIN

Binary file not shown.

Content/FirstLevel/Buildings/ikebukuroStyleTower.uasset

BIN

Binary file not shown.

Content/FirstLevel/Buildings/reallyBigBuilding.uasset

BIN

Binary file not shown.

Content/FirstLevel/Buildings/simpleTower.uasset

BIN

Binary file not shown.

Content/FirstLevel/Buildings/triangleBuilding.uasset

BIN

Binary file not shown.

Content/FirstLevel/Buildings/twinTower.uasset

BIN

Binary file not shown.

Content/FirstLevel/FirstLevel.umap

BIN

Binary file not shown.

Content/FirstLevel/M_Asphalt.uasset

BIN

Binary file not shown.

Content/FirstLevel/M_whiteAsphalt.uasset

BIN

Binary file not shown.

Content/FirstLevel/Materials/M_BlackWindow.uasset

BIN

Binary file not shown.

Content/FirstLevel/Materials/M_BlueWindow.uasset

BIN

Binary file not shown.

Content/FirstLevel/Materials/M_WindowBuilding.uasset

BIN

Binary file not shown.

Content/FirstLevel/Materials/WhiteConcrete.uasset

BIN

Binary file not shown.

Content/FirstLevel/WhiteAsphalt.uasset

BIN

Binary file not shown.

Content/FirstLevel/Window.uasset

BIN

Binary file not shown.

Content/FirstLevel/WindowN.uasset

BIN

Binary file not shown.

Content/FirstLevel/actors/StreetLight.uasset

BIN

Binary file not shown.

Content/FirstLevel/actors/streetLight_BP.uasset

BIN

Binary file not shown.

Content/FirstLevel/decoration/FullTube.uasset

BIN

Binary file not shown.

Content/FirstLevel/decoration/Generator.uasset

BIN

Binary file not shown.

Content/FirstLevel/decoration/floorLight.uasset

BIN

Binary file not shown.

Content/FirstLevel/decoration/halfTube.uasset

BIN

Binary file not shown.

Content/FirstLevel/decoration/halfTubeToFullTube.uasset

BIN

Binary file not shown.

Content/FirstLevel/decoration/streetBar.uasset

BIN

Binary file not shown.

Content/FirstLevel/decoration/streetFance.uasset

BIN

Binary file not shown.

Content/FirstLevel/decoration/streetSupport.uasset

BIN

Binary file not shown.

Content/FirstLevel/decoration/traficLight.uasset

BIN

Binary file not shown.

Content/FirstLevel/decoration/treePlace.uasset

BIN

Binary file not shown.

Content/FirstLevel/decoration/tubeJunction.uasset

BIN

Binary file not shown.

Content/FirstLevel/decoration/wierdDecoration.uasset

BIN

Binary file not shown.

Content/FirstLevel/decoration/wierdDecoration2.uasset

BIN

Binary file not shown.

Content/Maps/NewTuto.umap

BIN

Binary file not shown.

Content/Materials/PureWhiteFloor.uasset

BIN

Binary file not shown.

Content/Materials/RibonMaterial.uasset

BIN

Binary file not shown.

Content/Mesh/arrow.uasset

BIN

Binary file not shown.

OriginalContent/Asphalt/._AsphaltNormal.png

Executable

BIN

Binary file not shown.

OriginalContent/Asphalt/._BlackAsphalt.png

Executable

BIN

Binary file not shown.

OriginalContent/Asphalt/._Line.png

Executable

BIN

Binary file not shown.

OriginalContent/Asphalt/._WhiteAsphalt.png

Executable

BIN

Binary file not shown.

OriginalContent/Asphalt/AsphaltNormal.png

Executable

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 12 MiB

OriginalContent/Asphalt/BlackAsphalt.png

Executable

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 5.6 MiB

OriginalContent/Asphalt/Line.png

Executable

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 37 KiB

OriginalContent/Asphalt/WhiteAsphalt.png

Executable

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 5.6 MiB

OriginalContent/Window.png

Executable

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 37 KiB

OriginalContent/WindowN.png

Executable

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 37 KiB

OriginalContent/blends/buildings.blend

BIN

Binary file not shown.

OriginalContent/blends/buildings.blend1

BIN

Binary file not shown.

OriginalContent/blends/city decoration.blend

BIN

Binary file not shown.

OriginalContent/blends/city decoration.blend1

BIN

Binary file not shown.

OriginalContent/fbx/109style.fbx

BIN

Binary file not shown.

OriginalContent/fbx/BasicBuilding.fbx

BIN

Binary file not shown.

OriginalContent/fbx/BigBasicBuilding.fbx

BIN

Binary file not shown.

OriginalContent/fbx/BigTower.fbx

BIN

Binary file not shown.

OriginalContent/fbx/FullTube.fbx

BIN

Binary file not shown.

OriginalContent/fbx/Generator.fbx

BIN

Binary file not shown.

OriginalContent/fbx/StreetLight.fbx

BIN

Binary file not shown.

OriginalContent/fbx/ThinBasicBuilding.fbx

BIN

Binary file not shown.

OriginalContent/fbx/arrow.fbx

BIN

Binary file not shown.

OriginalContent/fbx/floorLight.fbx

BIN

Binary file not shown.

OriginalContent/fbx/frontBuilding.fbx

BIN

Binary file not shown.

OriginalContent/fbx/halfTube.fbx

BIN

Binary file not shown.

OriginalContent/fbx/halfTubeToFullTube.fbx

BIN

Binary file not shown.

OriginalContent/fbx/ikebukuroStyleTower.fbx

BIN

Binary file not shown.

OriginalContent/fbx/reallyBigBuilding.fbx

BIN

Binary file not shown.

OriginalContent/fbx/simpleTower.fbx

BIN

Binary file not shown.

OriginalContent/fbx/streetBar.fbx

BIN

Binary file not shown.

OriginalContent/fbx/streetFance.fbx

BIN

Binary file not shown.

OriginalContent/fbx/streetSupport.fbx

BIN

Binary file not shown.

OriginalContent/fbx/traficLight.fbx

BIN

Binary file not shown.

OriginalContent/fbx/treePlace.fbx

BIN

Binary file not shown.

OriginalContent/fbx/triangleBuilding.fbx

BIN

Binary file not shown.

OriginalContent/fbx/tubeJunction.fbx

BIN

Binary file not shown.

OriginalContent/fbx/twinTower.fbx

BIN

Binary file not shown.

OriginalContent/fbx/wierdDecoration.fbx

BIN

Binary file not shown.

OriginalContent/fbx/wierdDecoration2.fbx

BIN

Binary file not shown.