Zheka3777123 7f224f3cb6 Merge branch 'master' of http://192.168.1.163:3000/Maxim/COD ...

# Conflicts:
#	Content/Levels/BPLA.umap
#	Content/Materials/Material_Instances/MI_Scene_BPLA.uasset

2019-06-14 19:21:17 +05:00

..

AssetPacks

…

Audio

…

Blueprints

…

Levels

Merge branch 'master' of http://192.168.1.163:3000/Maxim/COD

2019-06-14 19:21:17 +05:00

Materials

Merge branch 'master' of http://192.168.1.163:3000/Maxim/COD

2019-06-14 19:21:17 +05:00

Meshes

получаю, окружение у птицелова

2019-06-14 19:15:31 +05:00

Movies

…

Sequence

…

Skeletal_Meshes

…

Splash

…

Textures

получаю, окружение у птицелова

2019-06-14 19:15:31 +05:00

BP_TestPlayer.uasset

…