Merge remote-tracking branch 'origin/newMain' into newMain

# Conflicts: # Japan_Raid/Content/MainMap.umap
1 year ago · 932047dd98
parent 0983fc4fd3 9f29741d72
commit 932047dd98
29 changed files with 43 additions and 58 deletions
--- a/Japan_Raid/Content/Levels/Cameras.umap
+++ b/Japan_Raid/Content/Levels/Cameras.umap
--- a/Japan_Raid/Content/Levels/Creatures.umap
+++ b/Japan_Raid/Content/Levels/Creatures.umap
--- a/Japan_Raid/Content/Levels/Geometry.umap
+++ b/Japan_Raid/Content/Levels/Geometry.umap
--- a/Japan_Raid/Content/Levels/Light_night.umap
+++ b/Japan_Raid/Content/Levels/Light_night.umap
--- a/Japan_Raid/Content/MSPresets/M_MS_Surface_Material/M_MS_Surface_Material.uasset
+++ b/Japan_Raid/Content/MSPresets/M_MS_Surface_Material/M_MS_Surface_Material.uasset
--- a/Japan_Raid/Content/MainMap.umap
+++ b/Japan_Raid/Content/MainMap.umap
--- a/Japan_Raid/Content/Material/Creatures/MI_Kodama.uasset
+++ b/Japan_Raid/Content/Material/Creatures/MI_Kodama.uasset
--- a/Japan_Raid/Content/Material/Creatures/MI_Kodama_v1.uasset
+++ b/Japan_Raid/Content/Material/Creatures/MI_Kodama_v1.uasset
--- a/Japan_Raid/Content/Material/Creatures/MI_Kodama_v2.uasset
+++ b/Japan_Raid/Content/Material/Creatures/MI_Kodama_v2.uasset
--- a/Japan_Raid/Content/Material/Creatures/MI_Kodama_v3.uasset
+++ b/Japan_Raid/Content/Material/Creatures/MI_Kodama_v3.uasset
--- a/Japan_Raid/Content/Material/Creatures/MI_Kodama_v4.uasset
+++ b/Japan_Raid/Content/Material/Creatures/MI_Kodama_v4.uasset
--- a/Japan_Raid/Content/Material/Creatures/MI_Kodama_v5.uasset
+++ b/Japan_Raid/Content/Material/Creatures/MI_Kodama_v5.uasset
--- a/Japan_Raid/Content/Material/Props/M_Cracked_Wooden_Planks1.uasset
+++ b/Japan_Raid/Content/Material/Props/M_Cracked_Wooden_Planks1.uasset
--- a/Japan_Raid/Content/Meshes/Creatures/C_Kodamas/C_Kodama_rigs/C_Kodama_v1_rig.uasset
+++ b/Japan_Raid/Content/Meshes/Creatures/C_Kodamas/C_Kodama_rigs/C_Kodama_v1_rig.uasset
--- a/Japan_Raid/Content/Meshes/Creatures/C_Kodamas/C_Kodama_rigs/C_Kodama_v2_rig.uasset
+++ b/Japan_Raid/Content/Meshes/Creatures/C_Kodamas/C_Kodama_rigs/C_Kodama_v2_rig.uasset
--- a/Japan_Raid/Content/Meshes/Creatures/C_Kodamas/C_Kodama_rigs/C_Kodama_v3_rig.uasset
+++ b/Japan_Raid/Content/Meshes/Creatures/C_Kodamas/C_Kodama_rigs/C_Kodama_v3_rig.uasset
--- a/Japan_Raid/Content/Meshes/Creatures/C_Kodamas/C_Kodama_rigs/C_Kodama_v4_rig.uasset
+++ b/Japan_Raid/Content/Meshes/Creatures/C_Kodamas/C_Kodama_rigs/C_Kodama_v4_rig.uasset
--- a/Japan_Raid/Content/Meshes/Creatures/C_Kodamas/C_Kodama_rigs/C_Kodama_v5_rig.uasset
+++ b/Japan_Raid/Content/Meshes/Creatures/C_Kodamas/C_Kodama_rigs/C_Kodama_v5_rig.uasset
--- a/Japan_Raid/Content/Meshes/Creatures/C_Kodamas/C_Kodama_rigs/Material.uasset
+++ b/Japan_Raid/Content/Meshes/Creatures/C_Kodamas/C_Kodama_rigs/Material.uasset
--- a/Japan_Raid/Content/Meshes/Creatures/C_Kodamas/C_Kodama_rigs/lambert1.uasset
+++ b/Japan_Raid/Content/Meshes/Creatures/C_Kodamas/C_Kodama_rigs/lambert1.uasset
--- a/Japan_Raid/Content/Meshes/codes_lamps_v2.uasset
+++ b/Japan_Raid/Content/Meshes/codes_lamps_v2.uasset
--- a/Japan_Raid/Content/Meshes/kodama_boat.uasset
+++ b/Japan_Raid/Content/Meshes/kodama_boat.uasset
--- a/Japan_Raid/Content/Meshes/kodama_only_sakura.uasset
+++ b/Japan_Raid/Content/Meshes/kodama_only_sakura.uasset
--- a/Japan_Raid/Content/Meshes/march_codes_v2.uasset
+++ b/Japan_Raid/Content/Meshes/march_codes_v2.uasset
--- a/Japan_Raid/Content/Meshes/small_boat.uasset
+++ b/Japan_Raid/Content/Meshes/small_boat.uasset
--- a/Japan_Raid/Content/Meshes/small_tentacle.uasset
+++ b/Japan_Raid/Content/Meshes/small_tentacle.uasset
--- a/Japan_Raid/Content/Meshes/swing.uasset
+++ b/Japan_Raid/Content/Meshes/swing.uasset
--- a/Japan_Raid/Content/Meshes/two_entities.uasset
+++ b/Japan_Raid/Content/Meshes/two_entities.uasset
--- a/Japan_Raid/Content/Sequences/Shot_10_seq.uasset
+++ b/Japan_Raid/Content/Sequences/Shot_10_seq.uasset