Merge remote-tracking branch 'origin/master'

5 days ago · cd04cb8671
parent af100d1561 abd1f6c8ca
commit cd04cb8671
24 changed files with 53 additions and 38 deletions
--- a/Fatal_Celebration/Content/Fatal_Celebration/Environment/LevelInstances/LI_ZOO_D4.umap
+++ b/Fatal_Celebration/Content/Fatal_Celebration/Environment/LevelInstances/LI_ZOO_D4.umap
--- a/Fatal_Celebration/Content/Fatal_Celebration/Environment/Materials/Material_Instance/Natural/M_Flower_Inst1.uasset
+++ b/Fatal_Celebration/Content/Fatal_Celebration/Environment/Materials/Material_Instance/Natural/M_Flower_Inst1.uasset
--- a/Fatal_Celebration/Content/Fatal_Celebration/Environment/Materials/Material_Instance/Natural/M_Wood3.uasset
+++ b/Fatal_Celebration/Content/Fatal_Celebration/Environment/Materials/Material_Instance/Natural/M_Wood3.uasset
--- a/Fatal_Celebration/Content/Fatal_Celebration/Environment/Materials/Material_Instance/Natural/M_Wood4.uasset
+++ b/Fatal_Celebration/Content/Fatal_Celebration/Environment/Materials/Material_Instance/Natural/M_Wood4.uasset
--- a/Fatal_Celebration/Content/Fatal_Celebration/Environment/Materials/Material_Instance/Plastik/MLI_Plastik13.uasset
+++ b/Fatal_Celebration/Content/Fatal_Celebration/Environment/Materials/Material_Instance/Plastik/MLI_Plastik13.uasset
--- a/Fatal_Celebration/Content/Fatal_Celebration/Environment/Materials/Material_Instance/Plastik/MLI_Plastik14.uasset
+++ b/Fatal_Celebration/Content/Fatal_Celebration/Environment/Materials/Material_Instance/Plastik/MLI_Plastik14.uasset
--- a/Fatal_Celebration/Content/Fatal_Celebration/Environment/Meshes/Day_4/karinaam76/SM_Food_02.uasset
+++ b/Fatal_Celebration/Content/Fatal_Celebration/Environment/Meshes/Day_4/karinaam76/SM_Food_02.uasset
--- a/Fatal_Celebration/Content/Fatal_Celebration/Environment/Meshes/Day_4/karinaam76/SM_food_01.uasset
+++ b/Fatal_Celebration/Content/Fatal_Celebration/Environment/Meshes/Day_4/karinaam76/SM_food_01.uasset
--- a/Fatal_Celebration/Content/Fatal_Celebration/Environment/Meshes/Day_5/spoon_l/Jornal/SM_Igromania_Type10_01.uasset
+++ b/Fatal_Celebration/Content/Fatal_Celebration/Environment/Meshes/Day_5/spoon_l/Jornal/SM_Igromania_Type10_01.uasset
--- a/Fatal_Celebration/Content/Fatal_Celebration/Environment/Meshes/Day_5/spoon_l/Jornal/SM_Igromania_Type11_01.uasset
+++ b/Fatal_Celebration/Content/Fatal_Celebration/Environment/Meshes/Day_5/spoon_l/Jornal/SM_Igromania_Type11_01.uasset
--- a/Fatal_Celebration/Content/Fatal_Celebration/Environment/Meshes/Day_5/spoon_l/Jornal/SM_Igromania_Type12_01.uasset
+++ b/Fatal_Celebration/Content/Fatal_Celebration/Environment/Meshes/Day_5/spoon_l/Jornal/SM_Igromania_Type12_01.uasset
--- a/Fatal_Celebration/Content/Fatal_Celebration/Environment/Meshes/Day_5/spoon_l/Jornal/SM_Igromania_Type13_01.uasset
+++ b/Fatal_Celebration/Content/Fatal_Celebration/Environment/Meshes/Day_5/spoon_l/Jornal/SM_Igromania_Type13_01.uasset
--- a/Fatal_Celebration/Content/Fatal_Celebration/Environment/Meshes/Day_5/spoon_l/Jornal/SM_Igromania_Type1_01.uasset
+++ b/Fatal_Celebration/Content/Fatal_Celebration/Environment/Meshes/Day_5/spoon_l/Jornal/SM_Igromania_Type1_01.uasset
--- a/Fatal_Celebration/Content/Fatal_Celebration/Environment/Meshes/Day_5/spoon_l/Jornal/SM_Igromania_Type2_01.uasset
+++ b/Fatal_Celebration/Content/Fatal_Celebration/Environment/Meshes/Day_5/spoon_l/Jornal/SM_Igromania_Type2_01.uasset
--- a/Fatal_Celebration/Content/Fatal_Celebration/Environment/Meshes/Day_5/spoon_l/Jornal/SM_Igromania_Type3_01.uasset
+++ b/Fatal_Celebration/Content/Fatal_Celebration/Environment/Meshes/Day_5/spoon_l/Jornal/SM_Igromania_Type3_01.uasset
--- a/Fatal_Celebration/Content/Fatal_Celebration/Environment/Meshes/Day_5/spoon_l/Jornal/SM_Igromania_Type4_01.uasset
+++ b/Fatal_Celebration/Content/Fatal_Celebration/Environment/Meshes/Day_5/spoon_l/Jornal/SM_Igromania_Type4_01.uasset
--- a/Fatal_Celebration/Content/Fatal_Celebration/Environment/Meshes/Day_5/spoon_l/Jornal/SM_Igromania_Type5_01.uasset
+++ b/Fatal_Celebration/Content/Fatal_Celebration/Environment/Meshes/Day_5/spoon_l/Jornal/SM_Igromania_Type5_01.uasset
--- a/Fatal_Celebration/Content/Fatal_Celebration/Environment/Meshes/Day_5/spoon_l/Jornal/SM_Igromania_Type6_01.uasset
+++ b/Fatal_Celebration/Content/Fatal_Celebration/Environment/Meshes/Day_5/spoon_l/Jornal/SM_Igromania_Type6_01.uasset
--- a/Fatal_Celebration/Content/Fatal_Celebration/Environment/Meshes/Day_5/spoon_l/Jornal/SM_Igromania_Type7_01.uasset
+++ b/Fatal_Celebration/Content/Fatal_Celebration/Environment/Meshes/Day_5/spoon_l/Jornal/SM_Igromania_Type7_01.uasset
--- a/Fatal_Celebration/Content/Fatal_Celebration/Environment/Meshes/Day_5/spoon_l/Jornal/SM_Igromania_Type8_01.uasset
+++ b/Fatal_Celebration/Content/Fatal_Celebration/Environment/Meshes/Day_5/spoon_l/Jornal/SM_Igromania_Type8_01.uasset
--- a/Fatal_Celebration/Content/Fatal_Celebration/Environment/Meshes/Day_5/spoon_l/Jornal/SM_Igromania_Type9_01.uasset
+++ b/Fatal_Celebration/Content/Fatal_Celebration/Environment/Meshes/Day_5/spoon_l/Jornal/SM_Igromania_Type9_01.uasset
--- a/Fatal_Celebration/Content/Fatal_Celebration/Environment/Meshes/Day_5/spoon_l/SM_Igromania_Type1_01.uasset
+++ b/Fatal_Celebration/Content/Fatal_Celebration/Environment/Meshes/Day_5/spoon_l/SM_Igromania_Type1_01.uasset
--- a/Fatal_Celebration/Content/Fatal_Celebration/Environment/Meshes/Day_5/spoon_l/SM_Igromania_Type2_01.uasset
+++ b/Fatal_Celebration/Content/Fatal_Celebration/Environment/Meshes/Day_5/spoon_l/SM_Igromania_Type2_01.uasset
--- a/Fatal_Celebration/Content/Fatal_Celebration/Environment/Meshes/Day_5/spoon_l/SM_WhiskeyBottle_01.uasset
+++ b/Fatal_Celebration/Content/Fatal_Celebration/Environment/Meshes/Day_5/spoon_l/SM_WhiskeyBottle_01.uasset