Dron 27c44856c4 Merge branch 'master' of http://192.168.1.163:3000/Zheka3777123/URA ...

# Conflicts:
#	Content/Level/Environment.umap
#	Content/Level/S2F1.umap
#	Content/Meshes/Building_3/SM_Bld4_Annex.uasset

2019-10-28 22:30:58 +05:00

..

AssetPacks

Merge branch 'master' of http://192.168.1.163:3000/Zheka3777123/URA

2019-10-28 22:30:58 +05:00

AutomotiveMaterials

…

Blueprints

…

ChildrenAnimation

…

Instances

…

Level

Merge branch 'master' of http://192.168.1.163:3000/Zheka3777123/URA

2019-10-28 22:30:58 +05:00

Materials

Merge branch 'master' of http://192.168.1.163:3000/Zheka3777123/URA

2019-10-28 22:30:58 +05:00

Meshes

Merge branch 'master' of http://192.168.1.163:3000/Zheka3777123/URA

2019-10-28 22:30:58 +05:00

Movies

…

PeopleSplineWalk

…

SkeletalMeshes/Lift

…

StarterContent

…

Textures

…

NewTextureRenderTargetCube_Tex1.uasset

…

NewTextureRenderTargetCube.uasset

…

SM_SportsGround_007.uasset

…

SM_SportsGround_017.uasset

…

SM_SportsGround_018.uasset

…

SM_SportsGround_019.uasset

…

SM_SportsGround_020.uasset

…

SM_SportsGround_021.uasset

…

SM_SportsGround_022.uasset

…

SM_SportsGround_023.uasset

…

SM_SportsGround_024.uasset

…

SM_SportsGround_025.uasset

…

SM_SportsGround_026.uasset

…

SM_SportsGround_027.uasset

…