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

Browse Source

# Conflicts:
#	Content/Materials/Interior/Minimal/MI_Floor_Parquet_Min.uasset
#	Content/Meshes/Interior/Test_Room/SM_GP1_S01_A00_Floor_Test_Room.uasset

...

This commit is contained in:

PC-G13

2023-11-16 16:22:47 +05:00

parent e742367694 6c6a5fb4ae

commit 272cf7e65c

623 changed files with 5 additions and 259 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/Cars/Materials/MA_Glass.uasset

BIN

Binary file not shown.

Content/AssetPacks/Cars/SUV/MaterialInstances/MI_Glass.uasset

BIN

Binary file not shown.

Content/AssetPacks/Furniture/All/Meshes/Furniture/SM_Radiator_Floor.uasset

BIN

Binary file not shown.

Content/AssetPacks/Furniture/Kitchen/SM_Cup_Ribbed.uasset

BIN

Binary file not shown.

Content/AssetPacks/Furniture/Kitchen/SM_Dish_Ribbed.uasset

BIN

Binary file not shown.

Content/AssetPacks/Furniture/Kitchen/SM_Kitchen_Vase_Ribbed.uasset

BIN

Binary file not shown.

Content/AssetPacks/Furniture/Other/SM_Cylinder_Brush_StaticMesh.uasset

BIN

Binary file not shown.

Content/AssetPacks/Furniture/Vol2_Unsorted/FurniturePack/Assets/Furniture/BedRoom/BedRoom_01/Textures/T_MBed_Carpet.uasset

BIN

Binary file not shown.

Content/AssetPacks/Furniture/Vol2_Unsorted/Materials/Materials/Cloth/MI_Cloth_006.uasset

BIN

Binary file not shown.

Content/AssetPacks/Furniture/Vol2_Unsorted/Materials/Materials/MastersMaterials/M_Albedo_Wine_c.uasset

BIN

Binary file not shown.

Content/AssetPacks/Furniture/Vol2_Unsorted/Materials/Materials/MastersMaterials/M_Floors.uasset

BIN

Binary file not shown.

Content/AssetPacks/Furniture/Vol2_Unsorted/Textures/T_Wall_Dirt_R1.uasset

BIN

Binary file not shown.

Content/AssetPacks/Furniture/Vol2_Unsorted/Unimodels_Department_Vol_1/Textures/Bathroom/T_TowelTexture_002.uasset

BIN

Binary file not shown.

Content/AssetPacks/Furniture/Vol2_Unsorted/Unimodels_Department_Vol_1/Textures/Fabrics/T_Pattern_003.uasset

BIN

Binary file not shown.

Content/AssetPacks/Furniture/Vol2_Unsorted/Unimodels_Department_Vol_1/Textures/Kitchen/T_Albedo_Wine_c.uasset

BIN

Binary file not shown.

Content/AssetPacks/Furniture/Vol2_Unsorted/Unimodels_Department_Vol_1/Textures/Kitchen/T_Metallic_Oven.uasset

BIN

Binary file not shown.

Content/AssetPacks/Furniture/Vol2_Unsorted/Unimodels_Department_Vol_1/Textures/T_Normal_Marble_001_B.uasset

BIN

Binary file not shown.

Content/AssetPacks/Furniture/Vol2_Unsorted/Unimodels_Department_Vol_1/Textures/T_Normal_Paper.uasset

BIN

Binary file not shown.

Content/AssetPacks/Furniture/Vol2_Unsorted/Unimodels_Department_Vol_1/Textures/T_Roughness_Wood_001.uasset

BIN

Binary file not shown.

Content/AssetPacks/Furniture/Vol2_Unsorted/Unimodels_Department_Vol_1/Textures/wood/T_Wood_010.uasset

BIN

Binary file not shown.

Content/AssetPacks/Furniture_Again/All/Materials/Inst/prop/MI_AI_vol4_1_Salt_Papper.uasset

BIN

Binary file not shown.

Content/AssetPacks/Furniture_Again/All/Meshes/Furniture/Kitchen/SM_AI_vol4_1_Salt_Papper.uasset

BIN

Binary file not shown.

Content/AssetPacks/Furniture_Again/All/Textures/Props/T_AI_vol4_1_Salt_Papper_BC.uasset

BIN

Binary file not shown.

Content/AssetPacks/Furniture_Again/All/Textures/Props/T_AI_vol4_1_Salt_Papper_M.uasset

BIN

Binary file not shown.

Content/AssetPacks/Furniture_Again/Materials/M_BasicColor.uasset

BIN

Binary file not shown.

Content/AssetPacks/Furniture_Again/Materials/M_KDGrape_01.uasset

BIN

Binary file not shown.

Content/AssetPacks/Furniture_Again/Materials/M_White_Gloss.uasset

BIN

Binary file not shown.

Content/AssetPacks/Furniture_Again/Vol2_Unsorted/FurniturePack/Assets/Furniture/Dinning/SM_Dinning_Glass_02.uasset

BIN

Binary file not shown.

Content/AssetPacks/Furniture_Again/Vol2_Unsorted/FurniturePack/Assets/Furniture/Kitchen/SM_KDGrapes.uasset

BIN

Binary file not shown.

Content/AssetPacks/Furniture_Again/Vol2_Unsorted/FurniturePack/Assets/Furniture/Tableware/SM_Set_01_Fork.uasset

BIN

Binary file not shown.

Content/AssetPacks/Furniture_Again/Vol2_Unsorted/FurniturePack/Assets/Furniture/Tableware/SM_Set_01_Spoon.uasset

BIN

Binary file not shown.

Content/AssetPacks/Furniture_Again/Vol2_Unsorted/FurniturePack/Materials/Metal/M_Metal.uasset

BIN

Binary file not shown.

Content/AssetPacks/Furniture_Again/Vol2_Unsorted/FurniturePack/Materials/Metal/Mi_Metal.uasset

BIN

Binary file not shown.

Content/AssetPacks/Furniture_Again/Vol2_Unsorted/Textures/Metal/T_Metal_Normal.uasset

BIN

Binary file not shown.

Content/AssetPacks/Furniture_Again/Vol2_Unsorted/Textures/T_Fabric_R.uasset

BIN

Binary file not shown.

Content/AssetPacks/Furniture_Again/Vol2_Unsorted/Textures/T_KDGrape_01.uasset

BIN

Binary file not shown.

Content/AssetPacks/Furniture_Again/Vol2_Unsorted/Unimodels_Department_Vol_1/Meshes/Bathroom/SM_Towel_006.uasset

BIN

Binary file not shown.

Content/AssetPacks/Furniture_Again/Vol2_Unsorted/Unimodels_Department_Vol_1/Meshes/Kitchen/SM_Wine_Bottle_2.uasset

BIN

Binary file not shown.

Content/AssetPacks/TMEntertainmentPack1/Entertainment/_common/materials/MI_PlasticEggshell01Red.uasset

BIN

Binary file not shown.

Content/AssetPacks/TMEntertainmentPack1/Entertainment/_common/materials/MI_PlasticMatte01Black.uasset

BIN

Binary file not shown.

Content/AssetPacks/TMEntertainmentPack1/Entertainment/_common/textures/T_PlasticEggshell01_R.uasset

BIN

Binary file not shown.

Content/AssetPacks/TMEntertainmentPack1/Entertainment/_common/textures/T_PlasticMatte01_R.uasset

BIN

Binary file not shown.

Content/AssetPacks/TMEntertainmentPack1/Entertainment/blueprints/BP_Toy02.uasset

BIN

Binary file not shown.

Content/AssetPacks/TMEntertainmentPack1/Entertainment/blueprints/BP_Toy19.uasset

BIN

Binary file not shown.

Content/AssetPacks/TMEntertainmentPack1/Entertainment/blueprints/BP_Toy22.uasset

BIN

Binary file not shown.

Content/AssetPacks/TMEntertainmentPack1/Entertainment/blueprints/BP_Toy25.uasset

BIN

Binary file not shown.

Content/AssetPacks/TMEntertainmentPack1/Entertainment/meshes/Entertainment/PingPongTable01/SM_PingPongRacket01.uasset

BIN

Binary file not shown.

Content/AssetPacks/TMEntertainmentPack1/Entertainment/meshes/Entertainment/PingPongTable01/materials/MI_PingPongRacket01.uasset

BIN

Binary file not shown.

Content/AssetPacks/TMEntertainmentPack1/Entertainment/meshes/Entertainment/PingPongTable01/textures/T_PingPongRacket01_BC.uasset

BIN

Binary file not shown.

Content/AssetPacks/TMEntertainmentPack1/Entertainment/meshes/Entertainment/PingPongTable01/textures/T_PingPongRacket01_M.uasset

BIN

Binary file not shown.

Content/AssetPacks/TMEntertainmentPack1/Entertainment/meshes/Entertainment/PingPongTable01/textures/T_PingPongRacket01_N.uasset

BIN

Binary file not shown.

Content/AssetPacks/TMEntertainmentPack1/Entertainment/meshes/Entertainment/PingPongTable01/textures/T_PingPongRacket01_R.uasset

BIN

Binary file not shown.

Content/AssetPacks/TMEntertainmentPack1/Entertainment/meshes/ToysGames/KidsGame26/SM_KidsGame26Racket.uasset

BIN

Binary file not shown.

Content/AssetPacks/TMEntertainmentPack1/Entertainment/meshes/ToysGames/KidsGame26/SM_KidsGame26Shuttle.uasset

BIN

Binary file not shown.

Content/AssetPacks/TMEntertainmentPack1/Entertainment/meshes/ToysGames/KidsGame26/materials/MI_KidsGame26.uasset

BIN

Binary file not shown.

Content/AssetPacks/TMEntertainmentPack1/Entertainment/meshes/ToysGames/KidsGame26/materials/MI_KidsGame26Shuttle.uasset

BIN

Binary file not shown.

Content/AssetPacks/TMEntertainmentPack1/Entertainment/meshes/ToysGames/KidsGame26/textures/T_KidsGame26Shuttle_BC.uasset

BIN

Binary file not shown.

Content/AssetPacks/TMEntertainmentPack1/Entertainment/meshes/ToysGames/KidsGame26/textures/T_KidsGame26Shuttle_M.uasset

BIN

Binary file not shown.

Content/AssetPacks/TMEntertainmentPack1/Entertainment/meshes/ToysGames/KidsGame26/textures/T_KidsGame26Shuttle_N.uasset

BIN

Binary file not shown.

Content/AssetPacks/TMEntertainmentPack1/Entertainment/meshes/ToysGames/KidsGame26/textures/T_KidsGame26Shuttle_R.uasset

BIN

Binary file not shown.

Content/AssetPacks/TMEntertainmentPack1/Entertainment/meshes/ToysGames/KidsGame26/textures/T_KidsGame26_BC.uasset

BIN

Binary file not shown.

Content/AssetPacks/TMEntertainmentPack1/Entertainment/meshes/ToysGames/KidsGame26/textures/T_KidsGame26_M.uasset

BIN

Binary file not shown.

Content/AssetPacks/TMEntertainmentPack1/Entertainment/meshes/ToysGames/KidsGame26/textures/T_KidsGame26_N.uasset

BIN

Binary file not shown.

Content/AssetPacks/TMEntertainmentPack1/Entertainment/meshes/ToysGames/KidsGame26/textures/T_KidsGame26_R.uasset

BIN

Binary file not shown.

Content/AssetPacks/TMEntertainmentPack1/Entertainment/meshes/ToysGames/Toy02/SM_Toy02.uasset

BIN

Binary file not shown.

Content/AssetPacks/TMEntertainmentPack1/Entertainment/meshes/ToysGames/Toy02/materials/MI_Toy02.uasset

BIN

Binary file not shown.

Content/AssetPacks/TMEntertainmentPack1/Entertainment/meshes/ToysGames/Toy02/textures/T_Toy02_BC.uasset

BIN

Binary file not shown.

Content/AssetPacks/TMEntertainmentPack1/Entertainment/meshes/ToysGames/Toy02/textures/T_Toy02_M.uasset

BIN

Binary file not shown.

Content/AssetPacks/TMEntertainmentPack1/Entertainment/meshes/ToysGames/Toy02/textures/T_Toy02_R.uasset

BIN

Binary file not shown.

Content/AssetPacks/TMEntertainmentPack1/Entertainment/meshes/ToysGames/Toy19/SM_Toy19.uasset

BIN

Binary file not shown.

Content/AssetPacks/TMEntertainmentPack1/Entertainment/meshes/ToysGames/Toy19/materials/MI_Toy19.uasset

BIN

Binary file not shown.

Content/AssetPacks/TMEntertainmentPack1/Entertainment/meshes/ToysGames/Toy19/textures/T_Toy19_BC.uasset

BIN

Binary file not shown.

Content/AssetPacks/TMEntertainmentPack1/Entertainment/meshes/ToysGames/Toy19/textures/T_Toy19_M.uasset

BIN

Binary file not shown.

Content/AssetPacks/TMEntertainmentPack1/Entertainment/meshes/ToysGames/Toy19/textures/T_Toy19_N.uasset

BIN

Binary file not shown.

Content/AssetPacks/TMEntertainmentPack1/Entertainment/meshes/ToysGames/Toy19/textures/T_Toy19_R.uasset

BIN

Binary file not shown.

Content/AssetPacks/TMEntertainmentPack1/Entertainment/meshes/ToysGames/Toy21/SM_Toy21.uasset

BIN

Binary file not shown.

Content/AssetPacks/TMEntertainmentPack1/Entertainment/meshes/ToysGames/Toy21/materials/MI_Toy21.uasset

BIN

Binary file not shown.

Content/AssetPacks/TMEntertainmentPack1/Entertainment/meshes/ToysGames/Toy21/textures/T_Toy21_BC.uasset

BIN

Binary file not shown.

Content/AssetPacks/TMEntertainmentPack1/Entertainment/meshes/ToysGames/Toy21/textures/T_Toy21_N.uasset

BIN

Binary file not shown.

Content/AssetPacks/TMEntertainmentPack1/Entertainment/meshes/ToysGames/Toy21/textures/T_Toy21_R.uasset

BIN

Binary file not shown.

Content/AssetPacks/TMEntertainmentPack1/Entertainment/meshes/ToysGames/Toy22/SM_Toy22.uasset

BIN

Binary file not shown.

Content/AssetPacks/TMEntertainmentPack1/Entertainment/meshes/ToysGames/Toy22/materials/MI_Toy22.uasset

BIN

Binary file not shown.

Content/AssetPacks/TMEntertainmentPack1/Entertainment/meshes/ToysGames/Toy22/textures/T_Toy22_BC.uasset

BIN

Binary file not shown.

Content/AssetPacks/TMEntertainmentPack1/Entertainment/meshes/ToysGames/Toy22/textures/T_Toy22_N.uasset

BIN

Binary file not shown.

Content/AssetPacks/TMEntertainmentPack1/Entertainment/meshes/ToysGames/Toy22/textures/T_Toy22_R.uasset

BIN

Binary file not shown.

Content/AssetPacks/TMEntertainmentPack1/Entertainment/meshes/ToysGames/Toy25/SM_Toy25.uasset

BIN

Binary file not shown.

Content/AssetPacks/TMEntertainmentPack1/Entertainment/meshes/ToysGames/Toy25/materials/MI_Toy25.uasset

BIN

Binary file not shown.

Content/AssetPacks/TMEntertainmentPack1/Entertainment/meshes/ToysGames/Toy25/textures/T_Toy25_BC.uasset

BIN

Binary file not shown.

Content/AssetPacks/TMEntertainmentPack1/Entertainment/meshes/ToysGames/Toy25/textures/T_Toy25_N.uasset

BIN

Binary file not shown.

Content/AssetPacks/TMEntertainmentPack1/Entertainment/meshes/ToysGames/Toy25/textures/T_Toy25_R.uasset

BIN

Binary file not shown.

Content/AssetPacks/TMEntertainmentPack1/Materials/StdOpaque/MI_StdOpaque.uasset

BIN

Binary file not shown.

Content/AssetPacks/TMEntertainmentPack1/Materials/_common/Textures/T_Bayer64_Grayscale_64px.uasset

BIN

Binary file not shown.

Content/AssetPacks/TMEntertainmentPack1/Materials/_common/Textures/T_Generic_BC.uasset

BIN

Binary file not shown.

Content/AssetPacks/TMEntertainmentPack1/Materials/_common/Textures/T_Generic_E.uasset

BIN

Binary file not shown.

Content/AssetPacks/TMEntertainmentPack1/Materials/_common/Textures/T_Generic_M.uasset

BIN

Binary file not shown.

Content/AssetPacks/TMEntertainmentPack1/Materials/_common/Textures/T_Generic_MT.uasset

BIN

Binary file not shown.

Content/AssetPacks/TMEntertainmentPack1/Materials/_common/Textures/T_Generic_N.uasset

BIN

Binary file not shown.

Content/AssetPacks/TMEntertainmentPack1/Materials/_common/Textures/T_Generic_R.uasset

BIN

Binary file not shown.

Content/Furniture/All/Meshes/Furniture/Bathroom/SM_Washer_Samsung.uasset

BIN

Binary file not shown.

Content/Furniture/Materials/M_BBodyLoution.uasset

BIN

Binary file not shown.

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