Commit Graph

55 Commits

Author SHA1 Message Date
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
PRAyMU ef6b28c225 Test_Room_Part_2 2023-03-10 20:53:40 +05:00
GRAFF 06c3b0b91c Merge branch 'master' of http://192.168.1.163:3000/Dron/lifeResidence 2023-03-10 20:08:47 +05:00
GRAFF 27d07e6345 some 2023-03-10 20:08:16 +05:00
JohnnyHatchet 142de6fdbf Merge branch 'master' of http://192.168.1.163:3000/Dron/lifeResidence 2023-03-10 19:56:25 +05:00
JohnnyHatchet 76ff3a32f0 Ирина 2023-03-10 19:56:20 +05:00
PC-G13 b2a9522def 1 2023-03-10 19:53:19 +05:00
PC-G13 18659244e1 Furniture, GP1 transforms 2023-03-10 18:28:51 +05:00
PC-G13 6dcc335191 Merge branch 'master' of http://192.168.1.163:3000/Dron/lifeResidence 2023-03-10 17:40:59 +05:00
PC-G13 5fd233c101 zaglushki 2023-03-10 17:40:24 +05:00
PRAyMU e1d9470e88 Test_Room_Part_1 2023-03-10 04:06:02 +05:00
Andrew 9189422494 UI почти полность рабочий поиск 2023-03-03 18:42:45 +05:00
Andrew db80853699 UI 2023-03-02 12:39:03 +05:00
Andrew 62bec319cd Some UI shit 2023-02-13 18:51:28 +05:00
Andrew 226c476689 Слайдер гаммы починен 2023-01-18 10:59:18 +05:00
Andrew 6fe4333a36 Merge remote-tracking branch 'origin/master' 2023-01-17 17:02:11 +05:00
Andrew 183b5e90ce Fix 2023-01-17 17:01:33 +05:00
GRAFF 8b3119e865 Merge branch 'master' of http://192.168.1.163:3000/Dron/lifeResidence
# Conflicts:
#	Content/Maps/mainScene.umap
2023-01-17 15:00:24 +05:00
GRAFF 33147af4c8 поинт для тыка 2023-01-17 14:59:50 +05:00
Andrew 4f5cdf9372 Interface fixs 2023-01-17 14:51:01 +05:00
PC-G09 700f3c5db0 чуть 2023-01-17 13:01:52 +05:00
JohnnyHatchet e9615b7a25 mats 2023-01-17 11:45:39 +05:00
JohnnyHatchet f0c07b5cc9 Mipmaps 2023-01-17 09:56:12 +05:00
GRAFF 1d5e0e77ba еще чет 2023-01-16 21:05:03 +05:00
GRAFF 5ea42abf2d Merge branch 'master' of http://192.168.1.163:3000/Dron/lifeResidence
# Conflicts:
#	Content/Maps/Outside.umap
2023-01-16 20:40:29 +05:00
GRAFF 87e4c16457 куча всякого, еще сплайн тачек добавил 2023-01-16 20:40:11 +05:00
PC-G09 392d95bc77 Park_base 2023-01-16 19:53:51 +05:00