Andron666 d9e7802ef8 Merge branch 'Danis' of http://192.168.1.163:3000/Dron/Onejsky4U ...

# Conflicts:
#	Content/Maps/MainScene.umap
#	Content/Maps/S01/S01F03.umap
#	Content/Maps/S04/S04F03/S04F03.umap
#	Content/Meshes/Danis/S01/SM_S01_01.uasset

2021-03-22 12:50:09 +05:00

..

AssetPacks

…

Assets

…

Blueprints

выгрузка в эксель, еще куски плагина отку да то

2021-03-22 12:47:48 +05:00

content/AssetPacks/bedroom

…

Instances

…

Kitchen_Maps

…

Kitchen_Materials

…

Maps

Merge branch 'Danis' of http://192.168.1.163:3000/Dron/Onejsky4U

2021-03-22 12:50:09 +05:00

Materials

Merge branch 'Danis' of http://192.168.1.163:3000/Dron/Onejsky4U

2021-03-22 12:50:09 +05:00

Megascans

…

Meshes

Merge branch 'Danis' of http://192.168.1.163:3000/Dron/Onejsky4U

2021-03-22 12:50:09 +05:00

Movies

…

MSPresets

…

Sequences

…

Shower

…

SkeletalMeshes/People

…

Splash

…

Textures

…