Merge branch 'main' into HEAD

# Conflicts: # Japan_Raid/Content/Levels/Foliage_Main.umap
11 months ago · 15f4959cfb
parent 85acf22a17 1d84e48bdc
commit 15f4959cfb
16 changed files with 2 additions and 47 deletions
--- a/Japan_Raid/Content/Levels/Foliage_Main.umap
+++ b/Japan_Raid/Content/Levels/Foliage_Main.umap
--- a/Japan_Raid/Content/Meshes/Creatures/SM_Tentacle_riged.uasset
+++ b/Japan_Raid/Content/Meshes/Creatures/SM_Tentacle_riged.uasset
--- a/Japan_Raid/Content/Meshes/Creatures/SM_Tentacle_riged_PhysicsAsset.uasset
+++ b/Japan_Raid/Content/Meshes/Creatures/SM_Tentacle_riged_PhysicsAsset.uasset
--- a/Japan_Raid/Content/Meshes/Creatures/SM_Tentacle_riged_Skeleton.uasset
+++ b/Japan_Raid/Content/Meshes/Creatures/SM_Tentacle_riged_Skeleton.uasset
--- a/Japan_Raid/Content/Meshes/Foliage/Blocking/BushSmall.uasset
+++ b/Japan_Raid/Content/Meshes/Foliage/Blocking/BushSmall.uasset
--- a/Japan_Raid/Content/Meshes/Foliage/Blocking/F_Magnolia.uasset
+++ b/Japan_Raid/Content/Meshes/Foliage/Blocking/F_Magnolia.uasset
--- a/Japan_Raid/Content/Meshes/Foliage/Blocking/bonsai.uasset
+++ b/Japan_Raid/Content/Meshes/Foliage/Blocking/bonsai.uasset
--- a/Japan_Raid/Content/Meshes/Foliage/Blocking/bonsai_blockout.uasset
+++ b/Japan_Raid/Content/Meshes/Foliage/Blocking/bonsai_blockout.uasset
--- a/Japan_Raid/Content/Meshes/Foliage/Blocking/magnolia_blockout.uasset
+++ b/Japan_Raid/Content/Meshes/Foliage/Blocking/magnolia_blockout.uasset
--- a/Japan_Raid/Content/Meshes/Foliage/Blocking/sakura_blockout.uasset
+++ b/Japan_Raid/Content/Meshes/Foliage/Blocking/sakura_blockout.uasset
--- a/Japan_Raid/Content/Meshes/Foliage/Blocking/tree_klen_1.uasset
+++ b/Japan_Raid/Content/Meshes/Foliage/Blocking/tree_klen_1.uasset
--- a/Japan_Raid/Content/Meshes/Foliage/Blocking/tree_klen_2.uasset
+++ b/Japan_Raid/Content/Meshes/Foliage/Blocking/tree_klen_2.uasset
--- a/Japan_Raid/Content/Meshes/Foliage/Blocking/tree_klen_3.uasset
+++ b/Japan_Raid/Content/Meshes/Foliage/Blocking/tree_klen_3.uasset
--- a/Japan_Raid/Content/Meshes/Props/SM_Tentacle_riged.uasset
+++ b/Japan_Raid/Content/Meshes/Props/SM_Tentacle_riged.uasset
--- a/Japan_Raid/Content/Meshes/Props/SM_Tentacle_riged_PhysicsAsset.uasset
+++ b/Japan_Raid/Content/Meshes/Props/SM_Tentacle_riged_PhysicsAsset.uasset
--- a/Japan_Raid/Content/Meshes/Props/SM_Tentacle_riged_Skeleton.uasset
+++ b/Japan_Raid/Content/Meshes/Props/SM_Tentacle_riged_Skeleton.uasset