483 Commits

Author SHA1 Message Date
PC-G09 9796231ccc ВнешОчка 2023-03-24 15:14:37 +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
JohnnyHatchet 52ed1cb717 Furniture with materials V2 2023-03-23 10:19:01 +05:00
JohnnyHatchet a6d44b0108 Merge branch 'master' of http://192.168.1.163:3000/Dron/lifeResidence 2023-03-22 18:10:10 +05:00
JohnnyHatchet b1c8c095d6 InteriorsV2_Furniture_Texture 2023-03-22 18:10:04 +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-G09 56aa2a8419 Декалиусы и дракониусы 2023-03-20 19:40:21 +05:00
PC-G13 6a0df8c505 Merge branch 'master' of http://192.168.1.163:3000/Dron/lifeResidence 2023-03-20 19:01:56 +05:00
PC-G13 b52bfed842 levels GP1S01 2023-03-20 19:01:02 +05:00
PC-G09 2aaec6c28f Инстансы тачек 2023-03-17 16:45:35 +05:00
PC-G09 a465e18483 тачк 2023-03-17 16:10:33 +05:00
GRAFF 3529ec15e2 ws v0.8a 2023-03-16 00:46:21 +05:00
PC-G09 7339def1da Рядом с жилкой земеля 2023-03-15 21:08:09 +05:00
PC-G09 8eb593a504 Park 2023-03-15 20:40:56 +05:00
GRAFF 8a72c91148 всякий shit 2023-03-15 20:25:30 +05:00
PC-G09 fd70b3466c Дворы 2023-03-15 20:19:47 +05:00
PC-G09 8cefd5c420 park 2023-03-15 19:32:09 +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
PC-G09 b92d62d89f Doma 2023-03-15 17:25:04 +05:00
GRAFF 7086d62b62 UI косяки 2023-03-15 15:31:47 +05:00
PC-G09 0fe9ad0db7 Дырка в декаль 2023-03-15 14:51:56 +05:00
GRAFF ddff93b265 Merge branch 'master' of http://192.168.1.163:3000/Dron/lifeResidence
# Conflicts:
#	Content/Blueprints/UI/Widgets/SubMenu/NavigationBars.uasset
2023-03-15 14:29:36 +05:00
GRAFF 14f8be1632 йобана 2023-03-15 13:04:43 +05:00
GRAFF 42f726dd87 ъ 2023-03-14 15:24:22 +05:00
GRAFF 41ae7bb038 ыа 2023-03-14 15:12:21 +05:00
GRAFF 8379739c52 asa 2023-03-14 14:45:39 +05:00
GRAFF b9b6c12d95 A 2023-03-14 14:18:46 +05:00
GRAFF 94242e80d0 Merge remote-tracking branch 'origin/master' 2023-03-14 13:48:42 +05:00
GRAFF ec6ba9f009 Косяки 2023-03-14 13:47:27 +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 977126e055 DoorFade, somecollision, lightchannel 2023-03-13 19:52:56 +05:00
PC-G13 e22016b861 Merge branch 'master' of http://192.168.1.163:3000/Dron/lifeResidence 2023-03-13 19:36:59 +05:00
PC-G13 c4777671fc demoroom 2023-03-13 19:36:56 +05:00
GRAFF e8f34ca0e8 Ы 2023-03-13 19:18:05 +05:00
GRAFF ff8ce5d48e Merge remote-tracking branch 'origin/master' 2023-03-13 19:13:22 +05:00
GRAFF 07ab032280 UI 2023-03-13 18:51:21 +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
PRAyMU 1568b06975 Merge branch 'master' of http://192.168.1.163:3000/Dron/lifeResidence 2023-03-10 21:10:03 +05:00