Commit Graph

91 Commits

Author SHA1 Message Date
PC-G13 58ec1effe2 int villas, mats, light 2023-10-03 16:12:06 +05:00
SergeyVag 23cf226209 Merge branch 'UpTo_5.1' of http://192.168.1.163:3000/Dron/NorthBaniASS into UpTo_5.1 2023-09-27 19:26:18 +05:00
SergeyVag 4f46c5a2f6 фасады 2023-09-27 19:26:14 +05:00
PC-G12 c225664316 Merge branch 'UpTo_5.1' of http://192.168.1.163:3000/Dron/NorthBaniASS into UpTo_5.1 2023-09-27 17:04:36 +05:00
PC-G12 c303ed73f1 B2T 2023-09-27 17:04:29 +05:00
SergeyVag 865f8e2424 Merge branch 'UpTo_5.1' of http://192.168.1.163:3000/Dron/NorthBaniASS into UpTo_5.1 2023-09-27 16:44:07 +05:00
SergeyVag 41aa357dff Фасады 2023-09-27 16:44:04 +05:00
PC-G12 6ce9d1f196 B2T 2023-09-27 16:21:45 +05:00
SergeyVag 0896f087f1 Merge branch 'UpTo_5.1' of http://192.168.1.163:3000/Dron/NorthBaniASS into UpTo_5.1 2023-09-26 20:41:43 +05:00
SergeyVag c12c846784 Настройка материалов на фасадах 2023-09-26 20:41:36 +05:00
Daniil.I.Y 24344a2755 Merge branch 'UpTo_5.1' of http://192.168.1.163:3000/Dron/NorthBaniASS into UpTo_5.1 2023-09-26 20:27:36 +05:00
Daniil.I.Y 748f3dcfbb C2M_L/R;C2T_L/R 2023-09-26 20:27:30 +05:00
SergeyVag bcc608fb78 Merge branch 'UpTo_5.1' of http://192.168.1.163:3000/Dron/NorthBaniASS into UpTo_5.1 2023-09-25 20:35:40 +05:00
SergeyVag ae11cd67f6 Всякуая хуна 2023-09-25 20:35:37 +05:00
PC-G12 b16859409a B2M 2023-09-25 20:06:53 +05:00
PC-G12 c2222c1b48 Merge branch 'UpTo_5.1' of http://192.168.1.163:3000/Dron/NorthBaniASS into UpTo_5.1 2023-09-22 19:53:57 +05:00
PC-G12 cc56d29e99 B2M 2023-09-22 19:53:50 +05:00
SergeyVag bb9ad6dffc Merge branch 'UpTo_5.1' of http://192.168.1.163:3000/Dron/NorthBaniASS into UpTo_5.1 2023-09-22 19:07:05 +05:00
SergeyVag 7b93a61ce6 C1M 2023-09-22 19:06:56 +05:00
Daniil.I.Y d9d19b9df9 B1M_R 2023-09-22 16:30:31 +05:00
Daniil.I.Y 55a3cf8f78 Merge branch 'UpTo_5.1' of http://192.168.1.163:3000/Dron/NorthBaniASS into UpTo_5.1 2023-09-21 19:59:51 +05:00
Daniil.I.Y 3d5a2a531e B1M 2023-09-21 19:59:40 +05:00
SergeyVag 4e145b88a1 C1M 2023-09-21 19:29:32 +05:00
PC-G12 243d18bc51 A1M_B2M 2023-09-20 19:46:47 +05:00
PC-G12 39f0a2900f Merge branch 'UpTo_5.1' of http://192.168.1.163:3000/Dron/NorthBaniASS into UpTo_5.1 2023-09-19 19:54:27 +05:00
PC-G12 59e0c04c4d A1M 2023-09-19 19:54:23 +05:00
SergeyVag c642744fa3 A2T 2023-09-19 19:30:32 +05:00
SergeyVag 1031e9488b A2M 2023-09-18 18:44:03 +05:00
SergeyVag 03ba32455e A2M 2023-09-14 19:29:57 +05:00
GRAFF 4f8b3e2a92 enabled raytraced shadows, cascades works bad with nanites 2023-06-07 01:09:09 +05:00
PC-G09 31386e5e4f Ya vse 2023-05-29 19:08:32 +05:00
PC-G09 cc4d7c5526 Sidewalks 2023-05-29 16:36:17 +05:00
PC-G09 22ddf44cb3 Velo decal 2023-05-29 16:03:28 +05:00
PC-G09 05806fe990 Фуляга, тачки, трава 2023-05-29 08:20:25 +05:00
PC-G09 36ab1c9aec Genplan area Demo 2023-05-29 04:54:08 +05:00
GRAFF 5bb0c981f6 да бл 2022-11-09 16:41:51 +05:00
GRAFF 96872230bf фикс нормалей, интерфейса, вроде готов к показу 2022-11-06 21:14:14 +05:00
PC-G13 e09cb4c04f eshe kolizii 2022-11-06 14:58:05 +05:00
PC-G13 c051546122 channel,coll 2022-11-06 13:45:49 +05:00
GRAFF eb5adc5ad0 блять сколько же кала 2022-11-04 19:06:32 +05:00
PC-G01 c5b25e38b7 Merge branch 'master' of http://192.168.1.163:3000/Dron/NorthBaniASS 2022-11-03 19:55:22 +05:00
PC-G01 217b903c9f все парки 2022-11-03 19:55:14 +05:00
Andrew 38dcd97ef6 Merge remote-tracking branch 'origin/master' 2022-11-03 19:40:55 +05:00
Andrew 2d2d455861 Автопреза 2022-11-03 19:40:38 +05:00
PC-G01 a0783ac4af Барахапарака 2022-11-03 18:55:44 +05:00
PC-G13 a967af6186 белые фасады, прямые пальмы 2022-11-03 12:46:56 +05:00
PC-G13 fd00b737e3 parks 2022-11-02 16:20:02 +05:00
PC-G13 61b8f1d657 Merge branch 'master' of http://192.168.1.163:3000/Dron/NorthBaniASS
# Conflicts:
#	Content/Assetpacks/Tropical_Jungle_Pack/FoliageType/FT_PalmCoconut_03.uasset
#	Content/Assetpacks/Tropical_Jungle_Pack/FoliageType/FT_Tree_Fern_01.uasset
#	Content/Assetpacks/Tropical_Jungle_Pack/FoliageType/FT_Tree_Fern_02.uasset
#	Content/Maps/Buildings.umap
#	Content/Maps/Interior/A1T/A1T_L.umap
#	Content/Maps/Interior/A1T/A1T_R.umap
#	Content/Maps/Interior/A2M/A2M_L.umap
#	Content/Maps/Interior/A2M/A2M_R.umap
#	Content/Maps/Interior/B1T/B1T_L.umap
#	Content/Maps/Interior/B1T/B1T_R.umap
#	Content/Maps/Interior/B2M/B2M_L.umap
#	Content/Maps/Interior/B2M/B2M_R.umap
#	Content/Maps/Interior/C1T/C1T_L.umap
#	Content/Maps/Interior/C1T/C1T_R.umap
#	Content/Maps/Interior/C2M/C2M_L.umap
#	Content/Maps/Interior/C2M/C2M_R.umap
#	Content/Materials/Masters/Common/MM_Master.uasset
2022-11-01 22:19:02 +05:00
PC-G13 d7540fdf54 masteropacity, halfmembake, sockets fix, lods fo palms 2022-11-01 22:17:07 +05:00
PC-G12 935b08bf2b Merge branch 'master' of http://192.168.1.163:3000/Dron/NorthBaniASS 2022-11-01 21:21:56 +05:00