Commit Graph

23 Commits

Author SHA1 Message Date
PC-G13 f7f30ddb2e gp2(1). refl, f09 2023-04-18 18:59:22 +05:00
DESKTOP-8J0BKKD\Admin ff03798fcf Окна на балкон 2023-04-17 18:39:39 +05:00
PC-G13 0d6e85d7c2 f09, svet, bp elevatora+meshes, parkingWIP, numbers meshes 2023-04-13 16:46:08 +05:00
DESKTOP-8J0BKKD\Admin 8cd8dea914 GP2_S04_SA06 2023-04-12 16:02:45 +05:00
PC-G13 f70c9bb3e2 smth gp1 2023-04-11 16:26:45 +05:00
PC-G13 08784923b3 smth 2023-04-10 15:42:16 +05:00
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-G12 05ab5ef850 Merge branch 'master' of http://192.168.1.163:3000/Dron/lifeResidence 2023-04-06 19:36:05 +05:00
PC-G12 805d133826 Col 2023-04-06 19:35:57 +05:00
Igor 1e6b5dd582 Merge branch 'master' of http://192.168.1.163:3000/Dron/lifeResidence
# Conflicts:
#	Content/Meshes/Interior/Gp2/Plinth/SM_GP2_F2_S01_A03_Plinth.uasset
#	Content/Meshes/Interior/Window/SM_Window_08.uasset
2023-04-06 16:36:12 +05:00
Igor cd0a5eee14 GP2_S01_A03 2023-04-06 16:35:19 +05:00
PC-G12 b83c15a74a Merge branch 'master' of http://192.168.1.163:3000/Dron/lifeResidence
# Conflicts:
#	Content/Meshes/Interior/Window/SM_Window_08.uasset
2023-04-06 14:45:06 +05:00
PC-G12 16692a6dfc Home 2023-04-06 14:42:32 +05:00
PRAyMU 313ea77cf7 Merge branch 'master' of http://192.168.1.163:3000/Dron/lifeResidence
# Conflicts:
#	Content/Maps/Interior/GP1/F09/S01/GP1_S01_A05_F09.umap
#	Content/Meshes/Interior/Window/SM_Window_Angular.uasset
#	Content/Meshes/Interior/Window/SM_Windowsill.uasset
2023-04-06 02:39:28 +05:00
PRAyMU e3d6ca7fda GP1_F09_S01_A05_P1 2023-04-06 02:23:56 +05:00
PC-G13 fe625b0cb8 GP1_S01_A01,A02,A04 2023-04-05 21:52:29 +05:00
PC-G04 20195aeb4a BP_Lamps,Interiors 2023-04-04 12:04:38 +05:00
PC-G04 3559766369 Irina 2023-04-01 17:48:13 +05:00
PC-G04 3df07e1641 Interior 2023-03-31 14:09:05 +05:00
PC-G04 f0b8ad5ace InteriorsIrina 2023-03-30 20:04:23 +05:00
PC-G13 7726f57f84 levels 2023-03-22 18:02:01 +05:00