Commit Graph

32 Commits

Author SHA1 Message Date
PC-G13 7ad0ff0502 коллизии, немного пробок, пара шейдеров, 2023-04-14 15:10:13 +05:00
PC-G13 0d6e85d7c2 f09, svet, bp elevatora+meshes, parkingWIP, numbers meshes 2023-04-13 16:46:08 +05:00
PC-G13 ecbdca5039 smth 2023-04-13 01:33:46 +05:00
PC-G13 b93abcd470 Merge branch 'master' of http://192.168.1.163:3000/Dron/lifeResidence
# Conflicts:
#	Content/Blueprints/Lamp/Interior_Konserva/BP_InteriorLamp_Lamp_1.uasset
#	Content/Blueprints/Lamp/Interior_Lounge/BP_InteriorLamp_Cylindr_Res.uasset
#	Content/Blueprints/Lamp/Interior_Minimalism/BP_InteriorLamp_Pendant_Crouise.uasset
#	Content/Furniture/Vol2_Unsorted/FurniturePack/Assets/Furniture/Lamps/WallLampsMaterial/MI_WallLamp.uasset
2023-04-11 16:27:29 +05:00
PC-G13 f70c9bb3e2 smth gp1 2023-04-11 16:26:45 +05:00
PC-G04 2b88950464 GP1_S04_A05_F09 2023-04-11 13:19:56 +05:00
PC-G04 05974f64f4 Merge branch 'master' of http://192.168.1.163:3000/Dron/lifeResidence 2023-04-10 16:32:34 +05:00
PC-G04 5084ed2cd7 GP1_S04_A05_F09 2023-04-10 16:32:29 +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
PC-G04 e77dd51ec3 GP1_S04_A05 2023-04-09 19:56:32 +05:00
PC-G12 805d133826 Col 2023-04-06 19:35:57 +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-G12 bf358be6be Parking 2023-04-05 14:17:52 +05:00
PC-G04 3559766369 Irina 2023-04-01 17:48:13 +05:00
PRAyMU eb6fbcf010 Test_Room_Minimal_P3 2023-03-31 17:47:15 +05:00
JohnnyHatchet 02855f2ec5 F_GP1_S01_A01 2023-03-29 19:31:12 +05:00
JohnnyHatchet 6b0e95415a Merge branch 'master' of http://192.168.1.163:3000/Dron/lifeResidence
# Conflicts:
#	Content/Furniture/Vol2_Unsorted/FurniturePack/Assets/Furniture/Living/SM_LDC_Book_11.uasset
#	Content/Furniture/Vol2_Unsorted/FurniturePack/Assets/Furniture/Tableware/SM_Cup.uasset
2023-03-29 15:06:13 +05:00
JohnnyHatchet 3121688b66 Ассет детский, Консерватизм 2023-03-29 15:05:42 +05:00
PRAyMU 726139843b Test_Room_Minimal_P2 2023-03-29 03:08:17 +05:00
PRAyMU 921d5cb7e5 Test_Room_Minimal_P1 2023-03-27 15:42:17 +05:00
PRAyMU 3f8d03ad11 Test_Room_Lounge_P1 2023-03-24 01:50:53 +05:00
PRAyMU 1fb8da18fb Plinth_P1 2023-03-23 16:12:53 +05:00
PRAyMU d876930145 Test_Room_Update_P1 2023-03-20 22:01:36 +05:00
PC-G13 afb9cdd603 FixCall 2023-03-15 18:41:57 +05:00
GRAFF 8379739c52 asa 2023-03-14 14:45:39 +05:00
PC-G13 977126e055 DoorFade, somecollision, lightchannel 2023-03-13 19:52:56 +05:00
PC-G13 c4777671fc demoroom 2023-03-13 19:36:56 +05:00
PC-G13 57110fc340 gp2 transforms, demoroom 2023-03-13 18:24:29 +05:00
PRAyMU 62b0a1c7bc Test_Room_Part_3 2023-03-13 04:16:04 +05:00