Commit Graph

59 Commits

Author SHA1 Message Date
PC-G04 20195aeb4a BP_Lamps,Interiors 2023-04-04 12:04:38 +05:00
PC-G04 de34946a67 F_GP1_S01_A02
F_GP1_S01_A03
F_GP1_S02_A01
2023-04-03 16:34:57 +05:00
PC-G04 255d2b3f4d Merge branch 'master' of http://192.168.1.163:3000/Dron/lifeResidence 2023-04-01 17:48:20 +05:00
PC-G04 3559766369 Irina 2023-04-01 17:48:13 +05:00
DESKTOP-8J0BKKD\Admin 3a131c6797 GP1_S03_A00-A04 2023-04-01 17:37:44 +05:00
DESKTOP-8J0BKKD\Admin dc03071d72 Добавление мешей стен в леваки GP2 2023-03-31 19:49:47 +05:00
PC-G04 92b7d1e8b1 Merge branch 'master' of http://192.168.1.163:3000/Dron/lifeResidence
# Conflicts:
#	Content/Maps/Interior/GP1/Walls/F02/S04/W_GP1_S04_F02_A03.umap
2023-03-31 18:00:35 +05:00
PC-G04 e59e700294 F_GP1_S04_A03 2023-03-31 18:00:04 +05:00
DESKTOP-8J0BKKD\Admin e0616289b4 Merge branch 'master' of http://192.168.1.163:3000/Dron/lifeResidence
# Conflicts:
#	Content/Maps/Interior/GP1/Walls/F02/S03/W_GP1_S03_F02_A03.umap
2023-03-31 17:57:52 +05:00
DESKTOP-8J0BKKD\Admin 3319b38459 Закинут меши стен полков и полов в леваки 2023-03-31 17:52:11 +05:00
PC-G08 b390c1922a gp1gp2Mops 2023-03-31 17:51:07 +05:00
PC-G04 3d33af9286 Merge branch 'master' of http://192.168.1.163:3000/Dron/lifeResidence 2023-03-31 17:16:43 +05:00
PC-G04 1e101eadca F_GP1_S03_A03 2023-03-31 17:16:37 +05:00
DESKTOP-8J0BKKD\Admin 9ec8bd8e7f Merge branch 'master' of http://192.168.1.163:3000/Dron/lifeResidence 2023-03-31 15:45:06 +05:00
DESKTOP-8J0BKKD\Admin dee59777bd GP1_S03_A00 2023-03-31 15:45:02 +05:00
PC-G13 0e033102ad Merge branch 'master' of http://192.168.1.163:3000/Dron/lifeResidence 2023-03-31 14:43:56 +05:00
PC-G13 dc433e7d8a furniture levels _gp2 2023-03-31 14:43:49 +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
JohnnyHatchet fb0728f687 3.3, 2.1, 2.2
Уровни со стенами
2023-03-30 12:03:31 +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
PC-G08 fce46f8f01 MOP_GP01 2023-03-28 18:45:10 +05:00
JohnnyHatchet fe1f4d02bd Интерьеры 2023-03-27 19:55:44 +05:00
PRAyMU 815e9f7c63 Merge branch 'master' of http://192.168.1.163:3000/Dron/lifeResidence 2023-03-27 15:42:22 +05:00
PRAyMU 921d5cb7e5 Test_Room_Minimal_P1 2023-03-27 15:42:17 +05:00
JohnnyHatchet aefaf3f30b Интерьеры 2.1 и 2.2 2023-03-27 14:46:41 +05:00
PRAyMU 3f8d03ad11 Test_Room_Lounge_P1 2023-03-24 01:50:53 +05:00
PRAyMU c0befaef3e Merge branch 'master' of http://192.168.1.163:3000/Dron/lifeResidence 2023-03-23 16:13:01 +05:00
PRAyMU 1fb8da18fb Plinth_P1 2023-03-23 16:12:53 +05:00
PC-G13 6bb13bec98 Merge branch 'master' of http://192.168.1.163:3000/Dron/lifeResidence 2023-03-22 18:03:07 +05:00
PC-G13 7726f57f84 levels 2023-03-22 18:02: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
PC-G13 06d11ce14d Merge branch 'master' of http://192.168.1.163:3000/Dron/lifeResidence
# Conflicts:
#	Content/Maps/Interior/GP1/GP1_DemoRoom.umap
#	Content/Materials/Interior/Interior_Mat/MI_Floor_Parquet_Res.uasset
2023-03-15 18:54:44 +05:00
PC-G13 afb9cdd603 FixCall 2023-03-15 18:41:57 +05:00
GRAFF 14f8be1632 йобана 2023-03-15 13:04:43 +05:00
GRAFF a2c478ba20 крышки, хата, куча кала, в обще +- готово 2023-03-14 03:44:29 +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 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 d9415bc9ce Merge branch 'master' of http://192.168.1.163:3000/Dron/lifeResidence 2023-03-13 18:33:50 +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
JohnnyHatchet fcfc8064d5 Спальня и ванная 2023-03-13 14:24:15 +05:00
PRAyMU 62b0a1c7bc Test_Room_Part_3 2023-03-13 04:16:04 +05:00