Dron/NorthBaniASS
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
198 Commits 3 Branches 0 Tags
7dec3992c05ab951f13c6e6120959cd871bf1e67
Commit Graph

52 Commits

Author SHA1 Message Date
SergeyVag 4e145b88a1 C1M 2023-09-21 19:29: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
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 05806fe990 Фуляга, тачки, трава 2023-05-29 08:20:25 +05:00
PC-G09 36ab1c9aec Genplan area Demo 2023-05-29 04:54:08 +05:00
PC-G06 7a731f2aea Merge branch 'master' of http://192.168.1.163:3000/Dron/NorthBaniASS 
# Conflicts:
#	Content/Interior/Material/M_Glass_Black.uasset
 2022-11-17 23:27:30 +05:00
PC-G06 513ad66c70 Furniture_Repair_Part_1 2022-11-17 23:26:57 +05:00
GRAFF 0dc2c31957 tupoe govno pidora 2022-11-09 21:34:51 +05:00
GRAFF e3111c999d Merge branch 'master' of http://192.168.1.163:3000/Dron/NorthBaniASS 
# Conflicts:
#	Content/Assetpacks/SpeedTree/Asset/SpeedTree/TreeMats/MM_Grass_TKT.uasset
 2022-11-09 16:42:09 +05:00
GRAFF 5bb0c981f6 да бл 2022-11-09 16:41:51 +05:00
PC-G13 998e5622ee Merge branch 'master' of http://192.168.1.163:3000/Dron/NorthBaniASS 
# Conflicts:
#	Content/Assetpacks/SpeedTree/Asset/SpeedTree/TreeMats/MM_Grass_TKT.uasset
#	Content/Maps/Interior/A1T/A1T_L_Fol.umap
#	Content/Maps/Interior/A2M/A2M_R.umap
 2022-11-09 16:16:12 +05:00
PC-G13 38da3c619f makepalmgreatagainandagain 2022-11-09 16:15:06 +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 6072df0dd7 Merge branch 'master' of http://192.168.1.163:3000/Dron/NorthBaniASS 
# Conflicts:
#	Content/Assetpacks/Tropical_Jungle_Pack/FoliageType/FT_Tree_Fern_02.uasset
#	Content/Maps/Buildings.umap
 2022-11-04 19:07:23 +05:00
GRAFF eb5adc5ad0 блять сколько же кала 2022-11-04 19:06:32 +05:00
PC-G13 7c101a3348 ну допустим коллизии, ну допустим пальмы 2022-11-04 16:15:50 +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-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 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 f2cdf02d4b деревья, еще пара моментов по интерфейсу 2022-11-01 19:52:13 +05:00
GRAFF 200c6f807e AAAAAAAAAAAAAAAAAAA 2022-11-01 17:18:36 +05:00
GRAFF efab316809 gbplf 2022-11-01 11:48:34 +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-G13 f6ac399678 Merge branch 'master' of http://192.168.1.163:3000/Dron/NorthBaniASS 2022-10-31 21:50:41 +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-G13 dcac2215ed b1t, b2m,a1t.a2m 2022-10-31 14:31:12 +05:00
PC-G13 8d69c34cb1 int 2022-10-30 12:49:51 +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
GRAFF 09de277dfb еще всякое 2022-10-28 19:05:00 +05:00
PC-G13 1cb8a9adb2 A1T, fence 2022-10-28 15:32:48 +05:00
GRAFF a7fee139a0 всякое поднастроено, поинты расставлены вилл и кластеров 2022-10-27 20:34:32 +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-G13 cd5ff8ab30 villuhyillu, gpulightmass 2022-10-25 15:59:47 +05:00