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

Browse Source

...

This commit is contained in:

Andron666

2021-12-07 14:50:21 +05:00

parent e21d9cac49 40f70385c0

commit 23b3d23fef

246 changed files with 61 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/AssetPacks/CarMoveSpline/Textures/TexturesOld/Textures/T_Wave_N.uasset

BIN

Binary file not shown.

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/Blueprints/UI/Materials/FasadHide_2.uasset

BIN

Binary file not shown.

Content/Blueprints/UI/Materials/MF_FakeHide_2.uasset

BIN

Binary file not shown.

Content/Blueprints/UI/Materials/MF_FasadHide_2.uasset

BIN

Binary file not shown.

Content/Blueprints/UI/Materials/PointFade_2.uasset

BIN

Binary file not shown.

Content/Maps/L_Lighting.umap

BIN

Binary file not shown.

Content/Maps/Landscape.umap

BIN

Binary file not shown.

Content/Maps/Landscape_sharedassets/1_LayerInfo.uasset

BIN

Binary file not shown.

Content/Maps/Landscape_sharedassets/2_LayerInfo.uasset

BIN

Binary file not shown.

Content/Maps/Landscape_sharedassets/3_LayerInfo.uasset

BIN

Binary file not shown.

Content/Maps/Landscape_sharedassets/4_LayerInfo.uasset

BIN

Binary file not shown.

Content/Maps/Landscape_sharedassets/6_LayerInfo.uasset

BIN

Binary file not shown.

Content/Maps/Landscape_sharedassets/7_LayerInfo.uasset

BIN

Binary file not shown.

Content/Maps/Landscape_sharedassets/8_LayerInfo.uasset

BIN

Binary file not shown.

Content/Maps/MainSceneMigrate.umap

BIN

Binary file not shown.

Content/Maps/Main_Building.umap

BIN

Binary file not shown.

Content/Maps/WaterTestMap.umap

BIN

Binary file not shown.

Content/Maps/WaterTestMap_BuiltData.uasset

BIN

Binary file not shown.

Content/Materials/Cloud_Shadows.uasset

BIN

Binary file not shown.

Content/Materials/Concrete_SkateRamp.uasset

BIN

Binary file not shown.

Content/Materials/FakeInteriors/MI_CubeRoom_1.uasset

BIN

Binary file not shown.

Content/Materials/FakeInteriors/MI_CubeRoom_2.uasset

BIN

Binary file not shown.

Content/Materials/FakeInteriors/MI_CubeRoom_3.uasset

BIN

Binary file not shown.

Content/Materials/FakeInteriors/MI_CubeRoom_5.uasset

BIN

Binary file not shown.

Content/Materials/FakeInteriors/MI_CubeRoom_6.uasset

BIN

Binary file not shown.

Content/Materials/FakeInteriors/MI_CubeRoom_7.uasset

BIN

Binary file not shown.

Content/Materials/FakeInteriors/MI_FakeEmpty.uasset

BIN

Binary file not shown.

Content/Materials/FakeInteriors/NightAdj.uasset

BIN

Binary file not shown.

Content/Materials/FakeInteriors/T_CubeRoom_1.uasset

BIN

Binary file not shown.

Content/Materials/FakeInteriors/T_CubeRoom_2.uasset

BIN

Binary file not shown.

Content/Materials/FakeInteriors/T_CubeRoom_3.uasset

BIN

Binary file not shown.

Content/Materials/FakeInteriors/T_CubeRoom_5.uasset

BIN

Binary file not shown.

Content/Materials/FakeInteriors/T_CubeRoom_6.uasset

BIN

Binary file not shown.

Content/Materials/FakeInteriors/T_CubeRoom_7.uasset

BIN

Binary file not shown.

Content/Materials/Flora_back.uasset

BIN

Binary file not shown.

Content/Materials/Fog_ParticleMat.uasset

BIN

Binary file not shown.

Content/Materials/Functions/MF_LandscapeLayer1.uasset

BIN

Binary file not shown.

Content/Materials/Functions/MF_LandscapeTexturePosition1.uasset

BIN

Binary file not shown.

Content/Materials/Functions/MF_Triplanar_UV.uasset

BIN

Binary file not shown.

Content/Materials/Functions/MF_World_Dirt.uasset

BIN

Binary file not shown.

Content/Materials/Functions/Triplanar_UV.uasset

BIN

Binary file not shown.

Content/Materials/Inside_Clouds_Fog_Particle.uasset

BIN

Binary file not shown.

Content/Materials/Instances/LightningBranch_ParticleMat.uasset

BIN

Binary file not shown.

Content/Materials/Instances/MI_Brick_01.uasset

BIN

Binary file not shown.

Content/Materials/Instances/MI_Brick_02.uasset

BIN

Binary file not shown.

Content/Materials/Instances/MI_Brick_03.uasset

BIN

Binary file not shown.

Content/Materials/Instances/MI_Freestyle_customwater.uasset

BIN

Binary file not shown.

Content/Materials/Instances/MI_RMA_Fasad_RAL_1011.uasset

BIN

Binary file not shown.

Content/Materials/Instances/MI_RMA_Fasad_RAL_1015.uasset

BIN

Binary file not shown.

Content/Materials/Instances/MI_RMA_Fasad_RAL_5009.uasset

BIN

Binary file not shown.

Content/Materials/Instances/MI_RMA_Fasad_RAL_6015.uasset

BIN

Binary file not shown.

Content/Materials/Instances/MI_RMA_Fasad_RAL_6028.uasset

BIN

Binary file not shown.

Content/Materials/Instances/MI_RMA_Fasad_RAL_7004.uasset

BIN

Binary file not shown.

Content/Materials/Instances/MI_RMA_Fasad_RAL_7016.uasset

BIN

Binary file not shown.

Content/Materials/Instances/MI_RMA_Fasad_RAL_7047.uasset

BIN

Binary file not shown.

Content/Materials/Instances/MI_RMA_Fasad_RAL_8009.uasset

BIN

Binary file not shown.

Content/Materials/Instances/MI_RMA_Fasad_RAL_8023.uasset

BIN

Binary file not shown.

Content/Materials/Instances/MI_RMA_Fasad_RAL_9003.uasset

BIN

Binary file not shown.

Content/Materials/Instances/MI_Rubber2.uasset

BIN

Binary file not shown.

Content/Materials/Instances/MM_TileDirt_L_Inst.uasset

BIN

Binary file not shown.

Content/Materials/Instances/M_LandscapeShader_V_02_Inst.uasset

BIN

Binary file not shown.

Content/Materials/Instances/M_Metall.uasset

BIN

Binary file not shown.

Content/Materials/Instances/M_Plastic.uasset

BIN

Binary file not shown.

Content/Materials/Instances/M_Plastic_RAL_6005.uasset

BIN

Binary file not shown.

Content/Materials/Instances/M_Plastic_RAL_716.uasset

BIN

Binary file not shown.

Content/Materials/Instances/M_Simple_Inst2.uasset

BIN

Binary file not shown.

Content/Materials/Instances/M_WinGlass.uasset

BIN

Binary file not shown.

Content/Materials/Instances/NewMaterial_day_good.uasset

BIN

Binary file not shown.

Content/Materials/Instances/RTree2.uasset

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/Instances/tgzkdehv_2K_Albedo.uasset

BIN

Binary file not shown.

Content/Materials/Instances/tgzkdehv_2K_Normal.uasset

BIN

Binary file not shown.

Content/Materials/Instances/tgzkdehv_2K_Roughness.uasset

BIN

Binary file not shown.

Content/Materials/Instances/tree_bark.uasset

BIN

Binary file not shown.

Content/Materials/LightningBolt_ParticleMat.uasset

BIN

Binary file not shown.

Content/Materials/LightningFlare_ParticleMat.uasset

BIN

Binary file not shown.

Content/Materials/Lightning_Ball_ParticleMat.uasset

BIN

Binary file not shown.

Content/Materials/MM_TileDirt_L.uasset

BIN

Binary file not shown.

Content/Materials/M_RMA_Tile_Master.uasset

BIN

Binary file not shown.

Content/Materials/M_Unsharp.uasset

BIN

Binary file not shown.

Content/Materials/Master/M_FakeInterior_Freestyle.uasset

BIN

Binary file not shown.

Content/Materials/Master/M_LandscapeShader_V_02.uasset

BIN

Binary file not shown.

Content/Materials/Master/M_RMA_Tile_Triplanar.uasset

BIN

Binary file not shown.

Content/Materials/NewMaterial.uasset

BIN

Binary file not shown.

Content/Materials/ParameterCollection/Otrada_Emmisive.uasset

BIN

Binary file not shown.

Content/Materials/PostProcess/M_WorldSelection.uasset

BIN

Binary file not shown.

Content/Materials/PostProcess/M_WorldSelection_Inst.uasset

BIN

Binary file not shown.

Content/Materials/RainSnow_ParticleMat.uasset

BIN

Binary file not shown.

Some files were not shown because too many files have changed in this diff Show More