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

Browse Source

# Conflicts:
#	Japan_Raid/Content/Levels/Geometry.umap
#	Japan_Raid/Content/MainMap.umap

newMain

RETRY\Retry 10 months ago

parent e2a481fbcc 80b17a7d57

commit 3f8710b6cb

29 changed files with 57 additions and 57 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/Levels/Foliage_Main.umap (Stored with Git LFS)

View File

Binary file not shown.

BIN

Japan_Raid/Content/Levels/Foliage_Main_Brush.umap (Stored with Git LFS)

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

Japan_Raid/Content/Material/Textures/t_TainingFence_bamboo/Bamboo_basecolor.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Japan_Raid/Content/Material/Textures/t_ropefence/Ropefence_rope_basecolor.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Japan_Raid/Content/Megascans/3D_Plants/Carolana_Water_Lily_uc2jdibia/T_Carolana_Water_Lily_uc2jdibia_2K_D.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Japan_Raid/Content/Textures/Decals/decal_stone/Decal_stone_normal.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Japan_Raid/Content/Textures/Decals/decal_stone/M_decal_stone.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Japan_Raid/Content/Textures/Decals/decal_stone/M_decal_stone_Inst_Julia_Walzer.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Japan_Raid/Content/Textures/Decals/decal_stone/M_decal_stone_Inst_Kanat.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Japan_Raid/Content/Textures/Decals/decal_stone/M_decal_stone_klan.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Japan_Raid/Content/Textures/Tiles/T_maple_bark_color_opacity.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Japan_Raid/Content/Textures/Tiles/T_nsfw_bush_bark_color_opacity.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

Write Preview

Loading…

Cancel

Save