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

Browse Source

# Conflicts:
#	Content/Maps/Landscape.umap
#	Content/Maps/MainScene.umap
#	Content/Maps/Yard_GP4.umap
#	Content/Maps/test.umap
#	Content/MigrateFortis/Otrada/Asset/SpeedTree/TreeMats/MM_Grass.uasset

...

This commit is contained in:

Andron666

2022-07-07 12:12:26 +05:00

parent 7253f1ef79 1ea1e16067

commit a4bd3bb175

72 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/MSPresets/MSAssets.db

BIN

Binary file not shown.

Content/MSPresets/MSTextures/AO.uasset

BIN

Binary file not shown.

Content/MSPresets/MSTextures/Albedo.uasset

BIN

Binary file not shown.

Content/MSPresets/MSTextures/AlbedoVT.uasset

BIN

Binary file not shown.

Content/MSPresets/MSTextures/Displacement.uasset

BIN

Binary file not shown.

Content/MSPresets/MSTextures/Metalness.uasset

BIN

Binary file not shown.

Content/MSPresets/MSTextures/MetalnessVT.uasset

BIN

Binary file not shown.

Content/MSPresets/MSTextures/Normal.uasset

BIN

Binary file not shown.

Content/MSPresets/MSTextures/NormalVT.uasset

BIN

Binary file not shown.

Content/MSPresets/MSTextures/Roughness.uasset

BIN

Binary file not shown.

Content/MSPresets/MSTextures/RoughnessVT.uasset

BIN

Binary file not shown.

Content/MSPresets/MSTextures/noise_mask.uasset

BIN

Binary file not shown.

Content/MSPresets/MSTextures/noise_normal.uasset

BIN

Binary file not shown.

Content/MSPresets/MS_DefaultMaterial_Fuzzy/Functions/MF_DetailNormalTiling.uasset

BIN

Binary file not shown.

Content/MSPresets/MS_DefaultMaterial_Fuzzy/Functions/MF_Displacement.uasset

BIN

Binary file not shown.

Content/MSPresets/MS_DefaultMaterial_Fuzzy/Functions/MF_Fuzz.uasset

BIN

Binary file not shown.

Content/MSPresets/MS_DefaultMaterial_Fuzzy/Functions/MF_MapAdjustments.uasset

BIN

Binary file not shown.

Content/MSPresets/MS_DefaultMaterial_Fuzzy/Functions/MF_Tiling.uasset

BIN

Binary file not shown.

Content/MSPresets/MS_DefaultMaterial_Fuzzy/Functions/MF_Transmission.uasset

BIN

Binary file not shown.

Content/MSPresets/MS_DefaultMaterial_Fuzzy/MS_DefaultMaterial_Fuzzy.uasset

BIN

Binary file not shown.

Content/Maps/Landscape.umap

BIN

Binary file not shown.

Content/Maps/Main_Building.umap

BIN

Binary file not shown.

Content/Maps/NightlightAim.umap

BIN

Binary file not shown.

Content/Maps/Yard_GP4.umap

BIN

Binary file not shown.

Content/Materials/Instances/M_LandscapeShader_V_02_Inst.uasset

BIN

Binary file not shown.

Content/Megascans/3D_Assets/Mossy_Forest_Boulder_wfgpedbaw/Albedo_2K_wfgpedbaw.uasset

BIN

Binary file not shown.

Content/Megascans/3D_Assets/Mossy_Forest_Boulder_wfgpedbaw/Fuzz_2K_wfgpedbaw.uasset

BIN

Binary file not shown.

Content/Megascans/3D_Assets/Mossy_Forest_Boulder_wfgpedbaw/Mossy_Forest_Boulder_LOD0_wfgpedbaw.uasset

BIN

Binary file not shown.

Content/Megascans/3D_Assets/Mossy_Forest_Boulder_wfgpedbaw/Mossy_Forest_Boulder_wfgpedbaw_inst.uasset

BIN

Binary file not shown.

Content/Megascans/3D_Assets/Mossy_Forest_Boulder_wfgpedbaw/Normal_2K_LOD0_wfgpedbaw.uasset

BIN

Binary file not shown.

Content/Megascans/3D_Assets/Mossy_Forest_Boulder_wfgpedbaw/Roughness_2K_wfgpedbaw.uasset

BIN

Binary file not shown.

Content/Meshes/Lightning/Lamp_base2.uasset

BIN

Binary file not shown.

Content/Meshes/Lightning/MI_NightLight_Outside_GP4_5.uasset

BIN

Binary file not shown.

Content/Meshes/Lightning/M_GoldMetal_Inst2.uasset

BIN

Binary file not shown.

Content/Meshes/Lightning/SM_Lamp_GP4_5.uasset

BIN

Binary file not shown.

Content/Meshes/Lightning/SM_Lamp_GP4_5_pilars.uasset

BIN

Binary file not shown.

Content/Meshes/Roads/Road_AsphaultStreet_Clean_2.uasset

BIN

Binary file not shown.

Content/Meshes/Tree_Crone.uasset

BIN

Binary file not shown.

Content/Meshes/Tree_Crone_2.uasset

BIN

Binary file not shown.

Content/Meshes/Tree_Crone_3.uasset

BIN

Binary file not shown.

Content/Meshes/Tree_Crone_4.uasset

BIN

Binary file not shown.

Content/Meshes/generalPlan/Grass/SM_Grass_massive_outside_1.uasset

BIN

Binary file not shown.

Content/Meshes/generalPlan/Grass/SM_Grass_massive_outside_10.uasset

BIN

Binary file not shown.

Content/Meshes/generalPlan/Grass/SM_Grass_massive_outside_11.uasset

BIN

Binary file not shown.

Content/Meshes/generalPlan/Grass/SM_Grass_massive_outside_12.uasset

BIN

Binary file not shown.

Content/Meshes/generalPlan/Grass/SM_Grass_massive_outside_13.uasset

BIN

Binary file not shown.

Content/Meshes/generalPlan/Grass/SM_Grass_massive_outside_14.uasset

BIN

Binary file not shown.

Content/Meshes/generalPlan/Grass/SM_Grass_massive_outside_15.uasset

BIN

Binary file not shown.

Content/Meshes/generalPlan/Grass/SM_Grass_massive_outside_16.uasset

BIN

Binary file not shown.

Content/Meshes/generalPlan/Grass/SM_Grass_massive_outside_17.uasset

BIN

Binary file not shown.

Content/Meshes/generalPlan/Grass/SM_Grass_massive_outside_18.uasset

BIN

Binary file not shown.

Content/Meshes/generalPlan/Grass/SM_Grass_massive_outside_19.uasset

BIN

Binary file not shown.

Content/Meshes/generalPlan/Grass/SM_Grass_massive_outside_2.uasset

BIN

Binary file not shown.

Content/Meshes/generalPlan/Grass/SM_Grass_massive_outside_3.uasset

BIN

Binary file not shown.

Content/Meshes/generalPlan/Grass/SM_Grass_massive_outside_4.uasset

BIN

Binary file not shown.

Content/Meshes/generalPlan/Grass/SM_Grass_massive_outside_5.uasset

BIN

Binary file not shown.

Content/Meshes/generalPlan/Grass/SM_Grass_massive_outside_6.uasset

BIN

Binary file not shown.

Content/Meshes/generalPlan/Grass/SM_Grass_massive_outside_7.uasset

BIN

Binary file not shown.

Content/Meshes/generalPlan/Grass/SM_Grass_massive_outside_8.uasset

BIN

Binary file not shown.

Content/Meshes/generalPlan/Grass/SM_Grass_massive_outside_9.uasset

BIN

Binary file not shown.

Content/MigrateFortis/Otrada/Asset/SpeedTree/TreeMats/MM_Grass.uasset

BIN

Binary file not shown.

Content/MigrateFortis/Otrada/FoliagePacks/ExpensiveFoliage/Textures/T_AM_vol4_grass_02_BC.uasset

BIN

Binary file not shown.

Content/MigrateMavisTrees/AM_vol4/Materials/MI_AM_vol4_leaf_24.uasset

BIN

Binary file not shown.

Content/MigrateMavisTrees/Flowers_Plants_Part1/Meshes/FA_RosaAlba_02.uasset

BIN

Binary file not shown.

Content/MigrateNewFurnitureNikita/Vol2_Unsorted/FurniturePack/Materials/Fabrics/M_Fabric_Wool_Inst.uasset

BIN

Binary file not shown.

Content/MigrateNewFurnitureNikita/Vol2_Unsorted/FurniturePack/Materials/Glass/Mi_Glass_03_04.uasset

BIN

Binary file not shown.

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

BIN

Binary file not shown.

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

BIN

Binary file not shown.

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

BIN

Binary file not shown.

Content/SpeedTree/Elgantissima/Longer_Atlas_HM_Var_Color_png_Tex.uasset

BIN

Binary file not shown.

Content/SpeedTree/Elgantissima/Longer_Atlas_HM_Var_Leaf_Mat_Inst.uasset

BIN

Binary file not shown.

Content/Textures/TreeBranch2_D.uasset

BIN

Binary file not shown.