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

Browse Source

# Conflicts:
#	Content/Maps/Interior/C2M/C2M_L.umap
#	Content/Maps/Interior/C2M/C2M_R.umap
#	Content/Maps/Landscape.umap
#	Content/Materials/Instances/Grass/MI_Grass_Yellow.uasset

...

This commit is contained in:

PC-G13

2022-11-06 13:09:10 +05:00

parent 226b97648d 5d474208f3

commit bd4d6715ea

325 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/Assetpacks/Furniture/All/Materials/Inst/Fabric/MI_Fabric_white.uasset

BIN

Binary file not shown.

Content/Assetpacks/Furniture/All/Materials/Inst/Fabric/MI_Suede_Green.uasset

BIN

Binary file not shown.

Content/Assetpacks/Furniture/All/Materials/Inst/Fabric/MI_Suede_Grey.uasset

BIN

Binary file not shown.

Content/Assetpacks/Furniture/All/Materials/Inst/Fabric/MI_Suede_Red.uasset

BIN

Binary file not shown.

Content/Assetpacks/Furniture/All/Materials/Inst/Fabric/MI_Suede_Yellow.uasset

BIN

Binary file not shown.

Content/Assetpacks/Furniture/All/Materials/Inst/Metal/MI_Brass.uasset

BIN

Binary file not shown.

Content/Assetpacks/Furniture/All/Materials/Inst/Metal/MI_Chrome.uasset

BIN

Binary file not shown.

Content/Assetpacks/Furniture/All/Materials/Inst/Metal/MI_Chrome_2.uasset

BIN

Binary file not shown.

Content/Assetpacks/Furniture/All/Materials/Inst/Metal/MI_Chrome_Black.uasset

BIN

Binary file not shown.

Content/Assetpacks/Furniture/All/Materials/Inst/Metal/MI_Gold.uasset

BIN

Binary file not shown.

Content/Assetpacks/Furniture/All/Materials/Inst/Metal/MI_PaintMetal_Grey.uasset

BIN

Binary file not shown.

Content/Assetpacks/Furniture/All/Materials/Inst/Metal/MI_PaintMetal_White.uasset

BIN

Binary file not shown.

Content/Assetpacks/Furniture/All/Materials/Inst/PaintedWood/MI_PaintWood_White.uasset

BIN

Binary file not shown.

Content/Assetpacks/Furniture/All/Materials/Inst/Plastic/MI_Bathroom_White_Gloss_Inst1.uasset

BIN

Binary file not shown.

Content/Assetpacks/Furniture/All/Materials/Inst/Plastic/MI_Kitchen_Brown_Gloss_Inst.uasset

BIN

Binary file not shown.

Content/Assetpacks/Furniture/All/Materials/Inst/Plastic/MI_Kitchen_Graphite_Gloss.uasset

BIN

Binary file not shown.

Content/Assetpacks/Furniture/All/Materials/Inst/Plastic/MI_Kitchen_Graphite_Matte.uasset

BIN

Binary file not shown.

Content/Assetpacks/Furniture/All/Materials/Inst/Plastic/MI_Kitchen_White.uasset

BIN

Binary file not shown.

Content/Assetpacks/Furniture/All/Materials/Inst/Plastic/MI_PlasticBlack.uasset

BIN

Binary file not shown.

Content/Assetpacks/Furniture/All/Materials/Inst/Plastic/MI_PlasticGreyDark.uasset

BIN

Binary file not shown.

Content/Assetpacks/Furniture/All/Materials/Inst/Plastic/MI_PlasticWhite.uasset

BIN

Binary file not shown.

Content/Assetpacks/Furniture/All/Materials/Inst/Plastic/Plastic_Lamp.uasset

BIN

Binary file not shown.

Content/Assetpacks/Furniture/All/Materials/Inst/Rubber/MI_BlackRubber.uasset

BIN

Binary file not shown.

Content/Assetpacks/Furniture/All/Materials/Inst/Wood/MI_oakwood_03.uasset

BIN

Binary file not shown.

Content/Assetpacks/Furniture/All/Materials/Inst/ceramic/MI_Ceramic.uasset

BIN

Binary file not shown.

Content/Assetpacks/Furniture/All/Materials/Inst/ceramic/MI_Ceramic_BiegeNoise.uasset

BIN

Binary file not shown.

Content/Assetpacks/Furniture/All/Materials/Inst/ceramic/MI_Ceramic_BiegeNoise1.uasset

BIN

Binary file not shown.

Content/Assetpacks/Furniture/All/Materials/Inst/ceramic/MI_Ceramics_black.uasset

BIN

Binary file not shown.

Content/Assetpacks/Furniture/All/Materials/Inst/food/M_Orange.uasset

BIN

Binary file not shown.

Content/Assetpacks/Furniture/All/Materials/Inst/glass/MI_Glass.uasset

BIN

Binary file not shown.

Content/Assetpacks/Furniture/All/Materials/Inst/glass/MI_Glass_Black.uasset

BIN

Binary file not shown.

Content/Assetpacks/Furniture/All/Materials/Inst/glass/MI_Glass_Dark.uasset

BIN

Binary file not shown.

Content/Assetpacks/Furniture/All/Materials/Inst/leather/MI_leather_Dark.uasset

BIN

Binary file not shown.

Content/Assetpacks/Furniture/All/Materials/Inst/leather/MI_leather_biege.uasset

BIN

Binary file not shown.

Content/Assetpacks/Furniture/All/Materials/Inst/other/MI_Polish_A.uasset

BIN

Binary file not shown.

Content/Assetpacks/Furniture/All/Materials/Inst/other/MI_Wax.uasset

BIN

Binary file not shown.

Content/Assetpacks/Furniture/All/Materials/Inst/plants/07_Aglaonema_Jubilee_Compacta_sikh4_4K_inst.uasset

BIN

Binary file not shown.

Content/Assetpacks/Furniture/All/Materials/Inst/plants/MI_AE_plant_10_05.uasset

BIN

Binary file not shown.

Content/Assetpacks/Furniture/All/Materials/Inst/plants/M_AE_vol1_foliage_small_plant.uasset

BIN

Binary file not shown.

Content/Assetpacks/Furniture/All/Materials/Inst/plants/gadget_111_soil_v1_0.uasset

BIN

Binary file not shown.

Content/Assetpacks/Furniture/All/Materials/Inst/prop/MI_AI_vol5_3_Fruit19.uasset

BIN

Binary file not shown.

Content/Assetpacks/Furniture/All/Materials/Inst/prop/MI_AI_vol6_1_speaker_center_1_01.uasset

BIN

Binary file not shown.

Content/Assetpacks/Furniture/All/Materials/Inst/prop/MI_Apple_Green.uasset

BIN

Binary file not shown.

Content/Assetpacks/Furniture/All/Materials/Inst/prop/MI_Notebook.uasset

BIN

Binary file not shown.

Content/Assetpacks/Furniture/All/Materials/Inst/prop/MI_V1_Books.uasset

BIN

Binary file not shown.

Content/Assetpacks/Furniture/All/Materials/Inst/prop/MI_V1_Books2.uasset

BIN

Binary file not shown.

Content/Assetpacks/Furniture/All/Materials/Inst/prop/MI_V1_Books3.uasset

BIN

Binary file not shown.

Content/Assetpacks/Furniture/All/Materials/Inst/prop/MI_kitchen_hob.uasset

BIN

Binary file not shown.

Content/Assetpacks/Furniture/All/Materials/Inst/prop/MI_kitchen_oven_outside.uasset

BIN

Binary file not shown.

Content/Assetpacks/Furniture/All/Materials/Materials/M_FoliageMasterMaterial.uasset

BIN

Binary file not shown.

Content/Assetpacks/Furniture/All/Materials/Materials/WineGlass_M.uasset

BIN

Binary file not shown.

Content/Assetpacks/Furniture/Materials/M_CDGrey_Inst.uasset

BIN

Binary file not shown.

Content/Assetpacks/Furniture/Materials/M_ColorMaster.uasset

BIN

Binary file not shown.

Content/Assetpacks/Furniture/Materials/M_Glass.uasset

BIN

Binary file not shown.

Content/Assetpacks/Furniture/Materials/M_GlassMaster.uasset

BIN

Binary file not shown.

Content/Assetpacks/Furniture/Materials/M_Rsofa_Fabric.uasset

BIN

Binary file not shown.

Content/Assetpacks/Furniture/Materials/M_Rsofa_Pillow.uasset

BIN

Binary file not shown.

Content/Assetpacks/Furniture/Materials/M_Rsofa_Pillow_02.uasset

BIN

Binary file not shown.

Content/Assetpacks/Furniture/Materials/M_Sofa.uasset

BIN

Binary file not shown.

Content/Assetpacks/Furniture/Vol2_Unsorted/ELECTRONICS/0_BASE/MASTER_MAT/M_Advance.uasset

BIN

Binary file not shown.

Content/Assetpacks/Furniture/Vol2_Unsorted/ELECTRONICS/0_BASE/MASTER_MAT/M_Advance_Mask.uasset

BIN

Binary file not shown.

Content/Assetpacks/Furniture/Vol2_Unsorted/ELECTRONICS/2_ASSETS/SPEAKER/SPEAKER_01/MI_speaker_01.uasset

BIN

Binary file not shown.

Content/Assetpacks/Furniture/Vol2_Unsorted/ELECTRONICS/2_ASSETS/SPEAKER/SPEAKER_01/MI_speaker_01_pattern1.uasset

BIN

Binary file not shown.

Content/Assetpacks/Furniture/Vol2_Unsorted/ELECTRONICS/2_ASSETS/SPEAKER/SPEAKER_01/MI_speaker_02.uasset

BIN

Binary file not shown.

Content/Assetpacks/Furniture/Vol2_Unsorted/ELECTRONICS/2_ASSETS/SPEAKER/SPEAKER_01/MI_speaker_03.uasset

BIN

Binary file not shown.

Content/Assetpacks/Furniture/Vol2_Unsorted/FurniturePack/Assets/Furniture/Living/Materials/M_Fabric_Pillow.uasset

BIN

Binary file not shown.

Content/Assetpacks/Furniture/Vol2_Unsorted/FurniturePack/Materials/Metal/M_Metal.uasset

BIN

Binary file not shown.

Content/Assetpacks/Furniture/Vol2_Unsorted/FurniturePack/Materials/Metal/Mi_Metal_2.uasset

BIN

Binary file not shown.

Content/Assetpacks/Furniture/Vol2_Unsorted/FurniturePack/Materials/Tiles_Rocks/M_Marble_White.uasset

BIN

Binary file not shown.

Content/Assetpacks/Furniture/Vol2_Unsorted/Materials/M_Glass_V2.uasset

BIN

Binary file not shown.

Content/Assetpacks/Furniture/Vol2_Unsorted/Unimodels_Department_Vol_1/Materials/MI_GlassBottle.uasset

BIN

Binary file not shown.

Content/Assetpacks/Furniture/Vol2_Unsorted/Unimodels_Department_Vol_1/Materials/MI_Metal_008.uasset

BIN

Binary file not shown.

Content/Assetpacks/Furniture/Vol2_Unsorted/Unimodels_Department_Vol_1/Materials/MI_Metal_009.uasset

BIN

Binary file not shown.

Content/Assetpacks/Furniture/Vol2_Unsorted/Unimodels_Department_Vol_1/Materials/MI_Metal_010.uasset

BIN

Binary file not shown.

Content/Assetpacks/Furniture/Vol2_Unsorted/Unimodels_Department_Vol_1/Materials/MI_Plastic_002.uasset

BIN

Binary file not shown.

Content/Assetpacks/Furniture/Vol2_Unsorted/Unimodels_Department_Vol_1/Materials/MastersMaterials/MI_Ornament_Facade.uasset

BIN

Binary file not shown.

Content/Assetpacks/Furniture/Vol2_Unsorted/Unimodels_Department_Vol_1/Materials/MastersMaterials/MM_Metallic_Masked_Inst_Inst.uasset

BIN

Binary file not shown.

Content/Assetpacks/Furniture/Vol2_Unsorted/Unimodels_Department_Vol_1/Materials/MastersMaterials/M_Floors.uasset

BIN

Binary file not shown.

Content/Assetpacks/Furniture/Vol2_Unsorted/Unimodels_Department_Vol_1/Materials/MastersMaterials/M_Glass.uasset

BIN

Binary file not shown.

Content/Assetpacks/Furniture/Vol2_Unsorted/Unimodels_Department_Vol_1/Materials/MastersMaterials/M_Metallic.uasset

BIN

Binary file not shown.

Content/Assetpacks/Furniture/Vol2_Unsorted/Unimodels_Department_Vol_1/Materials/MastersMaterials/M_Plastic.uasset

BIN

Binary file not shown.

Content/Assetpacks/Furniture/Vol2_Unsorted/Unimodels_Department_Vol_1/Materials/Pillows/MI_Pillow_002.uasset

BIN

Binary file not shown.

Content/Assetpacks/Furniture/Vol2_Unsorted/Unimodels_Department_Vol_1/Materials/Pillows/MI_Pillow_005.uasset

BIN

Binary file not shown.

Content/Assetpacks/SpeedTree/Asset/SpeedTree/TreeMats/MM_Foliage.uasset

BIN

Binary file not shown.

Content/Assetpacks/SpeedTree/Asset/SpeedTree/TreeMats/MM_Grass_TKT.uasset

BIN

Binary file not shown.

Content/Assetpacks/Tropical_Jungle_Pack/FoliageType/FT_BranchDry_01.uasset

BIN

Binary file not shown.

Content/Assetpacks/Tropical_Jungle_Pack/FoliageType/FT_BushA_01.uasset

BIN

Binary file not shown.

Content/Assetpacks/Tropical_Jungle_Pack/FoliageType/FT_BushA_02.uasset

BIN

Binary file not shown.

Content/Assetpacks/Tropical_Jungle_Pack/FoliageType/FT_BushA_03.uasset

BIN

Binary file not shown.

Content/Assetpacks/Tropical_Jungle_Pack/FoliageType/FT_BushA_04.uasset

BIN

Binary file not shown.

Content/Assetpacks/Tropical_Jungle_Pack/FoliageType/FT_Bush_01.uasset

BIN

Binary file not shown.

Content/Assetpacks/Tropical_Jungle_Pack/FoliageType/FT_Bush_02.uasset

BIN

Binary file not shown.

Content/Assetpacks/Tropical_Jungle_Pack/FoliageType/FT_Clover_01.uasset

BIN

Binary file not shown.

Content/Assetpacks/Tropical_Jungle_Pack/FoliageType/FT_Clover_02.uasset

BIN

Binary file not shown.

Content/Assetpacks/Tropical_Jungle_Pack/FoliageType/FT_Clover_03.uasset

BIN

Binary file not shown.

Content/Assetpacks/Tropical_Jungle_Pack/FoliageType/FT_Clover_04.uasset

BIN

Binary file not shown.

Content/Assetpacks/Tropical_Jungle_Pack/FoliageType/FT_Fern_01.uasset

BIN

Binary file not shown.

Content/Assetpacks/Tropical_Jungle_Pack/FoliageType/FT_Fern_02.uasset

BIN

Binary file not shown.

Content/Assetpacks/Tropical_Jungle_Pack/FoliageType/FT_Fern_03.uasset

BIN

Binary file not shown.

Content/Assetpacks/Tropical_Jungle_Pack/FoliageType/FT_Fern_04.uasset

BIN

Binary file not shown.

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