Commit Graph

39 Commits

Author SHA1 Message Date
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
GRAFF f86d4f9218 asdasd 2023-04-06 01:46:26 +05:00
PC-G13 d8ece8e3c0 sm 2023-04-05 21:10:32 +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
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-G04 29fdbb3d74 Merge branch 'master' of http://192.168.1.163:3000/Dron/lifeResidence 2023-04-04 12:05:00 +05:00
PC-G04 20195aeb4a BP_Lamps,Interiors 2023-04-04 12:04:38 +05:00
PC-G12 9a62df9dec Parkng_wip 2023-04-03 16:58:42 +05:00
PC-G04 3559766369 Irina 2023-04-01 17:48:13 +05:00
PC-G04 1e101eadca F_GP1_S03_A03 2023-03-31 17:16:37 +05:00
PC-G13 d4e4edf9c6 MM_tilerandom_anotherOne 2023-03-30 13:08:41 +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 e073e158bd Merge branch 'master' of http://192.168.1.163:3000/Dron/lifeResidence
# Conflicts:
#	Content/Furniture/Vol2_Unsorted/FurniturePack/Assets/Furniture/Meshes/Candle.uasset
#	Content/Furniture/Vol2_Unsorted/FurniturePack/Assets/Furniture/Meshes/Candlestick_03.uasset
2023-03-29 03:10:00 +05:00
PRAyMU 726139843b Test_Room_Minimal_P2 2023-03-29 03:08:17 +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 3f8d03ad11 Test_Room_Lounge_P1 2023-03-24 01:50:53 +05:00
JohnnyHatchet 52ed1cb717 Furniture with materials V2 2023-03-23 10:19:01 +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-G13 b52bfed842 levels GP1S01 2023-03-20 19:01:02 +05:00
GRAFF a2c478ba20 крышки, хата, куча кала, в обще +- готово 2023-03-14 03:44:29 +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
JohnnyHatchet fcfc8064d5 Спальня и ванная 2023-03-13 14:24:15 +05:00
PRAyMU 62b0a1c7bc Test_Room_Part_3 2023-03-13 04:16:04 +05:00
JohnnyHatchet 76ff3a32f0 Ирина 2023-03-10 19:56:20 +05:00
PC-G13 18659244e1 Furniture, GP1 transforms 2023-03-10 18:28:51 +05:00