Commit Graph

5 Commits

Author SHA1 Message Date
PC-G13 9afb07252d Merge branch 'master' of http://192.168.1.163:3000/Dron/lifeResidence
# Conflicts:
#	Content/Furniture/Vol2_Unsorted/FurniturePack/Assets/Furniture/Living/SM_LTV.uasset
#	Content/Furniture/Vol2_Unsorted/Textures/T_BShoe_Fabric_R.uasset
#	Content/Furniture/Vol2_Unsorted/Unimodels_Department_Vol_1/Materials/MI_Metal_Gold_Light.uasset
#	Content/Furniture/Vol2_Unsorted/Unimodels_Department_Vol_1/Meshes/Bedroom/SM_Bed_Queen.uasset
#	Content/Meshes/Interior/Furniture/Interior_V3/SM_Lamp_3_SM_Lamp_3.uasset
#	Content/Meshes/Interior/Furniture/Interior_V3/SM_Table_Lounge_Table.uasset
#	Content/Meshes/Interior/Furniture/Interior_V3/SM_Tidafors_Sofa.uasset
#	Content/Meshes/Interior/Furniture/Interior_V3/SM_Wardrobe_3_SM_Wardrobe_3.uasset
#	Content/Meshes/Interior/Furniture/Interior_V3/SM_child_bed_1_SM_child_bed_1.uasset
#	Content/Meshes/Interior/Furniture/Interior_V3/SM_child_bed_2_SM_child_bed_3.uasset
#	Content/Meshes/Interior/Furniture/Interior_V3/SM_child_dresser.uasset
#	Content/Meshes/Interior/Furniture/Interior_V3/SM_child_shelf.uasset
#	Content/Meshes/Interior/Furniture/Interior_V3/SM_child_table.uasset
#	Content/Meshes/Interior/Window/SM_Window_08.uasset
#	Content/Meshes/Interior/Window/SM_Windowsill.uasset
2023-04-10 13:06:43 +05:00
PC-G13 599a0ff47b interiorshaders, ies, lamps,cubemapstex 2023-04-10 13:06:21 +05:00
Igor 85841d835d F_GP2_S03_A03 F_GP2_S02_A02 2023-04-09 19:52:36 +05:00
PC-G04 3559766369 Irina 2023-04-01 17:48:13 +05:00
PC-G04 f0b8ad5ace InteriorsIrina 2023-03-30 20:04:23 +05:00