Commit Graph

119 Commits

Author SHA1 Message Date
Andrew 2d2d455861 Автопреза 2022-11-03 19:40:38 +05:00
GRAFF 331960dafa сплайновый спавнер сборной по футболу 2022-11-03 15:29:14 +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 744bd28d22 channelswitch 2022-11-02 15:59:30 +05:00
PC-G13 0daa804a20 NE BETON 2022-11-02 15:54:23 +05:00
PC-G13 8ea4bd0377 lighton 2022-11-01 23:31:01 +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
GRAFF 0ba3efc914 ffffffaa 2022-11-01 20:34:25 +05:00
PC-G12 73567ef7a2 Aw 2022-11-01 20:10:14 +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
GRAFF f2cdf02d4b деревья, еще пара моментов по интерфейсу 2022-11-01 19:52:13 +05:00
PC-G01 0b89f9b739 тенты 2022-11-01 18:25:28 +05:00
GRAFF 5056962730 Merge branch 'master' of http://192.168.1.163:3000/Dron/NorthBaniASS 2022-11-01 17:18:41 +05:00
GRAFF 200c6f807e AAAAAAAAAAAAAAAAAAA 2022-11-01 17:18:36 +05:00
PC-G01 90c1b66480 Merge branch 'master' of http://192.168.1.163:3000/Dron/NorthBaniASS 2022-11-01 12:46:24 +05:00
PC-G01 92b4d3c1ab tree 2022-11-01 12:46:17 +05:00
Andrew 4360ea9e36 Фиксы интерфейса 2022-11-01 12:08:59 +05:00
GRAFF 25d598f805 Merge branch 'master' of http://192.168.1.163:3000/Dron/NorthBaniASS 2022-11-01 11:52:00 +05:00
GRAFF efab316809 gbplf 2022-11-01 11:48:34 +05:00
Andrew da461fe742 Компасс отображает стороны света 2022-11-01 11:24:45 +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 e886470931 DLSS 2022-11-01 02:20:38 +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 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
Andrew ab98652997 Merge remote-tracking branch 'origin/master' 2022-10-31 20:07:25 +05:00
Andrew 5c7f5b02df артинки планов 2022-10-31 20:07:14 +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