Merge branch 'master' of http://192.168.1.163:3000/Dron/Ivazovsky into developer

Browse Source

# Conflicts:
#	Content/Maps/Landscape.umap

...

This commit is contained in:

Andron666

2021-12-09 16:54:35 +05:00

parent d0b40aa55b 51ef6fb17a

commit 5ae34fd240

7 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/Maps/L_Lighting.umap

BIN

Binary file not shown.

Content/Maps/Landscape.umap

BIN

Binary file not shown.

Content/Maps/MainSceneMigrate.umap

BIN

Binary file not shown.

Content/Materials/LandscapeMaterials/M_Asphalt_Inst3.uasset

BIN

Binary file not shown.

Content/Meshes/generalPlan/Genplan_2.uasset

BIN

Binary file not shown.

Content/Meshes/generalPlan/Genplan_3.uasset

BIN

Binary file not shown.

Content/Meshes/generalPlan/Genplan_4.uasset

BIN

Binary file not shown.