 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 |
|
DYVOL3316