diff --git a/Config/DefaultEngine.ini b/Config/DefaultEngine.ini index bedc2c94..6ffae3df 100644 --- a/Config/DefaultEngine.ini +++ b/Config/DefaultEngine.ini @@ -14,7 +14,7 @@ ThreePlayerSplitscreenLayout=FavorTop GlobalDefaultGameMode=/Game/ThirdPersonBP/Blueprints/ThirdPersonGameMode.ThirdPersonGameMode_C GlobalDefaultServerGameMode=None ServerDefaultMap=None -GameInstanceClass=/Game/ThirdPersonBP/Blueprints/BP_EleriGameInstance.BP_EleriGameInstance_C +GameInstanceClass=/Game/EasyOptionsMenu/EasyGameUI/GI_EasyMainGameInstance.GI_EasyMainGameInstance_C [/Script/IOSRuntimeSettings.IOSRuntimeSettings] MinimumiOSVersion=IOS_11 @@ -113,7 +113,7 @@ vr.RoundRobinOcclusion=False vr.ODSCapture=False r.MeshStreaming=False r.WireframeCullThreshold=5.000000 -r.RayTracing=False +r.RayTracing=True r.RayTracing.UseTextureLod=False r.SupportStationarySkylight=True r.SupportLowQualityLightmaps=True @@ -348,7 +348,7 @@ bAllowClientSideNavigation=True DataGatheringMode=Lazy [/Script/Engine.UserInterfaceSettings] -RenderFocusRule=Always +RenderFocusRule=Never bEnableDistanceFieldFontRasterization=True [Core.Log] @@ -435,3 +435,8 @@ RuntimeGeneration=Dynamic [/Script/GameplayDebugger.GameplayDebuggerConfig] ActivationKey=+ +[/Script/Engine.AudioSettings] +DefaultSoundClassName=/Game/EasyOptionsMenu/Core/Audio/SC_EOM_MasterAudio.SC_EOM_MasterAudio +DefaultMediaSoundClassName=/Game/EasyOptionsMenu/Core/Audio/SC_EOM_MasterAudio.SC_EOM_MasterAudio +DefaultBaseSoundMix=/Game/EasyOptionsMenu/Core/Audio/SCM_EOM_MasterMix.SCM_EOM_MasterMix + diff --git a/Config/DefaultGame.ini b/Config/DefaultGame.ini index 0ca26be3..108dc243 100644 --- a/Config/DefaultGame.ini +++ b/Config/DefaultGame.ini @@ -204,7 +204,7 @@ AudioChannelSoundClasses=((Master, "/Game/EasyOptionsMenu/Core/Audio/SC_EOM_Mast +DefaultSoundtracks=/Game/Sounds/Music/LoFi_First_Try.LoFi_First_Try SoundtrackMinDelay=20.000000 SoundtrackMaxDelay=60.000000 -MusicFadeTime=2.000000 +MusicFadeTime=5.000000 [/Script/InteractionSystem.InteractionSettings] DefaultInteractionWidgetClass=/Script/UMG.WidgetBlueprintGeneratedClass'/Game/UI/InteractionUI/WBP_Eleri_Interaction.WBP_Eleri_Interaction_C' diff --git a/Config/DefaultInput.ini b/Config/DefaultInput.ini index 821e0e42..3b99fcf1 100644 --- a/Config/DefaultInput.ini +++ b/Config/DefaultInput.ini @@ -115,7 +115,7 @@ bEnableLegacyInputScales=True bEnableMotionControls=True bFilterInputByPlatformUser=False bEnableInputDeviceSubsystem=True -bShouldFlushPressedKeysOnViewportFocusLost=True +bShouldFlushPressedKeysOnViewportFocusLost=False bEnableDynamicComponentInputBinding=True bAlwaysShowTouchInterface=False bShowConsoleOnFourFingerTap=True diff --git a/Config/DefaultSalability.ini b/Config/DefaultSalability.ini index d5f29ddd..879f340c 100644 --- a/Config/DefaultSalability.ini +++ b/Config/DefaultSalability.ini @@ -1,3 +1,9 @@ [ShadowQuality@0] -r.ShadowQuality=1 \ No newline at end of file +r.ShadowQuality=1 + +[ViewDistanceQuality@0] +r.ViewDistanceScale=0.5 + +[ViewDistanceQuality@1] +r.ViewDistanceScale=0.65 \ No newline at end of file diff --git a/Content/EasyOptionsMenu/Core/GlobalConfig/BP_EGUI_GlobalConfigSelector.uasset b/Content/EasyOptionsMenu/Core/GlobalConfig/BP_EGUI_GlobalConfigSelector.uasset index ec6502fb..d78b61c3 100644 --- a/Content/EasyOptionsMenu/Core/GlobalConfig/BP_EGUI_GlobalConfigSelector.uasset +++ b/Content/EasyOptionsMenu/Core/GlobalConfig/BP_EGUI_GlobalConfigSelector.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:33d1e70391cec3ea9368dbe95e0d2dec30d5e38281e1cad08ba95259a364cfcf -size 9938 +oid sha256:6d68a7d13d2967fe13f7b78e1cd319f6a53ed0e47000687d3ef2beb6dc742df7 +size 10060 diff --git a/Content/EasyOptionsMenu/Core/GlobalConfig/DA_EGUI_GlobalConfig.uasset b/Content/EasyOptionsMenu/Core/GlobalConfig/DA_EGUI_GlobalConfig.uasset new file mode 100644 index 00000000..e3fd746f --- /dev/null +++ b/Content/EasyOptionsMenu/Core/GlobalConfig/DA_EGUI_GlobalConfig.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d7350ed282ccef7bd0ac903c2beaf37ab561a8af114afabf64588a3e58c0f1a8 +size 5801 diff --git a/Content/EasyOptionsMenu/EasyGameUI/BP_EasyMainGameHUD.uasset b/Content/EasyOptionsMenu/EasyGameUI/BP_EasyMainGameHUD.uasset index 907e040d..567b6578 100644 --- a/Content/EasyOptionsMenu/EasyGameUI/BP_EasyMainGameHUD.uasset +++ b/Content/EasyOptionsMenu/EasyGameUI/BP_EasyMainGameHUD.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0443a0428eec0ed0ef4b3c9ea419dc4be3d812c540dbf1eab39a1f8644139653 -size 2998123 +oid sha256:c63860012e20e6085907ea518b90c88c9fc2635a23c62dab9a5f6d5fc50f4116 +size 2998938 diff --git a/Content/EasyOptionsMenu/EasyGameUI/GI_EasyMainGameInstance.uasset b/Content/EasyOptionsMenu/EasyGameUI/GI_EasyMainGameInstance.uasset index 7f3e106f..6afeb911 100644 --- a/Content/EasyOptionsMenu/EasyGameUI/GI_EasyMainGameInstance.uasset +++ b/Content/EasyOptionsMenu/EasyGameUI/GI_EasyMainGameInstance.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:146b9f1cfb826340b5c03cb643aa9be0b221dc4abed8f0c4c5620936bd19c67e -size 97738 +oid sha256:88a2ce4f7ff03c1e4a567a5a2bec625a1680c6159155bdc284e5275cc873263c +size 98310 diff --git a/Content/Sounds/Music/Ambient_1.uasset b/Content/Sounds/Music/Ambient_1.uasset index 85d6559d..8da49673 100644 --- a/Content/Sounds/Music/Ambient_1.uasset +++ b/Content/Sounds/Music/Ambient_1.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0fa28c55823d6d6483d12df672a022b55aefb2d2dce75e9d9b760d7c526bf4a4 -size 26905870 +oid sha256:eae2a36f0e394b1d5c1ee445751b2675fa4c0bb5cf3f7ceb37797714887f271c +size 26895721 diff --git a/Content/Sounds/Music/Ambient_3.uasset b/Content/Sounds/Music/Ambient_3.uasset index 029fec7a..93d8130c 100644 --- a/Content/Sounds/Music/Ambient_3.uasset +++ b/Content/Sounds/Music/Ambient_3.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e6e27917719d59d9ce8ed1ad552a989c31540acc7e0bf2d1192913428afcbe08 -size 28433196 +oid sha256:220a0168244697f831cd42d2ec4712eceb66d61e2e258d77d777f44e8294ad7a +size 28423943 diff --git a/Content/Sounds/Music/Ambient_4.uasset b/Content/Sounds/Music/Ambient_4.uasset index 80eef21c..6c79d09a 100644 --- a/Content/Sounds/Music/Ambient_4.uasset +++ b/Content/Sounds/Music/Ambient_4.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7454e419262db205f1a7ff0ac0b070ea6c7e862e739f0663a892d37d33fe98fd -size 28219124 +oid sha256:6c818d65294985de7cae69b5beec01494c88f1bc79fb75a76a465d48d60f3800 +size 28217571 diff --git a/Content/Sounds/Music/Ambient_7.uasset b/Content/Sounds/Music/Ambient_7.uasset index 5ead6f85..91409cf5 100644 --- a/Content/Sounds/Music/Ambient_7.uasset +++ b/Content/Sounds/Music/Ambient_7.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:78a2e1f86e2c0f5f786c3b9e73e37eeeb52d66be60d17c763b7b7dbf962eb105 -size 27469001 +oid sha256:873f76d297429c478aadd0a156650f59ac4b3fa0f3b7df85c370b0d4be1df02c +size 27460428 diff --git a/Content/Sounds/Music/Ambient_8.uasset b/Content/Sounds/Music/Ambient_8.uasset index d6b6f5fd..f437c160 100644 --- a/Content/Sounds/Music/Ambient_8.uasset +++ b/Content/Sounds/Music/Ambient_8.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4940b05a99d152a9aa28f93c1aeccac7ad4c94764d2cb16e355db0743f0a1056 -size 30596849 +oid sha256:cc3c0065063e1ef4f65f76eaee5f89cfc629496c4ab0983eead011305f1ce950 +size 30595201 diff --git a/Content/Sounds/Music/Ambient_9.uasset b/Content/Sounds/Music/Ambient_9.uasset index 03a23f48..f6695a6c 100644 --- a/Content/Sounds/Music/Ambient_9.uasset +++ b/Content/Sounds/Music/Ambient_9.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:dc3407e05ddd63cd0b9b0327cf1baa8921f035b7534d576f536dccbea826da31 -size 27068880 +oid sha256:55332415c3e63632dd0daf3fab45642057a08393def31ea6c244166610a03857 +size 27063407 diff --git a/Content/Sounds/Music/Light_Ambience_1.uasset b/Content/Sounds/Music/Light_Ambience_1.uasset index 434c75a1..0be5993d 100644 --- a/Content/Sounds/Music/Light_Ambience_1.uasset +++ b/Content/Sounds/Music/Light_Ambience_1.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4680188d4b1798402be86ef947686acb1da4b986996eaa1d2a626c7cc32f655b -size 19325535 +oid sha256:b0606e62359dcfb3539fc90d2ff51e438e3825dddfd1d00487061a92ec3abf9e +size 19324310 diff --git a/Content/Sounds/Music/Light_Ambience_2.uasset b/Content/Sounds/Music/Light_Ambience_2.uasset index 43cec9b3..6fd9bb3d 100644 --- a/Content/Sounds/Music/Light_Ambience_2.uasset +++ b/Content/Sounds/Music/Light_Ambience_2.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:eaa944ff22dccff4fa6b33a9d512f94dd8397741f3e21011c6c039ea4c5a97fa -size 24854814 +oid sha256:c6900174b1244bb5dbcfd687162ce26493cc7bf3d6fe3ee7dbd28a8987db8805 +size 24853227 diff --git a/Content/Sounds/Music/Light_Ambience_3.uasset b/Content/Sounds/Music/Light_Ambience_3.uasset index ae6edd14..c9d1898a 100644 --- a/Content/Sounds/Music/Light_Ambience_3.uasset +++ b/Content/Sounds/Music/Light_Ambience_3.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:da73bfe80a51472074aa56cb74d91e27df0c2ead30a24ddd524d0a294a94bdf2 -size 19425584 +oid sha256:8b01072aca20c121ed3a80f5dfce86047fe9a5a9ad90b9d9ff3d48841c2b9021 +size 19420746 diff --git a/Content/Sounds/Music/Light_Ambience_4.uasset b/Content/Sounds/Music/Light_Ambience_4.uasset index 137c0a4a..aeaa0ca4 100644 --- a/Content/Sounds/Music/Light_Ambience_4.uasset +++ b/Content/Sounds/Music/Light_Ambience_4.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8a42a657b72544486e5099212db49c5705d381f00155803a568c6b8cadd8ab43 -size 19792977 +oid sha256:be3be8c4999ffb781b48aa3c105f362dd16490658146a5bfc53e17e47a678baa +size 19783887 diff --git a/Content/Sounds/Music/Light_Ambience_5.uasset b/Content/Sounds/Music/Light_Ambience_5.uasset index 06c61967..81965ccd 100644 --- a/Content/Sounds/Music/Light_Ambience_5.uasset +++ b/Content/Sounds/Music/Light_Ambience_5.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8aceea13ab326196d320e105cb4fb22e12293c3c27dd257c25ae40e74d056527 -size 18859231 +oid sha256:3459083df659e7bed6c4f06451de5e49fd3f22eddf998f6cb56df64ab62b3b1b +size 18841249 diff --git a/Content/Sounds/Music/LoFi_First_Try.uasset b/Content/Sounds/Music/LoFi_First_Try.uasset index 293e757b..449fab00 100644 --- a/Content/Sounds/Music/LoFi_First_Try.uasset +++ b/Content/Sounds/Music/LoFi_First_Try.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:646aee939f6e1a8d5b3abf68f6872b993de8d2e63016889e01d6191abe4552d4 -size 17001349 +oid sha256:6df205462a8ce786493b169a2c43301a4e410be8671010daad0d6bfe66197809 +size 17001678 diff --git a/Content/Sounds/Music/SC_AmbientMusicCue.uasset b/Content/Sounds/Music/SC_AmbientMusicCue.uasset index e9f5ca8f..942c8773 100644 --- a/Content/Sounds/Music/SC_AmbientMusicCue.uasset +++ b/Content/Sounds/Music/SC_AmbientMusicCue.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:01b4b8ec0c493623fdee495f2fc10b1e9b87c1b5bd2d59cfb91b2025635c1ca0 -size 16691 +oid sha256:9fbe62d6388c8b263c72b520b97169e2276cb954662a72a47d182cc4f4cb6a5f +size 17072 diff --git a/Content/ThirdPersonBP/Blueprints/ThirdPersonGameMode.uasset b/Content/ThirdPersonBP/Blueprints/ThirdPersonGameMode.uasset index b9cf7f7a..8bead681 100644 --- a/Content/ThirdPersonBP/Blueprints/ThirdPersonGameMode.uasset +++ b/Content/ThirdPersonBP/Blueprints/ThirdPersonGameMode.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2af9e636c2f553d2ffc58dd69511669c99fe672507670ea9a95865a02ce91dd7 -size 16452 +oid sha256:64eed87b6291d5dfa9b6d21f600fbb0408c68179767f17755dc32e050e11ff7e +size 16504 diff --git a/Content/UI/MainMenuScreenUI.uasset b/Content/UI/MainMenuScreenUI.uasset index b6674bc7..bc402c18 100644 --- a/Content/UI/MainMenuScreenUI.uasset +++ b/Content/UI/MainMenuScreenUI.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:23355707864a84596dd3ed05929a0ae078f5d292805f1eddbb3d75f49b2b9ce2 -size 482820 +oid sha256:f9b3449d606a101552d31ca0d6ad6a38dd6e7c6d316e8923370712cc3c494f88 +size 518262 diff --git a/Content/UI/MainUI.uasset b/Content/UI/MainUI.uasset index a9663056..050ae01f 100644 --- a/Content/UI/MainUI.uasset +++ b/Content/UI/MainUI.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7acfa2b4d0c19ec9fd208893cd4b40b6f72d996f770f26f6d151ff757bb965a7 -size 640357 +oid sha256:53579de583914a2b1ceb5e5718d6105c7ca87b3b0cbda15ef7a0b16136cc211a +size 661745 diff --git a/Content/UI/OptionsScreen.uasset b/Content/UI/OptionsScreen.uasset index dbaffd8a..209c18da 100644 --- a/Content/UI/OptionsScreen.uasset +++ b/Content/UI/OptionsScreen.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:806a1bd4c853b253fafc2e6c33ed555064110f375de6af2ce06d3cbfe4c1cb11 -size 1278270 +oid sha256:7ae8a61c4b97402ace7ee97f70249c8a85a7cdc3c0e9387048fa39f724a1db0a +size 1275433 diff --git a/ProjectEleri.uproject b/ProjectEleri.uproject index 47c870de..128de278 100644 --- a/ProjectEleri.uproject +++ b/ProjectEleri.uproject @@ -126,6 +126,10 @@ { "Name": "MCPClientToolset", "Enabled": true + }, + { + "Name": "JsonBlueprintUtilities", + "Enabled": true } ], "TargetPlatforms": [ diff --git a/Source/ProjectEleri/DialogueSystem/SpeechDataAsset.cpp b/Source/ProjectEleri/DialogueSystem/SpeechDataAsset.cpp index b6c33d3b..af7e1e9e 100644 --- a/Source/ProjectEleri/DialogueSystem/SpeechDataAsset.cpp +++ b/Source/ProjectEleri/DialogueSystem/SpeechDataAsset.cpp @@ -94,6 +94,7 @@ FText USpeechDataAsset::ReplaceTextInLine(const FText& Text, TMapSetVisibility(OptionsScreenOpen? ESlateVisibility::Visible : ESlateVisibility::Hidden); -} diff --git a/Source/ProjectEleri/Public/UI/MainMenuWidget.h b/Source/ProjectEleri/Public/UI/MainMenuWidget.h index 8e4460f2..b8d0b7e6 100644 --- a/Source/ProjectEleri/Public/UI/MainMenuWidget.h +++ b/Source/ProjectEleri/Public/UI/MainMenuWidget.h @@ -16,19 +16,7 @@ class PROJECTELERI_API UMainMenuWidget : public UEleriBaseWidget public: - //Main menu widget - UFUNCTION(BlueprintCallable, BlueprintPure) - UUserWidget* GetOptionsWidget() { return OptionsScreen_Widget; } - UFUNCTION(BlueprintCallable) - void ToggleOptionsWidget(bool bActive); - UFUNCTION(BlueprintCallable, BlueprintPure) - bool IsOptionsOpen() const { return OptionsScreenOpen; } protected: - //Dialogue UI - UPROPERTY(meta = (BindWidget)) - UUserWidget* OptionsScreen_Widget; - UPROPERTY() - bool OptionsScreenOpen = false; };