Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1

Browse Source

...

This commit is contained in:

graffinpk12

2023-08-01 13:20:45 +05:00

parent 29b5221ca0 4e8b0e7a9d

commit 11c67ae985

315 changed files with 4 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/Blueprints/Lamp/BP_InteriorLamp_Big_Square_80angle.uasset

BIN

Binary file not shown.

Content/Blueprints/Lamp/BP_InteriorLamp_Chandelier.uasset

BIN

Binary file not shown.

Content/Blueprints/Lamp/BP_InteriorLamp_Chandelier_2.uasset

BIN

Binary file not shown.

Content/Blueprints/Lamp/BP_InteriorLamp_Child.uasset

BIN

Binary file not shown.

Content/Blueprints/Lamp/BP_InteriorLamp_CylLamp.uasset

BIN

Binary file not shown.

Content/Blueprints/Lamp/BP_InteriorLamp_CylLamp_Angle80.uasset

BIN

Binary file not shown.

Content/Blueprints/Lamp/BP_InteriorLamp_Small_Square_80Angle.uasset

BIN

Binary file not shown.

Content/Blueprints/Utils/Generators/BP_coffeeGuys.uasset

BIN

Binary file not shown.

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

BIN

Binary file not shown.

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

BIN

Binary file not shown.

Content/Furniture/All/Meshes/Furniture/Boots/SM_AE_vol1_cloth_075_boots_.uasset

BIN

Binary file not shown.

Content/Furniture/All/Meshes/Furniture/Boots/SM_AE_vol1_cloth_082_boots_.uasset

BIN

Binary file not shown.

Content/Furniture/All/Meshes/Furniture/Clothes/SM_AI_vol3_1_clothes_02_0.uasset

BIN

Binary file not shown.

Content/Furniture/All/Meshes/Furniture/Clothes/SM_AI_vol5_3_cloth_068_jacket_v1_0.uasset

BIN

Binary file not shown.

Content/Furniture/All/Meshes/Furniture/Deco/SM_AI_vol4_2_glass_vases_04.uasset

BIN

Binary file not shown.

Content/Furniture/All/Meshes/Furniture/Deco/SM_AI_vol4_2_glass_vases_05.uasset

BIN

Binary file not shown.

Content/Furniture/All/Meshes/Furniture/Deco/SM_AI_vol5_2_candles.uasset

BIN

Binary file not shown.

Content/Furniture/All/Meshes/Furniture/Deco/SM_AI_vol5_5_cupboard_cylinder_2_01.uasset

BIN

Binary file not shown.

Content/Furniture/All/Meshes/Furniture/Deco/SM_AI_vol5_5_cupboard_cylinder_3_01.uasset

BIN

Binary file not shown.

Content/Furniture/All/Meshes/Furniture/Deco/SM_AI_vol5_5_cupboard_cylinder_5_01.uasset

BIN

Binary file not shown.

Content/Furniture/All/Meshes/Furniture/Deco/SM_Magazine_open3.uasset

BIN

Binary file not shown.

Content/Furniture/All/Meshes/Furniture/Deco/SM_Notebook.uasset

BIN

Binary file not shown.

Content/Furniture/All/Meshes/Furniture/Hallway/prop_cloth_005_bag_v1_0.uasset

BIN

Binary file not shown.

Content/Furniture/All/Meshes/Furniture/Sofa/furniture_sofa_003_v2_0.uasset

BIN

Binary file not shown.

Content/Furniture/All/Meshes/Furniture/TV/SM_TV.uasset

BIN

Binary file not shown.

Content/Furniture/Vol2_Unsorted/ELECTRONICS/2_ASSETS/AIR_CONDITIONER/AIR_CONDITIONER_01/BP_Air_Conditioner_01.uasset

BIN

Binary file not shown.

Content/Furniture/Vol2_Unsorted/ELECTRONICS/2_ASSETS/AIR_CONDITIONER/AIR_CONDITIONER_01/SM_air_conditioner_01_body.uasset

BIN

Binary file not shown.

Content/Furniture/Vol2_Unsorted/ELECTRONICS/2_ASSETS/AIR_CONDITIONER/AIR_CONDITIONER_01/SM_air_conditioner_01_leaf.uasset

BIN

Binary file not shown.

Content/Furniture/Vol2_Unsorted/ELECTRONICS/2_ASSETS/COFFEE_BREWER/COFFEE_BREWER_01/BP_coffee_brewer_01.uasset

BIN

Binary file not shown.

Content/Furniture/Vol2_Unsorted/ELECTRONICS/2_ASSETS/COFFEE_BREWER/COFFEE_BREWER_01/SM_coffee_brew_01_body.uasset

BIN

Binary file not shown.

Content/Furniture/Vol2_Unsorted/ELECTRONICS/2_ASSETS/COFFEE_BREWER/COFFEE_BREWER_01/SM_coffee_brew_01_bottle.uasset

BIN

Binary file not shown.

Content/Furniture/Vol2_Unsorted/ELECTRONICS/2_ASSETS/COFFEE_BREWER/COFFEE_BREWER_01/SM_coffee_brew_01_filter.uasset

BIN

Binary file not shown.

Content/Furniture/Vol2_Unsorted/ELECTRONICS/2_ASSETS/COFFEE_BREWER/COFFEE_BREWER_01/SM_coffee_brew_01_spoon.uasset

BIN

Binary file not shown.

Content/Furniture/Vol2_Unsorted/ELECTRONICS/2_ASSETS/COFFEE_BREWER/COFFEE_BREWER_01/SM_coffee_brew_01_water_tank.uasset

BIN

Binary file not shown.

Content/Furniture/Vol2_Unsorted/ELECTRONICS/2_ASSETS/COFFEE_BREWER/COFFEE_BREWER_01/SM_coffee_brew_01_whirl.uasset

BIN

Binary file not shown.

Content/Furniture/Vol2_Unsorted/ELECTRONICS/2_ASSETS/DRYER/DRYER_01/BP_dryer_01.uasset

BIN

Binary file not shown.

Content/Furniture/Vol2_Unsorted/ELECTRONICS/2_ASSETS/DRYER/DRYER_01/SM_dryer_01_body.uasset

BIN

Binary file not shown.

Content/Furniture/Vol2_Unsorted/ELECTRONICS/2_ASSETS/DRYER/DRYER_01/SM_dryer_01_button.uasset

BIN

Binary file not shown.

Content/Furniture/Vol2_Unsorted/ELECTRONICS/2_ASSETS/DRYER/DRYER_01/SM_dryer_01_door.uasset

BIN

Binary file not shown.

Content/Furniture/Vol2_Unsorted/ELECTRONICS/2_ASSETS/DRYER/DRYER_01/SM_dryer_01_whirl.uasset

BIN

Binary file not shown.

Content/Furniture/Vol2_Unsorted/ELECTRONICS/2_ASSETS/GAME_STATION/GAME_CONSOLE/SM_game_console.uasset

BIN

Binary file not shown.

Content/Furniture/Vol2_Unsorted/ELECTRONICS/2_ASSETS/GAME_STATION/GAME_CONTROLLER/BP_game_controller.uasset

BIN

Binary file not shown.

Content/Furniture/Vol2_Unsorted/ELECTRONICS/2_ASSETS/GAME_STATION/GAME_CONTROLLER/SM_game_controller.uasset

BIN

Binary file not shown.

Content/Furniture/Vol2_Unsorted/ELECTRONICS/2_ASSETS/GAME_STATION/GAME_CONTROLLER/SM_game_controller_button.uasset

BIN

Binary file not shown.

Content/Furniture/Vol2_Unsorted/ELECTRONICS/2_ASSETS/HAIR_DRYER/HAIR_DRYER_01/SM_hair_dryer_01.uasset

BIN

Binary file not shown.

Content/Furniture/Vol2_Unsorted/ELECTRONICS/2_ASSETS/PC/PC_SCREEN_01/BP_PC_screen_01.uasset

BIN

Binary file not shown.

Content/Furniture/Vol2_Unsorted/ELECTRONICS/2_ASSETS/PC/PC_SCREEN_01/SM_PC_screen_01_base.uasset

BIN

Binary file not shown.

Content/Furniture/Vol2_Unsorted/ELECTRONICS/2_ASSETS/PC/PC_SCREEN_01/SM_PC_screen_01_body.uasset

BIN

Binary file not shown.

Content/Furniture/Vol2_Unsorted/ELECTRONICS/2_ASSETS/PC/PC_SCREEN_01/SM_PC_screen_01_joint_01.uasset

BIN

Binary file not shown.

Content/Furniture/Vol2_Unsorted/ELECTRONICS/2_ASSETS/PC/PC_SCREEN_01/SM_PC_screen_01_joint_02.uasset

BIN

Binary file not shown.

Content/Furniture/Vol2_Unsorted/ELECTRONICS/2_ASSETS/PC/PC_SCREEN_01/SM_PC_screen_01_joint_mid.uasset

BIN

Binary file not shown.

Content/Furniture/Vol2_Unsorted/ELECTRONICS/2_ASSETS/PC/PC_case_01/SM_PC_case_01_.uasset

BIN

Binary file not shown.

Content/Furniture/Vol2_Unsorted/ELECTRONICS/2_ASSETS/PRINTER/PRINTER_01/BP_printer_01.uasset

BIN

Binary file not shown.

Content/Furniture/Vol2_Unsorted/ELECTRONICS/2_ASSETS/PRINTER/PRINTER_01/SM_printer_01_body.uasset

BIN

Binary file not shown.

Content/Furniture/Vol2_Unsorted/ELECTRONICS/2_ASSETS/PRINTER/PRINTER_01/SM_printer_01_input.uasset

BIN

Binary file not shown.

Content/Furniture/Vol2_Unsorted/ELECTRONICS/2_ASSETS/PRINTER/PRINTER_01/SM_printer_01_output.uasset

BIN

Binary file not shown.

Content/Furniture/Vol2_Unsorted/ELECTRONICS/2_ASSETS/SPEAKER/SPEAKER_01/SM_speaker_01_DVD.uasset

BIN

Binary file not shown.

Content/Furniture/Vol2_Unsorted/ELECTRONICS/2_ASSETS/TOASTER/TOASTER_01/BP_toaster_01.uasset

BIN

Binary file not shown.

Content/Furniture/Vol2_Unsorted/ELECTRONICS/2_ASSETS/TOASTER/TOASTER_01/SM_toaster_01_body.uasset

BIN

Binary file not shown.

Content/Furniture/Vol2_Unsorted/ELECTRONICS/2_ASSETS/TOASTER/TOASTER_01/SM_toaster_01_holder.uasset

BIN

Binary file not shown.

Content/Furniture/Vol2_Unsorted/ELECTRONICS/2_ASSETS/TOASTER/TOASTER_01/SM_toaster_01_level.uasset

BIN

Binary file not shown.

Content/Furniture/Vol2_Unsorted/ELECTRONICS/2_ASSETS/TOASTER/TOASTER_01/SM_toaster_01_valve.uasset

BIN

Binary file not shown.

Content/Furniture/Vol2_Unsorted/ELECTRONICS/2_ASSETS/TV/TV_01/SM_TV_01.uasset

BIN

Binary file not shown.

Content/Furniture/Vol2_Unsorted/ELECTRONICS/2_ASSETS/VACCUM_CLEANER/VACCUM_CLEANER_01/BP_vaccum_cleaner_01.uasset

BIN

Binary file not shown.

Content/Furniture/Vol2_Unsorted/ELECTRONICS/2_ASSETS/VACCUM_CLEANER/VACCUM_CLEANER_01/SM_vaccum_cleaner_01_body.uasset

BIN

Binary file not shown.

Content/Furniture/Vol2_Unsorted/ELECTRONICS/2_ASSETS/VACCUM_CLEANER/VACCUM_CLEANER_01/SM_vaccum_cleaner_01_charger.uasset

BIN

Binary file not shown.

Content/Furniture/Vol2_Unsorted/ELECTRONICS/2_ASSETS/VACCUM_CLEANER/VACCUM_CLEANER_01/SM_vaccum_cleaner_01_dust_box.uasset

BIN

Binary file not shown.

Content/Furniture/Vol2_Unsorted/ELECTRONICS/2_ASSETS/WASHING_MACHINE/WASHING_MACHINE_01/BP_washing_machine.uasset

BIN

Binary file not shown.

Content/Furniture/Vol2_Unsorted/ELECTRONICS/2_ASSETS/WASHING_MACHINE/WASHING_MACHINE_01/SM_washing_machine_01_body.uasset

BIN

Binary file not shown.

Content/Furniture/Vol2_Unsorted/ELECTRONICS/2_ASSETS/WASHING_MACHINE/WASHING_MACHINE_01/SM_washing_machine_01_door.uasset

BIN

Binary file not shown.

Content/Furniture/Vol2_Unsorted/ELECTRONICS/2_ASSETS/WASHING_MACHINE/WASHING_MACHINE_01/SM_washing_machine_01_whirl.uasset

BIN

Binary file not shown.

Content/Furniture/Vol2_Unsorted/FurniturePack/Assets/Furniture/Bathroom/SM_BBodyLoution.uasset

BIN

Binary file not shown.

Content/Furniture/Vol2_Unsorted/FurniturePack/Assets/Furniture/Bathroom/SM_BHandShampoo.uasset

BIN

Binary file not shown.

Content/Furniture/Vol2_Unsorted/FurniturePack/Assets/Furniture/Bathroom/SM_BShampoo.uasset

BIN

Binary file not shown.

Content/Furniture/Vol2_Unsorted/FurniturePack/Assets/Furniture/Bathroom/SM_BShaveCream.uasset

BIN

Binary file not shown.

Content/Furniture/Vol2_Unsorted/FurniturePack/Assets/Furniture/Bathroom/SM_BathRoom_Tap.uasset

BIN

Binary file not shown.

Content/Furniture/Vol2_Unsorted/FurniturePack/Assets/Furniture/BedRoom/BedRoom_01/SM_Bag.uasset

BIN

Binary file not shown.

Content/Furniture/Vol2_Unsorted/FurniturePack/Assets/Furniture/BedRoom/BedRoom_01/SM_Bag_Pink.uasset

BIN

Binary file not shown.

Content/Furniture/Vol2_Unsorted/FurniturePack/Assets/Furniture/BedRoom/BedRoom_01/SM_MBed_Deco_05.uasset

BIN

Binary file not shown.

Content/Furniture/Vol2_Unsorted/FurniturePack/Assets/Furniture/BedRoom/BedRoom_01/SM_MBed_Deco_06.uasset

BIN

Binary file not shown.

Content/Furniture/Vol2_Unsorted/FurniturePack/Assets/Furniture/BedRoom/BedRoom_01/SM_MBed_Deco_10.uasset

BIN

Binary file not shown.

Content/Furniture/Vol2_Unsorted/FurniturePack/Assets/Furniture/BedRoom/BedRoom_01/SM_MBed_Deco_11.uasset

BIN

Binary file not shown.

Content/Furniture/Vol2_Unsorted/FurniturePack/Assets/Furniture/BedRoom/BedRoom_01/SM_MBed_Deco_13.uasset

BIN

Binary file not shown.

Content/Furniture/Vol2_Unsorted/FurniturePack/Assets/Furniture/BedRoom/BedRoom_01/SM_Wardrobe_Box.uasset

BIN

Binary file not shown.

Content/Furniture/Vol2_Unsorted/FurniturePack/Assets/Furniture/BedRoom/BedRoom_02/SM_Deco_01.uasset

BIN

Binary file not shown.

Content/Furniture/Vol2_Unsorted/FurniturePack/Assets/Furniture/BedRoom/BedRoom_02/SM_Deco_HourGlass.uasset

BIN

Binary file not shown.

Content/Furniture/Vol2_Unsorted/FurniturePack/Assets/Furniture/BedRoom/BedRoom_02/SM_Deco_Tri.uasset

BIN

Binary file not shown.

Content/Furniture/Vol2_Unsorted/FurniturePack/Assets/Furniture/BedRoom/BedRoom_03/SM_3Bed_Light1.uasset

BIN

Binary file not shown.

Content/Furniture/Vol2_Unsorted/FurniturePack/Assets/Furniture/BedRoom/BedRoom_03/SM_Kid_Book_Pen.uasset

BIN

Binary file not shown.

Content/Furniture/Vol2_Unsorted/FurniturePack/Assets/Furniture/BedRoom/BedRoom_03/SM_Kid_Box.uasset

BIN

Binary file not shown.

Content/Furniture/Vol2_Unsorted/FurniturePack/Assets/Furniture/BedRoom/BedRoom_03/SM_Kid_Lamp.uasset

BIN

Binary file not shown.

Content/Furniture/Vol2_Unsorted/FurniturePack/Assets/Furniture/BedRoom/BedRoom_03/SM_Kid_Notebooks.uasset

BIN

Binary file not shown.

Content/Furniture/Vol2_Unsorted/FurniturePack/Assets/Furniture/BedRoom/BedRoom_03/SM_Kid_Owl.uasset

BIN

Binary file not shown.

Content/Furniture/Vol2_Unsorted/FurniturePack/Assets/Furniture/BedRoom/BedRoom_03/SM_Kid_Pens.uasset

BIN

Binary file not shown.

Content/Furniture/Vol2_Unsorted/FurniturePack/Assets/Furniture/BedRoom/BedRoom_03/SM_Kid_Toys.uasset

BIN

Binary file not shown.

Content/Furniture/Vol2_Unsorted/FurniturePack/Assets/Furniture/BedRoom/BedRoom_03/SM_Kid_Toys_02.uasset

BIN

Binary file not shown.

Content/Furniture/Vol2_Unsorted/FurniturePack/Assets/Furniture/BedRoom/SM_BBird.uasset

BIN

Binary file not shown.

Content/Furniture/Vol2_Unsorted/FurniturePack/Assets/Furniture/BedRoom/SM_BBooks_01.uasset

BIN

Binary file not shown.

Content/Furniture/Vol2_Unsorted/FurniturePack/Assets/Furniture/BedRoom/SM_BBooks_02.uasset

BIN

Binary file not shown.

Content/Furniture/Vol2_Unsorted/FurniturePack/Assets/Furniture/BedRoom/SM_BBooks_03.uasset

BIN

Binary file not shown.

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