248 Commits

Author SHA1 Message Date
PC-G12 bf70ec631a Shading2 2023-04-19 19:25:45 +05:00
PC-G12 5224a15578 Shading 2023-04-19 13:51:26 +05:00
GRAFF 121029d384 Merge branch 'master' of http://192.168.1.163:3000/Dron/lifeResidence 2023-04-18 23:55:03 +05:00
GRAFF 021f17ec14 подсказки для дэбилов, динамическая занятость паркинга 2023-04-18 23:54:16 +05:00
PC-G12 da1518e1ff Merge branch 'master' of http://192.168.1.163:3000/Dron/lifeResidence 2023-04-18 19:58:12 +05:00
PC-G12 3502a681fd 2 2023-04-18 19:58:05 +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 8956ceada9 С2 2023-04-18 14:37:16 +05:00
PC-G12 b18ce1310e CM1 2023-04-17 20:09:55 +05:00
PC-G12 68090f1d7a Merge branch 'master' of http://192.168.1.163:3000/Dron/lifeResidence
# Conflicts:
#	Content/Maps/MainBuildings.umap
#	Content/Meshes/MainBuildings/SM_GP1_S01.uasset
#	Content/Meshes/MainBuildings/SM_GP1_S02.uasset
#	Content/Meshes/MainBuildings/SM_GP1_S03.uasset
#	Content/Meshes/MainBuildings/SM_GP1_S04.uasset
#	Content/Meshes/MainBuildings/SM_GP2_S1.uasset
#	Content/Meshes/MainBuildings/SM_GP2_S2.uasset
#	Content/Meshes/MainBuildings/SM_GP2_S3.uasset
#	Content/Meshes/MainBuildings/SM_GP2_S4.uasset
2023-04-17 20:08:47 +05:00
PC-G12 957196479d CM 2023-04-17 20:02:53 +05:00
DESKTOP-8J0BKKD\Admin ff03798fcf Окна на балкон 2023-04-17 18:39:39 +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 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
PC-G09 fd2cb665c1 Nightlight 2023-04-14 20:49:55 +05:00
PC-G13 0c7030c262 tv 2023-04-14 20:13:00 +05:00
PC-G09 5e1203da25 Nightlight yard 2023-04-14 18:53:26 +05:00
PC-G13 f75d64e791 bpdoor sign 2023-04-14 17:32:12 +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
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
PC-G04 b9b5457184 terrace 2023-04-13 19:53:05 +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 1c5ce702dc Мопы 2023-04-13 15:49:58 +05:00
PC-G09 c5ef5f02ed Foliage yard 2023-04-13 07:18:24 +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
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
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