Dron/NorthBaniASS
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
152 Commits 3 Branches 0 Tags
5abe135f4c43500aaf5540b886ce70d51fb089ad
Commit Graph

98 Commits

Author SHA1 Message Date
Andrew 5abe135f4c Merge remote-tracking branch 'origin/master' 2022-11-09 16:39:06 +05:00
Andrew cb266ec3df Перевод нерабочий 2022-11-09 16:38:31 +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
Andrew 8c5a368c2b ASSHOLE 2022-11-07 18:34:04 +05:00
Andrew 6baa55f99a ass 2022-11-07 13:39:48 +05:00
GRAFF 96872230bf фикс нормалей, интерфейса, вроде готов к показу 2022-11-06 21:14:14 +05:00
PC-G13 e45858e5c9 channelagainblat 2022-11-06 15:24:25 +05:00
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
Andrew 9af09295da Автопрез., измененная 2022-11-05 21:31:01 +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
Andrew 9331652e22 Переверстанный, трижды проклятый, интерфейс 2022-11-04 01:54:49 +05:00
GRAFF 9d46da9bc2 adssa 2022-11-03 20:27:03 +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 16eb04aa74 bakenormalsfix 2022-11-02 22:17:00 +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 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 73567ef7a2 Aw 2022-11-01 20:10:14 +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
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