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

Browse Source

# Conflicts:
#	Content/Level/GenPlan.umap

...

This commit is contained in:

Lenta_Mebiusa

2019-12-09 20:22:19 +05:00

parent aaaa4e9967 7cd4c16242

commit 8731070af9

9 changed files with 0 additions and 0 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

Content/Blueprints/GrassGenerator.uasset

BIN

Binary file not shown.

Content/Blueprints/GrassGenerator1.uasset

BIN

Binary file not shown.

Content/Blueprints/Tramvay.uasset

BIN

Binary file not shown.

Content/Level/GenPlan.umap

BIN

Binary file not shown.

Content/Level/Rail_Way.umap

BIN

Binary file not shown.

Content/Meshes/Environment/SM_Tramvay_001.uasset

BIN

Binary file not shown.

Content/Meshes/Environment/SM_Tramvay_001_Anim_SM_Tramvay_001_SM_Tramvay_001Action.uasset

BIN

Binary file not shown.

Content/Meshes/Environment/SM_Tramvay_001_PhysicsAsset.uasset

BIN

Binary file not shown.

Content/Meshes/Environment/SM_Tramvay_001_Skeleton.uasset

BIN

Binary file not shown.