Commit Graph

9 Commits

Author SHA1 Message Date
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
DYVOL3316 75122678f0 Обновление тестового уровня. 2020-11-30 12:54:05 +05:00
GRAFF 7ad6eb22c3 вкрячен полинин интерфейс 2020-11-25 21:12:49 +05:00
Lenta_Mebiusa a61e92402f Добавил стоячие анимации людей. Удалил лишние папки с машинами 2020-11-24 14:44:07 +05:00
Lenta_Mebiusa b6171181ba Добавил тачки, МАФы, карту Index и Environment, 2020-11-10 16:57:39 +05:00
GRAFF b2cb6e46d8 Много всякой фигни, почти весь интерфейс 2020-11-05 21:11:22 +05:00
GRAFF b0c5bb901b LetsGO 2020-10-20 19:30:04 +05:00