Commit Graph

255 Commits

Author SHA1 Message Date
GRAFF 434dc2f95a Merge branch 'master' of http://192.168.1.163:3000/Dron/lifeResidence 2023-04-19 16:39:15 +05:00
PRAyMU 34bdf465fb Merge branch 'master' of http://192.168.1.163:3000/Dron/lifeResidence 2023-04-19 16:31:43 +05:00
PRAyMU 07f7f4ffb3 Carpet_Test_P1 2023-04-19 16:21:13 +05:00
GRAFF db987207ef Merge branch 'master' of http://192.168.1.163:3000/Dron/lifeResidence 2023-04-19 15:43:25 +05:00
PC-G13 692cd6da8e гл асс 2023-04-19 15:42:50 +05:00
GRAFF dc44a50de3 Merge branch 'master' of http://192.168.1.163:3000/Dron/lifeResidence 2023-04-19 15:37:44 +05:00
PC-G13 e916b456b3 Merge branch 'master' of http://192.168.1.163:3000/Dron/lifeResidence 2023-04-19 15:25:32 +05:00
PC-G13 d5cf45c6a1 gp1(2) rename refl,rebakejustincase, i para hat 2023-04-19 15:23:32 +05:00
GRAFF d36a74969d houses 2023-04-19 15:17:25 +05:00
GRAFF 021f17ec14 подсказки для дэбилов, динамическая занятость паркинга 2023-04-18 23:54:16 +05:00
PC-G13 08f876253f волюмы +- в парковке 2023-04-18 19:18:38 +05:00
PC-G13 2a16cb21b2 Merge branch 'master' of http://192.168.1.163:3000/Dron/lifeResidence 2023-04-18 18:59:26 +05:00
PC-G13 f7f30ddb2e gp2(1). refl, f09 2023-04-18 18:59:22 +05:00
PC-G12 3dacd83855 Gar_Age_Vol_Metric 2023-04-18 17:16:14 +05:00
GRAFF 293b1fd603 Передвинутые таблички хат 2023-04-18 12:31:20 +05:00
GRAFF 2fb17b19c4 Merge branch 'master' of http://192.168.1.163:3000/Dron/lifeResidence
# Conflicts:
#	Content/Maps/MainBuildings.umap
2023-04-18 00:30:39 +05:00
GRAFF 6d51d79d1a navigation, managers 2023-04-18 00:28:40 +05:00
PC-G13 739ede701b Merge branch 'master' of http://192.168.1.163:3000/Dron/lifeResidence 2023-04-17 19:39:37 +05:00
PC-G13 ddbbe039eb gp2(1) 2023-04-17 19:39:29 +05:00
DESKTOP-8J0BKKD\Admin a45e5bec93 Merge branch 'master' of http://192.168.1.163:3000/Dron/lifeResidence 2023-04-17 18:39:44 +05:00
DESKTOP-8J0BKKD\Admin ff03798fcf Окна на балкон 2023-04-17 18:39:39 +05:00
PC-G04 8a20648ad1 Двери в минимализме 6-7 этаж 2023-04-17 17:42:46 +05:00
PC-G04 a89c0fd890 Открыла двери в ГП1, в "уютном минимализме",все этажи, кроме 9 2023-04-17 16:58:20 +05:00
PC-G13 d6c1a82858 фыв 2023-04-17 14:29:43 +05:00
GRAFF d096264ebd PENISSSS 2023-04-15 05:42:46 +05:00
GRAFF c3b6f86c03 kryshki 2023-04-15 03:41:55 +05:00
GRAFF 5b855b5620 sad 2023-04-15 02:38:58 +05:00
GRAFF a4887d4313 Merge branch 'master' of http://192.168.1.163:3000/Dron/lifeResidence
# Conflicts:
#	Content/Blueprints/UI/Widgets/Menu/mainMenu.uasset
#	Content/Blueprints/UI/Widgets/Search/Search.uasset
#	Content/Blueprints/UI/Widgets/SubMenu/Submenu.uasset
#	Content/Maps/MainBuildings.umap
#	Content/Maps/NightLight.umap
#	Content/Maps/Points.umap
#	Content/Maps/mainScene.umap
2023-04-15 01:55:00 +05:00
GRAFF c6895d99a7 HUY 2023-04-15 01:52:21 +05:00
GRAFF 40c9442e72 Навигация 2023-04-15 01:16:09 +05:00
GRAFF 49c38ab317 eads 2023-04-14 22:12:09 +05:00
PC-G13 a43158969d Merge branch 'master' of http://192.168.1.163:3000/Dron/lifeResidence 2023-04-14 21:05:29 +05:00
PC-G13 1287a8f4bf oboi v odnoi kv 2023-04-14 21:05:24 +05:00
GRAFF 7cc2c0aaeb flat recognize, some stuff, floor highlight, hide shit, reaneme 2023-04-14 20:18:23 +05:00
PC-G13 15e85320ba двери в мопах подвинуты 2023-04-14 17:03:27 +05:00
PC-G13 566846a81f probe gp2s03a03 2023-04-14 16:17:44 +05:00
PC-G13 c917638ab9 fade dveri 2023-04-14 15:39:06 +05:00
PC-G13 7ad0ff0502 коллизии, немного пробок, пара шейдеров, 2023-04-14 15:10:13 +05:00
GRAFF c54dc89044 лифты, двери, еще чето 2023-04-14 03:36:15 +05:00
GRAFF 2d6cd94b34 Пойнты комнат 2023-04-14 01:39:10 +05:00
PC-G13 41c6d29961 elevatoru. nomera dveri, nemnogokoliziu, meshi terras k fasady 2023-04-13 22:42:55 +05:00
PC-G13 bfd8b8c8e3 Merge branch 'master' of http://192.168.1.163:3000/Dron/lifeResidence
# Conflicts:
#	Content/Maps/Interior/GP2/MOP/S04/MOP_GP2_S04_F01.umap
2023-04-13 20:35:25 +05:00
PC-G13 db9e1ae5fe mops+volumetrics 2023-04-13 20:34:16 +05:00
GRAFF 143f36bc4b asd 2023-04-13 20:21:04 +05:00
GRAFF 20058a48be Merge branch 'master' of http://192.168.1.163:3000/Dron/lifeResidence 2023-04-13 17:42:25 +05:00
GRAFF 4674c8106c points 2023-04-13 17:42:15 +05:00
PC-G13 c9b5255164 Merge branch 'master' of http://192.168.1.163:3000/Dron/lifeResidence 2023-04-13 16:46:53 +05:00
PC-G13 0d6e85d7c2 f09, svet, bp elevatora+meshes, parkingWIP, numbers meshes 2023-04-13 16:46:08 +05:00
DESKTOP-8J0BKKD\Admin 5ea97eb30b Merge branch 'master' of http://192.168.1.163:3000/Dron/lifeResidence 2023-04-13 15:50:02 +05:00
DESKTOP-8J0BKKD\Admin 1c5ce702dc Мопы 2023-04-13 15:49:58 +05:00