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

Browse Source

# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.

...

This commit is contained in:

PC-G01

2022-07-04 13:20:11 +05:00

parent caa5cd2d8d 4cf98855d4

commit 8226fac967

69 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/Landscape.umap

BIN

Binary file not shown.

Content/Maps/MainScene.umap

BIN

Binary file not shown.

Content/Maps/Main_Building.umap

BIN

Binary file not shown.

Content/Maps/Yard_GP4.umap

BIN

Binary file not shown.

Content/Maps/test.umap

BIN

Binary file not shown.

Content/Materials/Instances/MI_RMA_Fasad_RAL_9003_nofade1.uasset

BIN

Binary file not shown.

Content/Materials/Instances/MI_RMA_Fasad_RAL_9003_nofade2.uasset

BIN

Binary file not shown.

Content/Materials/Instances/M_LandscapeShader_V_02_Inst.uasset

BIN

Binary file not shown.

Content/Materials/LandscapeMaterials/M_Asphalt_Inst.uasset

BIN

Binary file not shown.

Content/Materials/LandscapeMaterials/M_Asphalt_Inst2.uasset

BIN

Binary file not shown.

Content/Materials/Master/M_Decal2.uasset

BIN

Binary file not shown.

Content/Materials/Master/M_Decal2_Inst.uasset

BIN

Binary file not shown.

Content/Materials/Master/M_Decal_Inst2.uasset

BIN

Binary file not shown.

Content/Materials/Master/M_NoRMA_Tile_Master.uasset

BIN

Binary file not shown.

Content/Materials/Master/veggehh_4K_Albedo.uasset

BIN

Binary file not shown.

Content/Materials/Master/veggehh_4K_Normal.uasset

BIN

Binary file not shown.

Content/Materials/Master/veggehh_4K_Opacity.uasset

BIN

Binary file not shown.

Content/Materials/Master/veggehh_4K_Roughness.uasset

BIN

Binary file not shown.

Content/Materials/Master/vh1oehbs_4K_Albedo.uasset

BIN

Binary file not shown.

Content/Materials/Master/vh1oehbs_4K_Normal.uasset

BIN

Binary file not shown.

Content/Materials/Master/vh1oehbs_4K_Opacity.uasset

BIN

Binary file not shown.

Content/Materials/Master/vh1oehbs_4K_Roughness.uasset

BIN

Binary file not shown.

Content/Meshes/Outside/M_Decal_Inst1.uasset

BIN

Binary file not shown.

Content/Meshes/Outside/T_Decal_Outside_Details_1.uasset

BIN

Binary file not shown.

Content/Meshes/generalPlan/SM_Border_GP4_5.uasset

BIN

Binary file not shown.

Content/Meshes/generalPlan/SM_Border_Sphere.uasset

BIN

Binary file not shown.

Content/Meshes/generalPlan/SM_GP_4_5_Genplan_outside.uasset

BIN

Binary file not shown.

Content/Meshes/generalPlan/SM_Yard__GP4_GP5.uasset

BIN

Binary file not shown.

Content/MigrateFortis/Otrada/Asset/SpeedTree/TreeMats/MM_Foliage.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/Meshes/BP_AM_vol4_grass_01_0.uasset

BIN

Binary file not shown.

Content/MigrateFortis/Otrada/FoliagePacks/ExpensiveFoliage/Meshes/FA_AM_vol4_grass_01_0.uasset

BIN

Binary file not shown.

Content/MigrateFortis/Otrada/FoliagePacks/ExpensiveFoliage/Meshes/SM_AM_vol4_grass_01_0.uasset

BIN

Binary file not shown.

Content/MigrateFortis/Otrada/FoliagePacks/ExpensiveFoliage/Meshes/SM_AM_vol4_grass_02.uasset

BIN

Binary file not shown.

Content/MigrateFortis/Otrada/FoliagePacks/ExpensiveFoliage/Meshes/SM_AM_vol4_grass_03.uasset

BIN

Binary file not shown.

Content/MigrateFortis/Otrada/FoliagePacks/ExpensiveFoliage/Meshes/SM_AM_vol4_grass_04.uasset

BIN

Binary file not shown.

Content/MigrateFortis/Otrada/FoliagePacks/ExpensiveFoliage/Meshes/SM_Grass_massive_1.uasset

BIN

Binary file not shown.

Content/MigrateFortis/Otrada/FoliagePacks/ExpensiveFoliage/Meshes/SM_Grass_massive_2.uasset

BIN

Binary file not shown.

Content/MigrateFortis/Otrada/FoliagePacks/ExpensiveFoliage/Meshes/SM_Grass_massive_3.uasset

BIN

Binary file not shown.

Content/MigrateFortis/Otrada/FoliagePacks/ExpensiveFoliage/Meshes/SM_Grass_massive_4.uasset

BIN

Binary file not shown.

Content/MigrateFortis/Otrada/FoliagePacks/ExpensiveFoliage/Meshes/SM_Grass_massive_Yard_1.uasset

BIN

Binary file not shown.

Content/MigrateFortis/Otrada/FoliagePacks/ExpensiveFoliage/Meshes/SM_Grass_massive_Yard_10.uasset

BIN

Binary file not shown.

Content/MigrateFortis/Otrada/FoliagePacks/ExpensiveFoliage/Meshes/SM_Grass_massive_Yard_2.uasset

BIN

Binary file not shown.

Content/MigrateFortis/Otrada/FoliagePacks/ExpensiveFoliage/Meshes/SM_Grass_massive_Yard_3.uasset

BIN

Binary file not shown.

Content/MigrateFortis/Otrada/FoliagePacks/ExpensiveFoliage/Meshes/SM_Grass_massive_Yard_4.uasset

BIN

Binary file not shown.

Content/MigrateFortis/Otrada/FoliagePacks/ExpensiveFoliage/Meshes/SM_Grass_massive_Yard_5.uasset

BIN

Binary file not shown.

Content/MigrateFortis/Otrada/FoliagePacks/ExpensiveFoliage/Meshes/SM_Grass_massive_Yard_6.uasset

BIN

Binary file not shown.

Content/MigrateFortis/Otrada/FoliagePacks/ExpensiveFoliage/Meshes/SM_Grass_massive_Yard_7.uasset

BIN

Binary file not shown.

Content/MigrateFortis/Otrada/FoliagePacks/ExpensiveFoliage/Meshes/SM_Grass_massive_Yard_8.uasset

BIN

Binary file not shown.

Content/MigrateFortis/Otrada/FoliagePacks/ExpensiveFoliage/Meshes/SM_Grass_massive_Yard_9.uasset

BIN

Binary file not shown.

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

BIN

Binary file not shown.

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

BIN

Binary file not shown.

Content/SkatePark/Naberez_Model/fix/Yard/MI_Roof15.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/T_KlinkerTile_BC.uasset

BIN

Binary file not shown.

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

BIN

Binary file not shown.

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

BIN

Binary file not shown.

Content/SpeedTree/Elgantissima/BP_Longer_Atlas_HM_Var.uasset

BIN

Binary file not shown.

Content/SpeedTree/Elgantissima/FA_Longer_Atlas_HM_Var.uasset

BIN

Binary file not shown.

Content/SpeedTree/Elgantissima/Longer_Atlas_HM_Var.uasset

BIN

Binary file not shown.

Content/SpeedTree/Elgantissima/Longer_Atlas_HM_Var_FoliageType.uasset

BIN

Binary file not shown.

Content/SpeedTree/Elgantissima/Longer_Atlas_HM_Var_Leaf_Mat.uasset

BIN

Binary file not shown.

Content/SpeedTree/Elgantissima/Longer_Atlas_HM_Var_Leaf_Mat_Inst.uasset

BIN

Binary file not shown.

Content/SpeedTree/Lipa/BP_Lipa_Fix_Shadows.uasset

BIN

Binary file not shown.

Content/SpeedTree/Lipa/FA_Lipa_Fix_Shadows.uasset

BIN

Binary file not shown.

Content/SpeedTree/Lipa/MI_Lipa_Leaf.uasset

BIN

Binary file not shown.

Content/SpeedTree/Lipa/SM_Lipa.uasset

BIN

Binary file not shown.

Content/SpeedTree/Lipa/SM_Lipa_FoliageType.uasset

BIN

Binary file not shown.

Content/SpeedTree/Lipa/SM_Lipa_Leaf_Mat.uasset

BIN

Binary file not shown.