Merge branch 'newMain' of http://wolfpredator.sknt.ru/Retry/Japan_Raid into newMain

Browse Source

# Conflicts:
#	Japan_Raid/Content/MainMap.umap
#	Japan_Raid/Content/Material/Props/M_Boat_v1.uasset

newMain

RETRY\Retry 2 years ago

parent db032f5bf9 5deb0eac8d

commit bfcbf44c4e

11 changed files with 32 additions and 2 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File

BIN

Japan_Raid/Content/Material/M_Boat_sakura_v1.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Japan_Raid/Content/Material/M_Boat_sakura_v2.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Japan_Raid/Content/Material/NewMaterial.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Japan_Raid/Content/Material/Props/M_Boat_v1.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Japan_Raid/Content/Textures/Unique/U_boat_Sakura_v1BaseColor.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Japan_Raid/Content/Textures/Unique/U_boat_Sakura_v1_Normal.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Japan_Raid/Content/Textures/Unique/U_boat_Sakura_v1_ORM.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Japan_Raid/Content/Textures/Unique/U_boat_Sakura_v2_BaseColor.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Japan_Raid/Content/Textures/Unique/U_boat_Sakura_v2_Normal.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Japan_Raid/Content/Textures/Unique/U_boat_Sakura_v2_ORM.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Japan_Raid/Content/VFX/NewNiagaraSystem.uasset (Stored with Git LFS)

View File

Binary file not shown.

Write Preview

Loading…

Cancel

Save