483 Commits

Author SHA1 Message Date
PC-G08 e5686d287e GP01_Lvls_BF_and_F 2023-04-10 15:39:00 +05:00
DESKTOP-8J0BKKD\Admin 9e24f07d46 Merge branch 'master' of http://192.168.1.163:3000/Dron/lifeResidence 2023-04-10 13:53:24 +05:00
DESKTOP-8J0BKKD\Admin e83414e135 S04_A04_F09 2023-04-10 13:53:21 +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
PC-G12 98e8703d70 Redirections 2023-04-10 13:00:37 +05:00
PC-G12 0151ba39cd Merge branch 'master' of http://192.168.1.163:3000/Dron/lifeResidence 2023-04-10 12:12:21 +05:00
PC-G12 4f074552ef Come eat 2023-04-10 12:12:14 +05:00
PC-G04 116e1b79e7 Merge branch 'master' of http://192.168.1.163:3000/Dron/lifeResidence 2023-04-09 19:56:39 +05:00
PC-G04 e77dd51ec3 GP1_S04_A05 2023-04-09 19:56:32 +05:00
Igor 85841d835d F_GP2_S03_A03 F_GP2_S02_A02 2023-04-09 19:52:36 +05:00
Igor f0dce537b7 F_GP2_S02_A02_F_GP2_S01_A03 2023-04-07 20:02:02 +05:00
PC-G04 9252d1588d Merge branch 'master' of http://192.168.1.163:3000/Dron/lifeResidence 2023-04-07 19:57:44 +05:00
PC-G04 0e6b55cc3d Много интерьеров 2023-04-07 19:57:38 +05:00
PC-G12 a0ef43b911 Merge branch 'master' of http://192.168.1.163:3000/Dron/lifeResidence 2023-04-07 19:38:20 +05:00
PC-G12 16515e0e41 BaseFloors 2023-04-07 19:38:14 +05:00
GRAFF ff6ab62888 Merge remote-tracking branch 'origin/master' 2023-04-07 18:51:09 +05:00
GRAFF de12f57cd1 Очередной юай фихс 2023-04-07 18:50:51 +05:00
DESKTOP-8J0BKKD\Admin 94c971d763 Merge branch 'master' of http://192.168.1.163:3000/Dron/lifeResidence 2023-04-07 18:50:45 +05:00
DESKTOP-8J0BKKD\Admin 6537fb63ce GP2_S01_A01/S02_A03/S03_A01/S03_A02/S04_A01 2023-04-07 18:50:41 +05:00
PC-G08 4121ca2728 Lvls_BF 2023-04-07 17:34:06 +05:00
PC-G08 73a188628c gp1_walls 2023-04-07 14:46:27 +05:00
PC-G12 fd2b9a65f0 Merge branch 'master' of http://192.168.1.163:3000/Dron/lifeResidence 2023-04-07 14:28:30 +05:00
PC-G12 2cdaa791ec GP2S04A03 2023-04-07 14:28:24 +05:00
PC-G04 b9f33ac728 Merge branch 'master' of http://192.168.1.163:3000/Dron/lifeResidence
# Conflicts:
#	Content/Meshes/Interior/Gp2/Plinth/SM_GP2_F2_S01_A02_Plinth.uasset
2023-04-07 12:34:16 +05:00
PC-G04 063e7b8cbc F_GP2_S01_A00, F_GP2_S01_A02, F_GP2_S02_A04 2023-04-07 12:15:58 +05:00
PC-G12 c7f45f2a71 Merge branch 'master' of http://192.168.1.163:3000/Dron/lifeResidence 2023-04-07 12:11:00 +05:00
PC-G12 9d75a33d53 1 2023-04-07 12:10:55 +05:00
GRAFF 7adc9232e6 Немного UI fix 2023-04-07 11:37:10 +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
DESKTOP-8J0BKKD\Admin 66f031b119 Merge branch 'master' of http://192.168.1.163:3000/Dron/lifeResidence 2023-04-06 18:21:35 +05:00
DESKTOP-8J0BKKD\Admin d81a829723 GP2_S02_A03 2023-04-06 18:21:31 +05:00
PC-G08 c3d61c0043 Lvls_W_GP1 2023-04-06 18:17:45 +05:00
GRAFF b193112ab0 Merge remote-tracking branch 'origin/master' 2023-04-06 17:25:48 +05:00
GRAFF 815a35b3a2 UI fix 2023-04-06 17:25:15 +05:00
DESKTOP-8J0BKKD\Admin 5e35162f61 Merge branch 'master' of http://192.168.1.163:3000/Dron/lifeResidence 2023-04-06 17:04:48 +05:00
DESKTOP-8J0BKKD\Admin 92088f9061 GP2_S01_A01 2023-04-06 17:04:45 +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
DESKTOP-8J0BKKD\Admin 5d201c5458 Правки некоторых хат 2023-04-06 12:44:41 +05:00
GRAFF d410e45920 Merge branch 'master' of http://192.168.1.163:3000/Dron/lifeResidence 2023-04-06 04:56:55 +05:00
GRAFF 279ea5369f gbpltw 2023-04-06 04:56:48 +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
GRAFF 7f2901d31f Merge branch 'master' of http://192.168.1.163:3000/Dron/lifeResidence
# Conflicts:
#	Content/Materials/Interior/MI_Emissive_0_Power_Warm.uasset
2023-04-06 01:46:46 +05:00
GRAFF f86d4f9218 asdasd 2023-04-06 01:46:26 +05:00
PC-G09 4a060c4823 Тачки симпл 2023-04-06 01:45:22 +05:00