Commit Graph

231 Commits

Author SHA1 Message Date
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
PC-G12 41d11d8057 Volum 2023-04-13 14:41:13 +05:00
PC-G13 c3c946b450 Merge branch 'master' of http://192.168.1.163:3000/Dron/lifeResidence
# Conflicts:
#	Content/Maps/Interior/GP1/MOP/S02/MOP_GP1_S02_F01.umap
#	Content/Maps/Interior/Parking/Parking_GP1.umap
#	Content/Maps/Interior/Parking/Parking_GP2.umap
2023-04-13 01:35:54 +05:00
PC-G13 ecbdca5039 smth 2023-04-13 01:33:46 +05:00
PRAyMU 8ff9627c0a Merge branch 'master' of http://192.168.1.163:3000/Dron/lifeResidence 2023-04-12 21:25:58 +05:00
PRAyMU fd9005cd2e S01_S02_F09 2023-04-12 21:25:49 +05:00
GRAFF 19c3a0990b Merge branch 'master' of http://192.168.1.163:3000/Dron/lifeResidence
# Conflicts:
#	Content/Blueprints/UI/Widgets/KPWidget.uasset
2023-04-12 21:20:30 +05:00
GRAFF 2bb2b0a84e some 2023-04-12 21:20:02 +05:00
PC-G12 889031c223 Merge branch 'master' of http://192.168.1.163:3000/Dron/lifeResidence 2023-04-12 19:55:17 +05:00
PC-G12 1f4aadfa11 GreatestMops_Vol1 2023-04-12 19:55:12 +05:00
DESKTOP-8J0BKKD\Admin 6427c869f2 Merge branch 'master' of http://192.168.1.163:3000/Dron/lifeResidence 2023-04-12 19:49:14 +05:00
DESKTOP-8J0BKKD\Admin 59543b5fd1 GP2_S02_A05 2023-04-12 19:49:10 +05:00
PC-G04 5eb1b72479 Merge branch 'master' of http://192.168.1.163:3000/Dron/lifeResidence 2023-04-12 19:00:53 +05:00
PC-G04 277afb1de5 GP2_S01_A05 2023-04-12 19:00:45 +05:00
DESKTOP-8J0BKKD\Admin 65f1042aa1 Merge branch 'master' of http://192.168.1.163:3000/Dron/lifeResidence 2023-04-12 18:40:39 +05:00
DESKTOP-8J0BKKD\Admin 932b36a06a GP1_S03_A15 2023-04-12 18:40:35 +05:00
PC-G04 04779d39cc Merge branch 'master' of http://192.168.1.163:3000/Dron/lifeResidence
# Conflicts:
#	Content/Meshes/Interior/Gp2/Plinth/SM_GP2_F9_S01_A00_Plinth.uasset
2023-04-12 17:46:33 +05:00
PC-G04 f30f04749f GP2_S01_A05_F09 2023-04-12 17:44:00 +05:00
GRAFF 666cf634d3 Merge branch 'master' of http://192.168.1.163:3000/Dron/lifeResidence 2023-04-12 17:23:38 +05:00
GRAFF 486c8f48ec points, parking 2023-04-12 17:23:26 +05:00
Igor f80cd7caa5 Merge branch 'master' of http://192.168.1.163:3000/Dron/lifeResidence 2023-04-12 17:21:56 +05:00
Igor 3ca1899a38 GP2_S02_A05 2023-04-12 17:21:45 +05:00
PC-G12 b6f68b8309 Merge branch 'master' of http://192.168.1.163:3000/Dron/lifeResidence 2023-04-12 16:34:24 +05:00
PC-G12 f4722cea5e Comeat 2023-04-12 16:34:13 +05:00
PRAyMU f363f0b020 Merge branch 'master' of http://192.168.1.163:3000/Dron/lifeResidence 2023-04-12 16:08:50 +05:00