Merge remote-tracking branch 'origin/Nikolay' · f3383e3cde - Onejsky4U - Gitea: Git with a cup of tea

Dron/Onejsky4U

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

This commit is contained in:

Andron666

2020-11-30 16:30:56 +05:00

parent 146032bb57 75122678f0

commit f3383e3cde

34 changed files with 4 additions and 0 deletions

Content/Blueprints/UI/Imgs/22.uasset

BIN

View File

Binary file not shown.

Content/Blueprints/UI/Imgs/33.uasset

BIN

View File

Binary file not shown.

Content/Blueprints/UI/Imgs/400x600_0_2baaa94c3a24b0ff292c714bc80eed04_800x1200_0xac120003_78344611587718838.uasset

BIN

View File

Binary file not shown.

Content/Blueprints/UI/Imgs/908253cc-dabc-496f-894f-b53aa1456b48_jpg_880x1000_x-False_q85.uasset

BIN

View File

Binary file not shown.

Content/Blueprints/UI/Imgs/galkin_0.uasset

BIN

View File

Binary file not shown.

Content/Blueprints/UI/Imgs/Эскизный_Альбом2_Страница_32.uasset

BIN

View File

Binary file not shown.

Content/Materials/Instances/MI_Brick_03.uasset

BIN

View File

Binary file not shown.

Content/Materials/Instances/MI_Metall_04.uasset

BIN

View File

Binary file not shown.

Content/Materials/Instances/MI_Metall_05.uasset

BIN

View File

Binary file not shown.

Content/Materials/Instances/MI_Plaster_01_Yellow.uasset

BIN

View File

Binary file not shown.

Content/Materials/Instances/MI_Plastic_02.uasset

BIN

View File

Binary file not shown.

Content/Materials/Instances/MI_Plastic_03.uasset

BIN

View File

Binary file not shown.

Content/Materials/Instances/MI_Squad_02_01.uasset

BIN

View File

Binary file not shown.

Content/Materials/Instances/MI_Squad_02_02.uasset

BIN

View File

Binary file not shown.

Content/Materials/Instances/MI_Tile_01.uasset

BIN

View File

Binary file not shown.

Content/Meshes/Squads/SM_Squad_02.uasset

BIN

View File

Binary file not shown.

Content/Meshes/Squads/SM_Squad_03.uasset

BIN

View File

Binary file not shown.

Content/Meshes/Squads/SM_Squad_04.uasset

BIN

View File

Binary file not shown.

Content/Meshes/Squads/SM_Squad_05.uasset

BIN

View File

Binary file not shown.

Content/Meshes/Squads/SM_Squad_05_01.uasset

BIN

View File

Binary file not shown.

Content/Meshes/Squads/SM_Squad_05_02.uasset

BIN

View File

Binary file not shown.

Content/Textures/Brick/T_Brick_01_BC_alt.uasset

BIN

View File

Binary file not shown.

Content/Textures/Squads/T_Squad_01_BC.uasset

BIN

View File

Binary file not shown.

Content/Textures/Squads/T_Squad_02_01_BC.uasset

BIN

View File

Binary file not shown.

Content/Textures/Squads/T_Squad_02_01_RA.uasset

BIN

View File

Binary file not shown.

Content/Textures/Squads/T_Squad_02_02_BC.uasset

BIN

View File

Binary file not shown.

Content/Textures/Squads/T_Squad_02_02_RA.uasset

BIN

View File

Binary file not shown.

Content/Textures/Squads/T_Squad_03_01_BC.uasset

BIN

View File

Binary file not shown.

Content/Textures/Squads/T_Squad_04_01_BC.uasset

BIN

View File

Binary file not shown.

Content/Textures/Squads/T_Squad_05_BC.uasset

BIN

View File

Binary file not shown.

Content/Textures/Tile/T_Tile_01_BC.uasset

BIN

View File

Binary file not shown.

Content/Textures/Tile/T_Tile_01_N.uasset

BIN

View File

Binary file not shown.

Content/Textures/Tile/T_Tile_01_RMA.uasset

BIN

View File

Binary file not shown.