Merge branch 'MenusAndStuff'

2025-11-22 22:41:32 -05:00
parent 8c1de34eb5 9f933f1f9c
commit 442b977a65
27 changed files with 16 additions and 1 deletions
--- a/Content/Sounds/MainSoundMix.uasset
+++ b/Content/Sounds/MainSoundMix.uasset
--- a/Content/Sounds/SFX_Ambient.uasset
+++ b/Content/Sounds/SFX_Ambient.uasset
--- a/Content/Sounds/SFX_Dialogue.uasset
+++ b/Content/Sounds/SFX_Dialogue.uasset
--- a/Content/Sounds/SFX_Effects.uasset
+++ b/Content/Sounds/SFX_Effects.uasset
--- a/Content/Sounds/SFX_Music.uasset
+++ b/Content/Sounds/SFX_Music.uasset
--- a/Content/Sounds/SFX_UI.uasset
+++ b/Content/Sounds/SFX_UI.uasset
--- a/Content/Sounds/UI/Woodblock_C4.mp3
+++ b/Content/Sounds/UI/Woodblock_C4.mp3
--- a/Content/Sounds/UI/Woodblock_C4.uasset
+++ b/Content/Sounds/UI/Woodblock_C4.uasset
--- a/Content/Sounds/UI/Woodblock_F4.mp3
+++ b/Content/Sounds/UI/Woodblock_F4.mp3
--- a/Content/Sounds/UI/Woodblock_F4.uasset
+++ b/Content/Sounds/UI/Woodblock_F4.uasset
--- a/Content/UI_Menus/MainMenu/BP_MainMenu.uasset
+++ b/Content/UI_Menus/MainMenu/BP_MainMenu.uasset
--- a/Content/UI_Menus/MainMenu/BP_MainMenu_Gamemode.uasset
+++ b/Content/UI_Menus/MainMenu/BP_MainMenu_Gamemode.uasset
--- a/Content/UI_Menus/SettingsMenu/BP_ApplyGraphicsSettings.uasset
+++ b/Content/UI_Menus/SettingsMenu/BP_ApplyGraphicsSettings.uasset
--- a/Content/UI_Menus/SettingsMenu/BP_AudioSettings.uasset
+++ b/Content/UI_Menus/SettingsMenu/BP_AudioSettings.uasset
--- a/Content/UI_Menus/SettingsMenu/BP_DisplaySettings.uasset
+++ b/Content/UI_Menus/SettingsMenu/BP_DisplaySettings.uasset
--- a/Content/UI_Menus/SettingsMenu/BP_GraphicsSettings.uasset
+++ b/Content/UI_Menus/SettingsMenu/BP_GraphicsSettings.uasset
--- a/Content/UI_Menus/SettingsMenu/BP_SettingsMenu.uasset
+++ b/Content/UI_Menus/SettingsMenu/BP_SettingsMenu.uasset
--- a/Content/UI_Menus/SettingsMenu/Controls/BP_SensitivitySlider.uasset
+++ b/Content/UI_Menus/SettingsMenu/Controls/BP_SensitivitySlider.uasset
--- a/Content/UI_Menus/SettingsMenu/Controls/KeyCategories.uasset
+++ b/Content/UI_Menus/SettingsMenu/Controls/KeyCategories.uasset
--- a/Content/UI_Menus/SettingsMenu/Controls/KeyMappings.uasset
+++ b/Content/UI_Menus/SettingsMenu/Controls/KeyMappings.uasset
--- a/Content/UI_Menus/SettingsMenu/SettingsSave.uasset
+++ b/Content/UI_Menus/SettingsMenu/SettingsSave.uasset
--- a/Content/UI_Menus/StartMenu/BP_StartMenu.uasset
+++ b/Content/UI_Menus/StartMenu/BP_StartMenu.uasset
--- a/Content/UI_Menus/StartMenu/BP_StartMenu_Controller.uasset
+++ b/Content/UI_Menus/StartMenu/BP_StartMenu_Controller.uasset
--- a/Content/UI_Menus/StartMenu/B_StartMenu_Gamemode.uasset
+++ b/Content/UI_Menus/StartMenu/B_StartMenu_Gamemode.uasset
--- a/Content/Worlds/MainMenu.umap
+++ b/Content/Worlds/MainMenu.umap