Andron666 299a8d3f02 Merge branch 'master' of http://192.168.1.163:3000/Dron/UralskyExtDemo ...

# Conflicts:
#	Content/Level/GenPlan.umap
#	Content/Materials/M_newAsphalt.uasset

2020-07-14 18:53:38 +05:00

..

AssetPacks

…

Assets/Procedural_Ecosystem/Materials/Material_Functions

…

AutomotiveMaterials

…

Blueprints

…

CarAssetSedan/Sedan

…

ChildrenAnimation

…

CompactSUVCar/CompactSUV

…

Environment/Birds

…

Instances

Merge branch 'master' of http://192.168.1.163:3000/Dron/UralskyExtDemo

2020-07-14 18:53:38 +05:00

Level

…

LUTs

…

Materials

Merge branch 'master' of http://192.168.1.163:3000/Dron/UralskyExtDemo

2020-07-14 18:53:38 +05:00

Meshes

…

Movies

…

PeopleSplineWalk

…

SkeletalMeshes

…

Sounds

…

Splash

…

StarterContent

…

Textures

…

NewTextureRenderTargetCube.uasset

…