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

Browse Source

# Conflicts:
#	Japan_Raid/Content/Levels/Foliage_Main_Brush.umap
#	Japan_Raid/Content/Levels/Landscape.umap

newMain

VoxelCG 2 years ago

parent e407acabeb 238b21d6f1

commit e4ebdf4330

30 changed files with 80 additions and 17 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/Bluprint/BP_light1.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Japan_Raid/Content/Bluprint/BP_light2.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

Japan_Raid/Content/Meshes/Creatures/C_ShogiPlayerFaceless_v2_idle.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Japan_Raid/Content/Meshes/Creatures/C_Umbrella/C_Umbrella_fishing.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Japan_Raid/Content/Meshes/Creatures/C_Umbrella/C_Umbrella_rig.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Japan_Raid/Content/Meshes/Creatures/C_Umbrella/C_Umbrella_rig_PhysicsAsset.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Japan_Raid/Content/Meshes/Creatures/C_Umbrella/C_Umbrella_rig_Skeleton.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Japan_Raid/Content/Meshes/Creatures/C_Umbrella/M_Umbrella_1.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Japan_Raid/Content/Meshes/Creatures/C_Umbrella/M_Umbrella_2.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Japan_Raid/Content/Meshes/Creatures/C_Umbrella/M_Umbrella_3.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Japan_Raid/Content/Meshes/Creatures/C_Umbrella/M_Umbrella_4.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Japan_Raid/Content/Meshes/Creatures/C_Umbrella/M_Umbrella_5.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Japan_Raid/Content/Meshes/Creatures/C_Umbrella/M_Umbrella_6.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Japan_Raid/Content/Meshes/Creatures/C_Umbrella/M_Umbrella_7.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Japan_Raid/Content/Meshes/Creatures/C_Umbrella/M_Umbrella_8.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Japan_Raid/Content/Meshes/Creatures/C_Umbrella/M_fishrod_body_bamboo.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Japan_Raid/Content/Meshes/Creatures/C_Umbrella/M_fishrod_handle_bamboo.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Japan_Raid/Content/Meshes/Creatures/C_Umbrella/M_fishrod_hook_n_loops_metal.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Japan_Raid/Content/Meshes/Creatures/C_Umbrella/M_fishrod_line.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Japan_Raid/Content/Meshes/Creatures/C_Umbrella/SM_Fishingrod_anim.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Japan_Raid/Content/Meshes/Creatures/C_Umbrella/SM_Fishingrod_rig.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Japan_Raid/Content/Meshes/Creatures/C_Umbrella/SM_Fishingrod_rig_PhysicsAsset.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Japan_Raid/Content/Meshes/Creatures/C_Umbrella/SM_Fishingrod_rig_Skeleton.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Japan_Raid/Content/Meshes/Foliage/BRUSH/F_sakura_leaf_solo_1_FoliageType.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Japan_Raid/Content/Meshes/Foliage/BRUSH/F_sakura_leaf_solo_2_FoliageType.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Japan_Raid/Content/Meshes/Foliage/BRUSH/F_sakura_leaf_solo_3_FoliageType.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Japan_Raid/Content/Meshes/Foliage/BRUSH/F_sakura_leaf_solo_4_FoliageType.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Japan_Raid/Content/Meshes/Props/Animation/SM_Lamp_Paper_Physics.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Japan_Raid/Content/Meshes/Props/Animation/SM_PavilionLamp_Physics.uasset (Stored with Git LFS)

View File

Binary file not shown.

Write Preview

Loading…

Cancel

Save