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

Browse Source

# Conflicts:
#	Content/Maps/Landscape.umap
#	Content/SkatePark/Naberez_Model/fix/Yard/MI_Roof6.uasset
#	Content/SkatePark/Naberez_Model/fix/Yard/umsmah1g_2K_Normal.uasset

...

This commit is contained in:

Andron666

2022-02-28 19:04:31 +05:00

parent 1c18765aab bed61ac1a4

commit 4508fbf18b

16 changed files with 2 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/Player/GI.uasset

BIN

Binary file not shown.

Content/Blueprints/UI/Materials/M_InfraGPs.uasset

BIN

Binary file not shown.

Content/Blueprints/UI/Materials/M_InfraRing.uasset

BIN

Binary file not shown.

Content/Maps/MainScene.umap

BIN

Binary file not shown.

Content/Maps/MainSceneMigrate.umap

BIN

Binary file not shown.

Content/Maps/NightLightSpots.umap

BIN

Binary file not shown.

Content/Meshes/Outside/Outside_building_Outside_main_1.uasset

BIN

Binary file not shown.

Content/Meshes/Outside/Outside_building_Outside_main_2.uasset

BIN

Binary file not shown.

Content/Meshes/Outside/Outside_building_Outside_main_3.uasset

BIN

Binary file not shown.

Content/Meshes/Outside/Outside_building_Outside_main_4.uasset

BIN

Binary file not shown.

Content/Meshes/Outside/Outside_building_Outside_main_5.uasset

BIN

Binary file not shown.

Content/SkatePark/Naberez_Model/fix/Yard/MI_Roof6.uasset

BIN

Binary file not shown.

Content/SkatePark/Naberez_Model/fix/Yard/MI_Roof7.uasset

BIN

Binary file not shown.

Content/SkatePark/Naberez_Model/fix/Yard/umsmah1g_2K_Normal.uasset

BIN

Binary file not shown.

Content/UltraDynamicSky/Blueprints/Ultra_Dynamic_Sky.uasset

BIN

Binary file not shown.