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

# Conflicts:
#	Content/Level/Environment.umap
#	Content/Level/GenPlan.umap
#	Content/Level/Index.umap
#	Content/Level/People.umap

2019-12-10 18:14:37 +05:00

..

AssetPacks

…

AutomotiveMaterials

…

Blueprints

…

ChildrenAnimation

…

Instances

…

Level

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

2019-12-10 18:14:37 +05:00

Materials

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

2019-12-10 18:14:37 +05:00

Meshes

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

2019-12-10 18:14:37 +05:00

Movies

…

PeopleSplineWalk

…

SkeletalMeshes

…

Splash

…

StarterContent

…

Textures

…

NewTextureRenderTargetCube_Tex1.uasset

…

NewTextureRenderTargetCube_Tex.uasset

…

NewTextureRenderTargetCube.uasset

…