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

Browse Source

# Conflicts:
#	Content/Maps/Test_Level.umap
#	Content/Maps/Test_Level_BuiltData.uasset
#	Content/Maps/Yard.umap

...

This commit is contained in:

Lenta_Mebiusa

2020-12-10 18:43:50 +05:00

parent 1663debbce 8857627567

commit f98bfa702b

142 changed files with 14 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/Maps/DayLight.umap

BIN

Binary file not shown.

Content/Maps/Grass.umap

BIN

Binary file not shown.

Content/Maps/MainScene.umap

BIN

Binary file not shown.

Content/Maps/NightLight.umap

BIN

Binary file not shown.

Content/Maps/Test_Level.umap

BIN

Binary file not shown.

Content/Maps/Test_Level_BuiltData.uasset

BIN

Binary file not shown.

Content/Maps/shadowMeshes.umap

BIN

Binary file not shown.