Merge remote-tracking branch 'origin/master'

5 days ago · 756befd363
parent c4a7551bfa 0af649184c
commit 756befd363
23 changed files with 68 additions and 4 deletions
--- a/Fatal_Celebration/Content/ExampleContent/Audio/Textures/T_Metal_Painted01_N.uasset
+++ b/Fatal_Celebration/Content/ExampleContent/Audio/Textures/T_Metal_Painted01_N.uasset
--- a/Fatal_Celebration/Content/ExampleContent/Blueprint_Communication/Materials/M_Metal_Lighter.uasset
+++ b/Fatal_Celebration/Content/ExampleContent/Blueprint_Communication/Materials/M_Metal_Lighter.uasset
--- a/Fatal_Celebration/Content/ExampleContent/Blueprint_Communication/Meshes/SM_Interactive_Crank.uasset
+++ b/Fatal_Celebration/Content/ExampleContent/Blueprint_Communication/Meshes/SM_Interactive_Crank.uasset
--- a/Fatal_Celebration/Content/ExampleContent/Blueprint_Splines/Blueprints/BP_Spline_Moving.uasset
+++ b/Fatal_Celebration/Content/ExampleContent/Blueprint_Splines/Blueprints/BP_Spline_Moving.uasset
--- a/Fatal_Celebration/Content/ExampleContent/Blueprint_Splines/Materials/Lantern.uasset
+++ b/Fatal_Celebration/Content/ExampleContent/Blueprint_Splines/Materials/Lantern.uasset
--- a/Fatal_Celebration/Content/ExampleContent/Blueprint_Splines/Materials/M_Lantern.uasset
+++ b/Fatal_Celebration/Content/ExampleContent/Blueprint_Splines/Materials/M_Lantern.uasset
--- a/Fatal_Celebration/Content/ExampleContent/Blueprint_Splines/Materials/M_Lantern_Inst.uasset
+++ b/Fatal_Celebration/Content/ExampleContent/Blueprint_Splines/Materials/M_Lantern_Inst.uasset
--- a/Fatal_Celebration/Content/ExampleContent/Blueprint_Splines/Materials/T_Lantern_M.uasset
+++ b/Fatal_Celebration/Content/ExampleContent/Blueprint_Splines/Materials/T_Lantern_M.uasset
--- a/Fatal_Celebration/Content/ExampleContent/Blueprint_Splines/Meshes/S_Hanging_Lantern.uasset
+++ b/Fatal_Celebration/Content/ExampleContent/Blueprint_Splines/Meshes/S_Hanging_Lantern.uasset
--- a/Fatal_Celebration/Content/ExampleContent/ScriptExamples/PivotPainter/Textures/Desert/T_SandDunes_N.uasset
+++ b/Fatal_Celebration/Content/ExampleContent/ScriptExamples/PivotPainter/Textures/Desert/T_SandDunes_N.uasset
--- 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_Wood5.uasset
+++ b/Fatal_Celebration/Content/Fatal_Celebration/Environment/Materials/Material_Instance/Natural/M_Wood5.uasset
--- a/Fatal_Celebration/Content/Fatal_Celebration/Environment/Meshes/Day_5/spoon_l/BP_Lamp.uasset
+++ b/Fatal_Celebration/Content/Fatal_Celebration/Environment/Meshes/Day_5/spoon_l/BP_Lamp.uasset
--- a/Fatal_Celebration/Content/Fatal_Celebration/Environment/Meshes/Day_5/spoon_l/SM_Armchair_03.uasset
+++ b/Fatal_Celebration/Content/Fatal_Celebration/Environment/Meshes/Day_5/spoon_l/SM_Armchair_03.uasset
--- a/Fatal_Celebration/Content/Fatal_Celebration/Environment/Meshes/Day_5/spoon_l/Trash/Kithen_set/SM_Pan_Type1_01.uasset
+++ b/Fatal_Celebration/Content/Fatal_Celebration/Environment/Meshes/Day_5/spoon_l/Trash/Kithen_set/SM_Pan_Type1_01.uasset
--- a/Fatal_Celebration/Content/Fatal_Celebration/Environment/Meshes/Day_5/spoon_l/Trash/Kithen_set/SM_Pan_Type2_01.uasset
+++ b/Fatal_Celebration/Content/Fatal_Celebration/Environment/Meshes/Day_5/spoon_l/Trash/Kithen_set/SM_Pan_Type2_01.uasset
--- a/Fatal_Celebration/Content/Fatal_Celebration/Environment/Meshes/Day_5/spoon_l/Trash/Kithen_set/SM_Statue_Type1_01.uasset
+++ b/Fatal_Celebration/Content/Fatal_Celebration/Environment/Meshes/Day_5/spoon_l/Trash/Kithen_set/SM_Statue_Type1_01.uasset
--- a/Fatal_Celebration/Content/Fatal_Celebration/Environment/Meshes/Day_5/spoon_l/Trash/Kithen_set/T_Concrete_BaseColor.uasset
+++ b/Fatal_Celebration/Content/Fatal_Celebration/Environment/Meshes/Day_5/spoon_l/Trash/Kithen_set/T_Concrete_BaseColor.uasset
--- a/Fatal_Celebration/Content/Fatal_Celebration/Environment/Meshes/Day_5/spoon_l/Trash/Kithen_set/T_Concrete_BaseColor_Mat.uasset
+++ b/Fatal_Celebration/Content/Fatal_Celebration/Environment/Meshes/Day_5/spoon_l/Trash/Kithen_set/T_Concrete_BaseColor_Mat.uasset
--- a/Fatal_Celebration/Content/Fatal_Celebration/Environment/Meshes/Day_5/spoon_l/Trash/SM_Disco_01.uasset
+++ b/Fatal_Celebration/Content/Fatal_Celebration/Environment/Meshes/Day_5/spoon_l/Trash/SM_Disco_01.uasset
--- a/Fatal_Celebration/Content/Fatal_Celebration/Environment/Meshes/Day_5/spoon_l/Trash/SM_Disco_02.uasset
+++ b/Fatal_Celebration/Content/Fatal_Celebration/Environment/Meshes/Day_5/spoon_l/Trash/SM_Disco_02.uasset
--- a/Fatal_Celebration/Content/Fatal_Celebration/Environment/Meshes/Day_5/spoon_l/Trash/SM_Lamp_01.uasset
+++ b/Fatal_Celebration/Content/Fatal_Celebration/Environment/Meshes/Day_5/spoon_l/Trash/SM_Lamp_01.uasset
--- a/Fatal_Celebration/Fatal_Celebration.uproject
+++ b/Fatal_Celebration/Fatal_Celebration.uproject
@ -78,6 +78,10 @@
 		{
 			"Name": "ChaosClothGenerator",
 			"Enabled": true
+		},
+		{
+			"Name": "ActorPalette",
+			"Enabled": true
 		}
 	]
 }