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

Browse Source

# Conflicts:
#	.gitignore
#	Content/Maps/Underground_parking_GP4.umap
#	Content/UltraDynamicSky/Blueprints/Ultra_Dynamic_Sky.uasset

...

This commit is contained in:

Andron666

2022-03-01 13:56:39 +05:00

parent 5d643ab427 5715cc3f0d

commit 5ad444850b

18 changed files with 1 additions and 2 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/Environment/Ultra_Dynamic_Sky.uasset

BIN

Binary file not shown.

Content/Blueprints/Environment/Ultra_Dynamic_Weather.uasset

BIN

Binary file not shown.

Content/Blueprints/Environment/Weather_Effects_Interface.uasset

BIN

Binary file not shown.

Content/Maps/L_Lighting.umap

BIN

Binary file not shown.

Content/Maps/MainSceneMigrate.umap

BIN

Binary file not shown.

Content/Materials/Instances/Ultra_Dynamic_Sky_Mat_SA.uasset

BIN

Binary file not shown.

Content/Materials/Instances/Ultra_Dynamic_Sky_Mat_SA_NA.uasset

BIN

Binary file not shown.

Content/Materials/Instances/Ultra_Dynamic_Sky_Mat_SA_NA_OCL.uasset

BIN

Binary file not shown.

Content/Materials/Instances/Ultra_Dynamic_Sky_Mat_SA_NDC.uasset

BIN

Binary file not shown.

Content/Materials/Instances/Ultra_Dynamic_Sky_Mat_SA_NDC_NA.uasset

BIN

Binary file not shown.

Content/Materials/Instances/Ultra_Dynamic_Sky_Mat_SA_OCL.uasset

BIN

Binary file not shown.

Content/Materials/Instances/Ultra_Dynamic_Sky_Mat_default.uasset

BIN

Binary file not shown.

Content/Materials/Instances/Ultra_Dynamic_Sky_Mat_no_auroras.uasset

BIN

Binary file not shown.

Content/Materials/Instances/Ultra_Dynamic_Sky_Mat_no_auroras_onecloudlayer.uasset

BIN

Binary file not shown.

Content/Materials/Instances/Ultra_Dynamic_Sky_Mat_onecloudlayer.uasset

BIN

Binary file not shown.

Content/Materials/Master/Ultra_Dynamic_Sky_Mat.uasset

BIN

Binary file not shown.

Content/Meshes/Ultra_Dynamic_Sky_Sphere.uasset

BIN

Binary file not shown.