Commit Graph

69 Commits

Author SHA1 Message Date
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
PC-G12 f1dc79370e yard 2022-11-01 21:21:50 +05:00
GRAFF 1acd562876 Merge branch 'master' of http://192.168.1.163:3000/Dron/NorthBaniASS 2022-11-01 20:34:38 +05:00
PC-G12 30557a08df Half-Ass 2 2022-11-01 19:53:09 +05:00
GRAFF 2d3fa59e47 Merge branch 'master' of http://192.168.1.163:3000/Dron/NorthBaniASS 2022-11-01 19:52:18 +05:00
PC-G01 0b89f9b739 тенты 2022-11-01 18:25:28 +05:00
GRAFF 200c6f807e AAAAAAAAAAAAAAAAAAA 2022-11-01 17:18:36 +05:00
GRAFF efab316809 gbplf 2022-11-01 11:48:34 +05:00
PC-G13 69160285f5 c1t 2022-11-01 02:38:57 +05:00
PC-G13 1de35d71ab да 2022-11-01 00:33:24 +05:00
PC-G13 f6ac399678 Merge branch 'master' of http://192.168.1.163:3000/Dron/NorthBaniASS 2022-10-31 21:50:41 +05:00
PC-G13 26705eb2bd Merge branch 'master' of http://192.168.1.163:3000/Dron/NorthBaniASS
# Conflicts:
#	Content/Maps/Interior/A1T/A1T_L.umap
#	Content/Maps/Interior/A1T/A1T_L_FL2.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
2022-10-31 21:50:36 +05:00
PC-G06 7046f9ec53 C1T_Interior_Floor_1 2022-10-31 21:50:09 +05:00
PC-G13 c9c85908fc inter 2022-10-31 21:50:02 +05:00
PC-G01 b3aeefd8c4 C2M kolxoz light edition 2022-10-31 17:03:57 +05:00
PC-G06 abec2da286 C1T_Interior_PrePart_1 2022-10-31 15:53:39 +05:00
PC-G13 dcac2215ed b1t, b2m,a1t.a2m 2022-10-31 14:31:12 +05:00
PC-G13 c76b395879 Merge branch 'master' of http://192.168.1.163:3000/Dron/NorthBaniASS
# Conflicts:
#	Content/Maps/Interior/B2M/B2MF2_L.umap
#	Content/Maps/Interior/B2M/B2MF2_R.umap
#	Content/Maps/Interior/B2M/B2M_L.umap
#	Content/Maps/Interior/B2M/B2M_R.umap
#	Content/Maps/Main.umap
2022-10-30 12:50:27 +05:00
PC-G13 8d69c34cb1 int 2022-10-30 12:49:51 +05:00
PC-G01 44c83efc2e BAll its my life (C2M, B2M) 2022-10-29 19:12:31 +05:00
PC-G13 afa898740d Merge branch 'master' of http://192.168.1.163:3000/Dron/NorthBaniASS
# Conflicts:
#	Content/Maps/Main.umap
#	Content/Meshes/Villas/C1T_L/SM_C1T_L.uasset
2022-10-29 14:57:01 +05:00
PC-G13 9dc069294a яебуалибабу 2022-10-29 14:53:59 +05:00
PC-G06 8904983a38 Merge branch 'master' of http://192.168.1.163:3000/Dron/NorthBaniASS 2022-10-28 20:00:53 +05:00