Dron/NorthBaniASS
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
140 Commits 3 Branches 0 Tags
556201da43be78516c42ea46ed5360f1eedae0fa
Commit Graph

56 Commits

Author SHA1 Message Date
PC-G13 c051546122 channel,coll 2022-11-06 13:45:49 +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
GRAFF 9d46da9bc2 adssa 2022-11-03 20:27:03 +05:00
Andrew 2d2d455861 Автопреза 2022-11-03 19:40:38 +05:00
PC-G13 16eb04aa74 bakenormalsfix 2022-11-02 22:17:00 +05:00
PC-G13 744bd28d22 channelswitch 2022-11-02 15:59:30 +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-G01 92b4d3c1ab tree 2022-11-01 12:46:17 +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-G13 f779a8f832 Merge branch 'master' of http://192.168.1.163:3000/Dron/NorthBaniASS 2022-11-01 00:33:29 +05:00
PC-G13 1de35d71ab да 2022-11-01 00:33:24 +05:00
PC-G06 2ab06a694f C1T_Interior_Floor_1_Part_2 2022-11-01 00:28:42 +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-G13 c9c85908fc inter 2022-10-31 21:50:02 +05:00
PC-G01 3489164a58 деревья отдельным лвлом 2022-10-31 20:01:31 +05:00
Andrew d90f3b2664 Merge remote-tracking branch 'origin/master' 2022-10-31 19:53:11 +05:00
Andrew 5dc52e4a59 Пойнты комнат вилл 2022-10-31 19:52:55 +05:00
PC-G12 36a0851270 Merge branch 'master' of http://192.168.1.163:3000/Dron/NorthBaniASS 2022-10-31 19:46:11 +05:00
PC-G12 8334134ce0 C1T_C1TR_Fl2 2022-10-31 19:46:06 +05:00
Andrew 77ab687a28 Merge remote-tracking branch 'origin/master' 2022-10-31 18:52:58 +05:00
Andrew 947538f03c Пойнты комнат в виллах 2022-10-31 18:52:40 +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 90562a2732 a,b vilu 2022-10-30 18:37:14 +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
PC-G06 48268816b6 B1T_Interior_Part_1 2022-10-28 20:00:46 +05:00
PC-G12 2ec48bd0ec C1T_d 2022-10-28 19:48:24 +05:00
PC-G12 204d172614 Merge branch 'master' of http://192.168.1.163:3000/Dron/NorthBaniASS 2022-10-28 19:16:32 +05:00
PC-G12 51fef57cf3 C1T 2022-10-28 19:16:27 +05:00
GRAFF 09de277dfb еще всякое 2022-10-28 19:05:00 +05:00
PC-G13 3846833531 Merge branch 'master' of http://192.168.1.163:3000/Dron/NorthBaniASS 
# Conflicts:
#	Content/Maps/Interior/C1T/C1T_L.umap
 2022-10-28 15:33:12 +05:00
PC-G13 1cb8a9adb2 A1T, fence 2022-10-28 15:32:48 +05:00
PC-G12 b17ebe9239 Merge branch 'master' of http://192.168.1.163:3000/Dron/NorthBaniASS 2022-10-28 14:59:11 +05:00
PC-G12 aeadb76fc7 C1T 2022-10-28 14:59:05 +05:00
PC-G06 b180bb43e3 A1T_Part_3 2022-10-28 13:03:43 +05:00
PC-G06 08b585e7e1 A1T_FLoor_2_Part_2 2022-10-28 12:55:45 +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