Commit Graph

11 Commits

Author SHA1 Message Date
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
GRAFF f2cdf02d4b деревья, еще пара моментов по интерфейсу 2022-11-01 19:52:13 +05:00
GRAFF efab316809 gbplf 2022-11-01 11:48:34 +05:00
GRAFF be630415bc инфраструктура ок 2022-10-30 02:04:37 +05:00
GRAFF 09de277dfb еще всякое 2022-10-28 19:05:00 +05:00
GRAFF e9b67ccba3 Merge branch 'master' of http://192.168.1.163:3000/Dron/NorthBaniASS
# Conflicts:
#	Content/Blueprints/UI/Widgets/menu/mainMenu.uasset
2022-10-27 20:34:56 +05:00
GRAFF a7fee139a0 всякое поднастроено, поинты расставлены вилл и кластеров 2022-10-27 20:34:32 +05:00
Andrew 19899cdb49 Интерфейс 2022-10-27 20:18:01 +05:00
Andrew 68aaa937ef Начало интерфеса (Маркеры готовы) 2022-10-22 19:02:53 +05:00
PC-G06 22a247287a Interior_Test _LVL 2022-10-17 15:08:25 +05:00