Commit Graph

44 Commits

Author SHA1 Message Date
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
PC-G13 e2c5862f15 nytip 2023-05-30 19:44:53 +05:00
GRAFF eb31efc863 ya toje 2023-05-30 02:23:06 +05:00
PC-G09 71cb2f00cc Тачки хуячки 2023-05-29 09:53:24 +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 bd4d6715ea Merge branch 'master' of http://192.168.1.163:3000/Dron/NorthBaniASS
# Conflicts:
#	Content/Maps/Interior/C2M/C2M_L.umap
#	Content/Maps/Interior/C2M/C2M_R.umap
#	Content/Maps/Landscape.umap
#	Content/Materials/Instances/Grass/MI_Grass_Yellow.uasset
2022-11-06 13:09:10 +05:00
PC-G13 226b97648d smth 2022-11-06 13:06:47 +05:00
GRAFF eb5adc5ad0 блять сколько же кала 2022-11-04 19:06:32 +05:00
PC-G06 acc4fe0638 Merge branch 'master' of http://192.168.1.163:3000/Dron/NorthBaniASS
# Conflicts:
#	Content/Assetpacks/Furniture/Vol2_Unsorted/FurniturePack/Materials/Tiles_Rocks/M_Marble_White.uasset
#	Content/Interior/Material/MI_Decor_Marble_Biege.uasset
2022-11-04 07:55:21 +05:00
PC-G06 2443c85c27 Interior_Mat_Part_1 2022-11-04 07:54:22 +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 2d2d455861 Автопреза 2022-11-03 19:40:38 +05:00
PC-G13 a967af6186 белые фасады, прямые пальмы 2022-11-03 12:46:56 +05:00
PC-G13 16eb04aa74 bakenormalsfix 2022-11-02 22:17:00 +05:00
GRAFF 884ab04bd8 функция для фикса запечения, масинки сплайновые еще 2022-11-02 20:37:55 +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
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 f2cdf02d4b деревья, еще пара моментов по интерфейсу 2022-11-01 19:52:13 +05:00
GRAFF efab316809 gbplf 2022-11-01 11:48:34 +05:00
PC-G13 c6c625d7ba Merge branch 'master' of http://192.168.1.163:3000/Dron/NorthBaniASS 2022-11-01 02:39:16 +05:00
PC-G13 69160285f5 c1t 2022-11-01 02:38:57 +05:00
GRAFF 739312ba35 Merge branch 'master' of http://192.168.1.163:3000/Dron/NorthBaniASS
# Conflicts:
#	Content/Interior/Material/MI_Decor_Marble_Biege.uasset
#	Content/Maps/Interior/A1T/A1T_L.umap
#	Content/Maps/Interior/A1T/A1T_R.umap
#	Content/Materials/Instances/Wood/MI_Wood_main_90angle.uasset
#	Content/Meshes/Villas/A1T_L/Interior/SM_A1T_Interior_Floor_1-2.uasset
2022-11-01 02:21:29 +05:00
GRAFF 7a37c4d84f куча всякого 2022-11-01 02:20:06 +05:00
PC-G06 7046f9ec53 C1T_Interior_Floor_1 2022-10-31 21:50:09 +05:00
PC-G06 abec2da286 C1T_Interior_PrePart_1 2022-10-31 15:53:39 +05:00
PC-G13 2991c963fe Merge branch 'master' of http://192.168.1.163:3000/Dron/NorthBaniASS
# Conflicts:
#	Content/Maps/Buildings.umap
#	Content/Maps/Interior/A1T_Interior.umap
2022-10-28 10:51:43 +05:00
PC-G13 eae1688123 1 2022-10-28 10:50:29 +05:00
PC-G06 cedcf4abb1 A1T_Interior_Floor_2_Part_1 2022-10-28 09:22:01 +05:00
PC-G13 b325318a1e чет песка в пустыне много 2022-10-27 16:49:50 +05:00
PC-G13 5c0f97c60d dick fight desert 2022-10-27 12:00:41 +05:00
PC-G13 729af6f2dd villas. gp, palms, decals, inter 2022-10-26 19:12:21 +05:00
PC-G06 cad8369804 A1T_Interior 2022-10-26 10:31:48 +05:00
PC-G13 4085de14d2 int 2022-10-25 18:55:18 +05:00
PC-G06 80c599593d Merge branch 'master' of http://192.168.1.163:3000/Dron/NorthBaniASS 2022-10-25 16:05:34 +05:00
PC-G06 208ca3ebcd A1T_Interior_Part_2 2022-10-25 16:05:24 +05:00
PC-G13 138e611d33 lovely arabians 2022-10-24 19:54:50 +05:00
PC-G06 22a247287a Interior_Test _LVL 2022-10-17 15:08:25 +05:00