Commit Graph

311 Commits

Author SHA1 Message Date
GRAFF d096264ebd PENISSSS 2023-04-15 05:42:46 +05:00
GRAFF b4c1cbba0e vbg 2023-04-15 04:45:52 +05:00
GRAFF 47b7b9cf2d Merge branch 'master' of http://192.168.1.163:3000/Dron/lifeResidence 2023-04-15 03:42:01 +05:00
GRAFF c3b6f86c03 kryshki 2023-04-15 03:41:55 +05:00
PC-G09 cbe7b65046 ГОРКА ЕБОБАНАЯ ДА 2023-04-15 03:12:51 +05:00
GRAFF 3109c53ab7 FFFFUUUU and fasad emiss 2023-04-15 03:07:22 +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
PC-G09 41ef8c98f0 Fasade lightning 2023-04-15 01:40:49 +05:00
GRAFF 40c9442e72 Навигация 2023-04-15 01:16:09 +05:00
GRAFF 49c38ab317 eads 2023-04-14 22:12:09 +05:00
PC-G09 9dda2cd2cf Nightlight 2023-04-14 21:24:06 +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
PC-G09 fd2cb665c1 Nightlight 2023-04-14 20:49:55 +05:00
GRAFF 661f5d60b3 Merge branch 'master' of http://192.168.1.163:3000/Dron/lifeResidence
# Conflicts:
#	Content/Blueprints/UI/Widgets/Elements/flatMapWithNavi.uasset
2023-04-14 20:19:05 +05:00
GRAFF 7cc2c0aaeb flat recognize, some stuff, floor highlight, hide shit, reaneme 2023-04-14 20:18:23 +05:00
GRAFF 3209d09300 Infra 2023-04-14 20:09:20 +05:00
PC-G09 5e1203da25 Nightlight yard 2023-04-14 18:53:26 +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 d51c9bdb51 fadesu 2023-04-14 15:19:19 +05:00
PC-G13 a14beaea09 Merge branch 'master' of http://192.168.1.163:3000/Dron/lifeResidence 2023-04-14 15:10:31 +05:00
PC-G13 7ad0ff0502 коллизии, немного пробок, пара шейдеров, 2023-04-14 15:10:13 +05:00
GRAFF 16d6b4f4b0 фыв 2023-04-14 14:10:42 +05:00
PC-G09 ba3069c77c Nightlight 2023-04-14 10:53:27 +05:00
GRAFF c54dc89044 лифты, двери, еще чето 2023-04-14 03:36:15 +05:00
GRAFF cb4166b402 Merge branch 'master' of http://192.168.1.163:3000/Dron/lifeResidence
# Conflicts:
#	Content/Maps/Points.umap
2023-04-14 02:39:29 +05:00
GRAFF f9df855339 someShitElse, dragfix 2023-04-14 02:38:55 +05:00
GRAFF 0d79764d99 Паркинг норм, пойнт начала 2023-04-14 02:09:37 +05:00
GRAFF 2d6cd94b34 Пойнты комнат 2023-04-14 01:39:10 +05:00
GRAFF 908dfb2538 Merge branch 'master' of http://192.168.1.163:3000/Dron/lifeResidence 2023-04-13 23:55:37 +05:00
GRAFF f73b5d7975 some else shit 2023-04-13 23:55:33 +05:00
PC-G13 41c6d29961 elevatoru. nomera dveri, nemnogokoliziu, meshi terras k fasady 2023-04-13 22:42:55 +05:00
PC-G13 df832096e7 terraces to mainbuildings 2023-04-13 20:40:45 +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 4d07e8fa46 Merge branch 'master' of http://192.168.1.163:3000/Dron/lifeResidence
# Conflicts:
#	Content/Blueprints/UI/Widgets/KPWidget.uasset
2023-04-13 20:21:34 +05:00
GRAFF 143f36bc4b asd 2023-04-13 20:21:04 +05:00
PC-G04 4564c8f494 Merge branch 'master' of http://192.168.1.163:3000/Dron/lifeResidence 2023-04-13 19:54:12 +05:00
PC-G04 b9b5457184 terrace 2023-04-13 19:53:05 +05:00
GRAFF 691eb2783b some 2023-04-13 19:06:41 +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
PC-G09 1b7751c44f Nani 2023-04-13 16:25:38 +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