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

2 years ago · 19d6872fa5
parent 74e19c799b 804ad799c0
commit 19d6872fa5
5 changed files with 11 additions and 8 deletions
--- a/Japan_Raid/Content/Levels/Creatures.umap
+++ b/Japan_Raid/Content/Levels/Creatures.umap
--- a/Japan_Raid/Content/Meshes/Creatures/C_Kodamas/C_Kodama_anim/C_Kodama_v1_idle__anim.uasset
+++ b/Japan_Raid/Content/Meshes/Creatures/C_Kodamas/C_Kodama_anim/C_Kodama_v1_idle__anim.uasset
--- a/Japan_Raid/Content/Meshes/Creatures/C_Kodamas/C_Kodama_anim/C_Kodama_v3_jump__anim.uasset
+++ b/Japan_Raid/Content/Meshes/Creatures/C_Kodamas/C_Kodama_anim/C_Kodama_v3_jump__anim.uasset
--- a/Japan_Raid/Content/Textures/Decals/decal_stone/BP_Decal_stone_2.uasset
+++ b/Japan_Raid/Content/Textures/Decals/decal_stone/BP_Decal_stone_2.uasset
--- a/Japan_Raid/Content/Textures/Decals/decal_stone/BP_Decal_stone_3.uasset
+++ b/Japan_Raid/Content/Textures/Decals/decal_stone/BP_Decal_stone_3.uasset