Commit Graph

352 Commits

Author SHA1 Message Date
GRAFF f1bbb6ee2d Расположение на этаже 2023-04-13 22:40:36 +05:00
GRAFF 2ecf5d7dca elev 2023-04-13 21:29:33 +05:00
GRAFF e2b1eeac4c Merge branch 'master' of http://192.168.1.163:3000/Dron/lifeResidence 2023-04-13 21:05:59 +05:00
GRAFF ef904a32e6 getImages 2023-04-13 21:05:50 +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 9a1fe7161e Merge branch 'master' of http://192.168.1.163:3000/Dron/lifeResidence 2023-04-13 19:58:30 +05:00
PC-G12 4d3e0f31a5 Merge branch 'master' of http://192.168.1.163:3000/Dron/lifeResidence 2023-04-13 19:55:42 +05:00
PC-G12 f079825dc3 Wheel 2023-04-13 19:55:30 +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 1177bb7012 Отправка говна в конце сеанса, картинки планов, сало, мёд, говно и гвозди 2023-04-13 19:37:23 +05:00
GRAFF 1a899ed03e Merge branch 'master' of http://192.168.1.163:3000/Dron/lifeResidence
# Conflicts:
#	Content/Blueprints/UI/Widgets/KPWidget.uasset
2023-04-13 19:07:39 +05:00
GRAFF 691eb2783b some 2023-04-13 19:06:41 +05:00
PC-G12 3f5a4fec46 Merge branch 'master' of http://192.168.1.163:3000/Dron/lifeResidence 2023-04-13 18:52:31 +05:00
PC-G12 7a11ba4015 donotdestroyallhumansplease 2023-04-13 18:52:18 +05:00
GRAFF 35a1ab2a5d Паркинг, пойнты, свободные места, менеджеры 2023-04-13 18:13:15 +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-G12 dd05cb8f12 Merge branch 'master' of http://192.168.1.163:3000/Dron/lifeResidence 2023-04-13 17:03:05 +05:00
PC-G12 e990b8d28d LOD_Cars 2023-04-13 17:02:37 +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
DESKTOP-8J0BKKD\Admin 1c5ce702dc Мопы 2023-04-13 15:49:58 +05:00
GRAFF 4fe861ccba Merge remote-tracking branch 'origin/master' 2023-04-13 15:25:51 +05:00
GRAFF 279fc14b8b КП, УТП 2023-04-13 15:25:31 +05:00
PC-G12 56680fa4f6 Merge branch 'master' of http://192.168.1.163:3000/Dron/lifeResidence 2023-04-13 14:41:18 +05:00
PC-G12 41d11d8057 Volum 2023-04-13 14:41:13 +05:00
GRAFF 7cddc41092 Merge branch 'master' of http://192.168.1.163:3000/Dron/lifeResidence 2023-04-13 13:45:57 +05:00
GRAFF 9e2be0ce6f tags 2023-04-13 13:45:00 +05:00
PC-G09 e7e7224d71 Foliage done 2023-04-13 09:39:19 +05:00
PC-G09 9aca85c835 MORE FOLIAGE! 2023-04-13 08:54:13 +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
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