Dron/NorthBaniASS
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
142 Commits 3 Branches 0 Tags
96872230bf39f8be5f057b2041468e6006246363
Commit Graph

142 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
GRAFF 96872230bf фикс нормалей, интерфейса, вроде готов к показу 2022-11-06 21:14:14 +05:00
PC-G13 e45858e5c9 channelagainblat 2022-11-06 15:24:25 +05:00
PC-G13 556201da43 Merge branch 'master' of http://192.168.1.163:3000/Dron/NorthBaniASS 2022-11-06 14:58:09 +05:00
PC-G13 e09cb4c04f eshe kolizii 2022-11-06 14:58:05 +05:00
Andrew b23090e8e9 Merge remote-tracking branch 'origin/master' 2022-11-06 14:33:27 +05:00
Andrew 71b7794add Серые пойнты 2022-11-06 14:32:48 +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 5d474208f3 Кнопка выхода, обновленные слайды инфо 2022-11-06 12:26:31 +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
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
Andrew 9331652e22 Переверстанный, трижды проклятый, интерфейс 2022-11-04 01:54:49 +05:00
Andrew 4788e19c1b assda 2022-11-03 20:47:56 +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
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