Commit Graph

18 Commits

Author SHA1 Message Date
GRAFF f72e9481c4 много всякой фигни, фантомы домов, материал стекла, фейки, 2020-12-10 16:09:57 +05:00
GRAFF 88fc21f5a8 бп светильик, расставил забор, обновил заборный ген, еще чего то 2020-12-08 18:17:34 +05:00
GRAFF e12ad5c10c всякая фигня 2020-12-07 20:59:49 +05:00
GRAFF 43765a5b33 лут, еще инфраструктурная фигня, инфа о проекте 2020-12-05 20:24:45 +05:00
GRAFF 7cfb14c491 Merge remote-tracking branch 'origin/Danis'
еще добавлен гномский заборчик
2020-12-05 12:47:42 +05:00
GRAFF 2522e3da5a Merge remote-tracking branch 'origin/Danis'
# Conflicts:
#	Content/AssetPacks/CarMoveSpline/Materials/VehicleVarietyPack/Textures/Hatchback/TX_Hatchback_Diffuse_0.uasset
#	Content/AssetPacks/Procedural_Ecosystem/Materials/Material_Functions/MF_Landscape_birch_Asphalt10.uasset
#	Content/AssetPacks/Procedural_Ecosystem/Materials/Material_Functions/MF_Landscape_birch_Asphalt11.uasset
2020-12-04 21:44:53 +05:00
GRAFF 617a156dae всякое всякое, ночной режим 2020-12-03 19:21:48 +05:00
GRAFF f3383e3cde Merge remote-tracking branch 'origin/Nikolay'
# Conflicts:
#	.gitignore
#	Content/AutomotiveMaterials/Textures/CarbonFiber/T_MetalFlakes_N.uasset
#	Content/Blueprints/Player/GI.uasset
#	Content/Blueprints/Player/MyPawn.uasset
#	Content/Blueprints/Player/WalkingPawn.uasset
#	Content/Blueprints/Player/getFunctions.uasset
#	Content/Blueprints/Player/infoHud.uasset
#	Content/Blueprints/UI/Actors/HousePoint.uasset
#	Content/Blueprints/UI/Imgs/22.uasset
#	Content/Blueprints/UI/Imgs/Эскизный_Альбом2_Страница_32_Mat.uasset
#	Content/Blueprints/UI/Materials/FasadHide.uasset
#	Content/Blueprints/UI/Materials/TestFasad.uasset
#	Content/Blueprints/UI/Others/InfraData.uasset
#	Content/Blueprints/UI/WBPS/FlatInfo.uasset
#	Content/Blueprints/UI/WBPS/FloorPointer.uasset
#	Content/Blueprints/UI/WBPS/InfraPointer.uasset
#	Content/Blueprints/UI/WBPS/MainMenu.uasset
#	Content/Blueprints/UI/WBPS/MenuBtn.uasset
#	Content/Blueprints/UI/WBPS/map.uasset
#	Content/Maps/MainScene.umap
#	Content/Maps/Test_Level.umap
#	Content/Maps/Test_Level_BuiltData.uasset
#	Content/Materials/AutomotiveMaterials/Textures/CarPaint/T_Bump_N.uasset
#	Content/Materials/AutomotiveMaterials/Textures/CarPaint/T_FlakeMask.uasset
#	Content/Materials/AutomotiveMaterials/Textures/CarbonFiber/T_MetalFlakes_N.uasset
#	Content/Materials/Instances/MI_Squad_01.uasset
#	Content/Materials/Instances/MI_Squad_03_01.uasset
#	Content/Materials/Instances/MI_Squad_04_01.uasset
#	Content/Materials/Instances/MI_Squad_05.uasset
#	Content/Textures/Squads/T_Squad_03_01_RA.uasset
#	Content/Textures/Squads/T_Squad_04_01_RA.uasset
2020-11-30 16:30:56 +05:00
GRAFF 146032bb57 допиливания полины, расставлены инфрапоинты 2020-11-30 14:20:06 +05:00
Lenta_Mebiusa 10b8e084e4 Merge remote-tracking branch 'origin/Nikolay' into Danis
# Conflicts:
#	Content/AssetPacks/Procedural_Ecosystem/Materials/Material_Functions/MF_Landscape_birch_Asphalt10.uasset
#	Content/AssetPacks/Procedural_Ecosystem/Materials/Material_Functions/MF_Landscape_birch_Asphalt11.uasset
#	Content/AutomotiveMaterials/Textures/CarbonFiber/T_MetalFlakes_N.uasset
#	Content/Blueprints/UI/Imgs/22.uasset
#	Content/Blueprints/Utils/CarStatic.uasset
#	Content/Materials/AutomotiveMaterials/Textures/CarPaint/T_Bump_N.uasset
#	Content/Materials/AutomotiveMaterials/Textures/CarPaint/T_FlakeMask.uasset
#	Content/Materials/AutomotiveMaterials/Textures/CarbonFiber/T_MetalFlakes_N.uasset
#	Content/Materials/M_newAsphalt.uasset
2020-11-30 13:40:05 +05:00
DYVOL3316 75122678f0 Обновление тестового уровня. 2020-11-30 12:54:05 +05:00
GRAFF 7ad6eb22c3 вкрячен полинин интерфейс 2020-11-25 21:12:49 +05:00
GRAFF f2088be3bb практически до конца сделанный интерфейс и переходы, ночное освещение, импорт от Коляна 2020-11-24 14:37:36 +05:00
GRAFF 0cb87268cf Перенес всякую фигню в ассетпакс, доработал скрытие фасадов, рентген через фасады 2020-11-06 17:45:29 +05:00
GRAFF b2cb6e46d8 Много всякой фигни, почти весь интерфейс 2020-11-05 21:11:22 +05:00
GRAFF 7b1fa32aad потихоньку обустраиваю 2020-10-29 15:12:51 +05:00
GRAFF cee238e272 ещеее добавки помаленьку 2020-10-23 21:37:52 +05:00
GRAFF ab1a00eaea add any 2020-10-23 17:40:07 +05:00