Commit Graph

45 Commits

Author SHA1 Message Date
GRAFF e72aa380e5 Merge branch 'master' of http://192.168.1.163:3000/Dron/lifeResidence 2023-04-11 15:26:10 +05:00
GRAFF ae1d917351 тачки, еще люди, загрузка данных по хатам, плагин парсер 2023-04-11 15:25:58 +05:00
PRAyMU c828b24092 Merge branch 'master' of http://192.168.1.163:3000/Dron/lifeResidence 2023-04-11 15:04:22 +05:00
PRAyMU 5f3b274d32 F09_A05_A06 2023-04-11 15:03:28 +05:00
PC-G04 2b88950464 GP1_S04_A05_F09 2023-04-11 13:19:56 +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 805d133826 Col 2023-04-06 19:35:57 +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
PC-G09 4a060c4823 Тачки симпл 2023-04-06 01:45:22 +05:00
GRAFF 1b81e3ef0b RENAMING, highlights mats, loading shits 2023-04-05 23:31:22 +05:00
GRAFF fc107fafaa поинты, загрузка леваков 2023-04-05 21:44:07 +05:00
PC-G12 a70a61ee5b Merge branch 'master' of http://192.168.1.163:3000/Dron/lifeResidence 2023-04-05 14:20:09 +05:00
PC-G12 bf358be6be Parking 2023-04-05 14:17:52 +05:00
PC-G09 de97cf28c1 Фуляга 2023-04-05 08:17:11 +05:00
PC-G09 5cc5a84967 Фуляга 2023-04-05 05:10:59 +05:00
GRAFF 6989443365 Merge branch 'master' of http://192.168.1.163:3000/Dron/lifeResidence 2023-04-04 20:51:36 +05:00
GRAFF 9b9102a9a8 люди, тачки 2023-04-04 20:51:17 +05:00
PC-G09 4f3a46a735 Внешка 2023-04-03 20:11:36 +05:00
PC-G12 9a62df9dec Parkng_wip 2023-04-03 16:58:42 +05:00
PC-G09 f32489bb5d Двор в упор 2023-04-03 08:50:55 +05:00
PC-G09 b415fcb42c Двор 2023-04-03 02:01:17 +05:00
PRAyMU eb6fbcf010 Test_Room_Minimal_P3 2023-03-31 17:47:15 +05:00
PC-G09 a9d5122365 Парк 2023-03-30 19:34:54 +05:00
JohnnyHatchet 02855f2ec5 F_GP1_S01_A01 2023-03-29 19:31:12 +05:00
JohnnyHatchet 3121688b66 Ассет детский, Консерватизм 2023-03-29 15:05:42 +05:00
JohnnyHatchet fe1f4d02bd Интерьеры 2023-03-27 19:55:44 +05:00
PRAyMU 921d5cb7e5 Test_Room_Minimal_P1 2023-03-27 15:42:17 +05:00
PRAyMU ad52f683fb Merge branch 'master' of http://192.168.1.163:3000/Dron/lifeResidence 2023-03-20 22:04:45 +05:00
PRAyMU d876930145 Test_Room_Update_P1 2023-03-20 22:01:36 +05:00
PC-G09 56aa2a8419 Декалиусы и дракониусы 2023-03-20 19:40:21 +05:00
PC-G09 2aaec6c28f Инстансы тачек 2023-03-17 16:45:35 +05:00
PC-G09 2840e2214a Внешка 2023-03-14 11:06:56 +05:00
GRAFF a2c478ba20 крышки, хата, куча кала, в обще +- готово 2023-03-14 03:44:29 +05:00
PC-G13 890f57a499 Merge branch 'master' of http://192.168.1.163:3000/Dron/lifeResidence
# Conflicts:
#	Content/Maps/Interior/M_Test_Room.umap
#	Content/Meshes/Interior/Furniture/SM_Chair_Passion.uasset
2023-03-13 18:40:36 +05:00
PRAyMU 5a61f1a13e Test_Room_Part_4 2023-03-13 18:31:58 +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
PRAyMU e1d9470e88 Test_Room_Part_1 2023-03-10 04:06:02 +05:00
GRAFF 87e4c16457 куча всякого, еще сплайн тачек добавил 2023-01-16 20:40:11 +05:00
PC-G09 25bd1cb25f Куча 2023-01-16 13:47:19 +05:00
GRAFF b51aec9480 LEtsGOOOOOO 2023-01-16 13:17:51 +05:00