From d60ef5982b8eda716568ac9dc94a62d8a9c1dea7 Mon Sep 17 00:00:00 2001 From: Oleg Petruny Date: Thu, 1 May 2025 16:44:12 +0200 Subject: [PATCH] final --- UnrealProject/Lost_Edge/Config/DefaultGame.ini | 14 +++----------- .../Lost_Edge/Content/Levels/Level_2/L_Level2.umap | 4 ++-- .../Sequencers/Seq_Level2_SkillSelect.uasset | 4 ++-- .../Level_2/Sequencers/Seq_Level2_TreeFall.uasset | 4 ++-- .../RuntimeLoadTest/BP_Test_RuntimeLoad.uasset | 4 ++-- .../Source/FMODStudio/FMODStudio.Build.cs | 4 ++-- .../FMODStudioEditor/FMODStudioEditor.Build.cs | 4 ++-- .../FMODStudioNiagara/FMODStudioNiagara.Build.cs | 4 ++-- .../FlatNodes/Source/FlatNodes/FlatNodes.Build.cs | 4 ++-- .../Plugins/LoadingScreen/LoadingScreen.uplugin | 3 +++ .../Resources/Icon128.png | 0 .../Resources/Runtime/T_ImageA.png | 0 .../Resources/Runtime/T_ImageB.png | 0 .../Source/LoadingScreen/LoadingScreen.Build.cs | 3 +++ .../Source/LoadingScreen/Private/LoadingScreen.cpp | 3 +++ .../LoadingScreen/Private/SLoadingScreenWidget.cpp | 3 +++ .../LoadingScreen/Private/SLoadingScreenWidget.h | 3 +++ .../Source/LoadingScreen/Public/LoadingScreen.h | 3 +++ .../LoadingScreenSettings.Build.cs | 3 +++ .../Public/LoadingScreenSettings.h | 3 +++ .../Public/LoadingScreenSettingsModule.cpp | 3 +++ .../PreStartupScreen/PreStartupScreen.Build.cs | 3 +++ .../PreStartupScreen/Private/PreStartupScreen.cpp | 0 .../Private/PreStartupScreenPlayer.cpp | 3 +++ .../Private/PreStartupScreenPlayer.h | 3 +++ .../Private/SPreStartupScreenWidget.cpp | 3 +++ .../Private/SPreStartupScreenWidget.h | 3 +++ .../PreStartupScreen/Public/PreStartupScreen.h | 0 .../StartupScreen/Private/SStartupScreenWidget.cpp | 3 +++ .../StartupScreen/Private/SStartupScreenWidget.h | 3 +++ .../Source/StartupScreen/Private/StartupScreen.cpp | 3 +++ .../StartupScreen/Private/StartupScreenPlayer.cpp | 3 +++ .../StartupScreen/Private/StartupScreenPlayer.h | 3 +++ .../Source/StartupScreen/Public/StartupScreen.h | 0 .../Source/StartupScreen/StartupScreen.Build.cs | 0 .../PreStartupScreen/PreStartupScreen.Build.cs | 3 --- .../Private/PreStartupScreenPlayer.cpp | 3 --- .../Private/PreStartupScreenPlayer.h | 3 --- .../Private/PreStartupScreenSettings.h | 3 --- .../Private/SPreStartupScreenWidget.cpp | 3 --- .../Private/SPreStartupScreenWidget.h | 3 --- .../StartupScreen/Private/SStartupScreenWidget.cpp | 3 --- .../StartupScreen/Private/SStartupScreenWidget.h | 3 --- .../Source/StartupScreen/Private/StartupScreen.cpp | 3 --- .../StartupScreen/Private/StartupScreenPlayer.cpp | 3 --- .../StartupScreen/Private/StartupScreenPlayer.h | 3 --- .../StartupScreen/Private/StartupScreenSettings.h | 3 --- .../Plugins/StartupScreen/StartupScreen.uplugin | 3 --- .../Source/Lost_Edge/Private/CommonFunctions.h | 9 ++++----- .../Lost_Edge/Private/GraphicsSettingsHelper.h | 2 +- .../Lost_Edge/Private/Interactable/Interactable.h | 2 +- .../Modificators/InteractableModificator.h | 2 +- .../Private/Minigame/Fishing/FishingManager.h | 10 +++++----- .../Source/Lost_Edge/Private/PlayerBase.h | 12 ++++++------ 54 files changed, 94 insertions(+), 85 deletions(-) create mode 100644 UnrealProject/Lost_Edge/Plugins/LoadingScreen/LoadingScreen.uplugin rename UnrealProject/Lost_Edge/Plugins/{StartupScreen => LoadingScreen}/Resources/Icon128.png (100%) rename UnrealProject/Lost_Edge/Plugins/{StartupScreen => LoadingScreen}/Resources/Runtime/T_ImageA.png (100%) rename UnrealProject/Lost_Edge/Plugins/{StartupScreen => LoadingScreen}/Resources/Runtime/T_ImageB.png (100%) create mode 100644 UnrealProject/Lost_Edge/Plugins/LoadingScreen/Source/LoadingScreen/LoadingScreen.Build.cs create mode 100644 UnrealProject/Lost_Edge/Plugins/LoadingScreen/Source/LoadingScreen/Private/LoadingScreen.cpp create mode 100644 UnrealProject/Lost_Edge/Plugins/LoadingScreen/Source/LoadingScreen/Private/SLoadingScreenWidget.cpp create mode 100644 UnrealProject/Lost_Edge/Plugins/LoadingScreen/Source/LoadingScreen/Private/SLoadingScreenWidget.h create mode 100644 UnrealProject/Lost_Edge/Plugins/LoadingScreen/Source/LoadingScreen/Public/LoadingScreen.h create mode 100644 UnrealProject/Lost_Edge/Plugins/LoadingScreen/Source/LoadingScreenSettings/LoadingScreenSettings.Build.cs create mode 100644 UnrealProject/Lost_Edge/Plugins/LoadingScreen/Source/LoadingScreenSettings/Public/LoadingScreenSettings.h create mode 100644 UnrealProject/Lost_Edge/Plugins/LoadingScreen/Source/LoadingScreenSettings/Public/LoadingScreenSettingsModule.cpp create mode 100644 UnrealProject/Lost_Edge/Plugins/LoadingScreen/Source/PreStartupScreen/PreStartupScreen.Build.cs rename UnrealProject/Lost_Edge/Plugins/{StartupScreen => LoadingScreen}/Source/PreStartupScreen/Private/PreStartupScreen.cpp (100%) create mode 100644 UnrealProject/Lost_Edge/Plugins/LoadingScreen/Source/PreStartupScreen/Private/PreStartupScreenPlayer.cpp create mode 100644 UnrealProject/Lost_Edge/Plugins/LoadingScreen/Source/PreStartupScreen/Private/PreStartupScreenPlayer.h create mode 100644 UnrealProject/Lost_Edge/Plugins/LoadingScreen/Source/PreStartupScreen/Private/SPreStartupScreenWidget.cpp create mode 100644 UnrealProject/Lost_Edge/Plugins/LoadingScreen/Source/PreStartupScreen/Private/SPreStartupScreenWidget.h rename UnrealProject/Lost_Edge/Plugins/{StartupScreen => LoadingScreen}/Source/PreStartupScreen/Public/PreStartupScreen.h (100%) create mode 100644 UnrealProject/Lost_Edge/Plugins/LoadingScreen/Source/StartupScreen/Private/SStartupScreenWidget.cpp create mode 100644 UnrealProject/Lost_Edge/Plugins/LoadingScreen/Source/StartupScreen/Private/SStartupScreenWidget.h create mode 100644 UnrealProject/Lost_Edge/Plugins/LoadingScreen/Source/StartupScreen/Private/StartupScreen.cpp create mode 100644 UnrealProject/Lost_Edge/Plugins/LoadingScreen/Source/StartupScreen/Private/StartupScreenPlayer.cpp create mode 100644 UnrealProject/Lost_Edge/Plugins/LoadingScreen/Source/StartupScreen/Private/StartupScreenPlayer.h rename UnrealProject/Lost_Edge/Plugins/{StartupScreen => LoadingScreen}/Source/StartupScreen/Public/StartupScreen.h (100%) rename UnrealProject/Lost_Edge/Plugins/{StartupScreen => LoadingScreen}/Source/StartupScreen/StartupScreen.Build.cs (100%) delete mode 100644 UnrealProject/Lost_Edge/Plugins/StartupScreen/Source/PreStartupScreen/PreStartupScreen.Build.cs delete mode 100644 UnrealProject/Lost_Edge/Plugins/StartupScreen/Source/PreStartupScreen/Private/PreStartupScreenPlayer.cpp delete mode 100644 UnrealProject/Lost_Edge/Plugins/StartupScreen/Source/PreStartupScreen/Private/PreStartupScreenPlayer.h delete mode 100644 UnrealProject/Lost_Edge/Plugins/StartupScreen/Source/PreStartupScreen/Private/PreStartupScreenSettings.h delete mode 100644 UnrealProject/Lost_Edge/Plugins/StartupScreen/Source/PreStartupScreen/Private/SPreStartupScreenWidget.cpp delete mode 100644 UnrealProject/Lost_Edge/Plugins/StartupScreen/Source/PreStartupScreen/Private/SPreStartupScreenWidget.h delete mode 100644 UnrealProject/Lost_Edge/Plugins/StartupScreen/Source/StartupScreen/Private/SStartupScreenWidget.cpp delete mode 100644 UnrealProject/Lost_Edge/Plugins/StartupScreen/Source/StartupScreen/Private/SStartupScreenWidget.h delete mode 100644 UnrealProject/Lost_Edge/Plugins/StartupScreen/Source/StartupScreen/Private/StartupScreen.cpp delete mode 100644 UnrealProject/Lost_Edge/Plugins/StartupScreen/Source/StartupScreen/Private/StartupScreenPlayer.cpp delete mode 100644 UnrealProject/Lost_Edge/Plugins/StartupScreen/Source/StartupScreen/Private/StartupScreenPlayer.h delete mode 100644 UnrealProject/Lost_Edge/Plugins/StartupScreen/Source/StartupScreen/Private/StartupScreenSettings.h delete mode 100644 UnrealProject/Lost_Edge/Plugins/StartupScreen/StartupScreen.uplugin diff --git a/UnrealProject/Lost_Edge/Config/DefaultGame.ini b/UnrealProject/Lost_Edge/Config/DefaultGame.ini index 1983ff4..528ef25 100644 --- a/UnrealProject/Lost_Edge/Config/DefaultGame.ini +++ b/UnrealProject/Lost_Edge/Config/DefaultGame.ini @@ -1,5 +1,3 @@ - - [/Script/EngineSettings.GeneralProjectSettings] ProjectID=09D27A7F49EDD2A17DE1879F3BDEF448 ProjectVersion=0.1 @@ -133,13 +131,7 @@ bShouldAcquireMissingChunksOnLoad=False bShouldWarnAboutInvalidAssets=True MetaDataTagsForAssetRegistry=() - - -[/Script/LoadingScreen.LoadingScreenSettings] -startupBackgroundImageA=/Game/Movies/Images/T_StartupImageA.T_StartupImageA -startupBackgroundImageB=/Game/Movies/Images/T_StartupImageB.T_StartupImageB - -[/Script/StartupScreenModule.StartupScreenSettings] -imageA=/Game/Movies/Images/T_StartupImageA.T_StartupImageA -imageB=/Game/Movies/Images/T_StartupImageB.T_StartupImageB +[/Script/LoadingScreenSettings.LoadingScreenSettings] +minimumDisplayTime=2.000000 +levels=(("/Game/Levels/Test/L_Test.L_Test", NSLOCTEXT("[/Script/LoadingScreenSettings]", "38913E074A1A7FB8CEC17CA454DB93CA", "Test level")),("/Game/Levels/Level_1/L_Level1.L_Level1", NSLOCTEXT("[/Script/LoadingScreenSettings]", "F5CCDF174DFA012184FEC8815ECFC60A", "Chapter 1")),("/Game/Levels/Level_2/L_Level2.L_Level2", NSLOCTEXT("[/Script/LoadingScreenSettings]", "CFCC13A248739EEE82C1D4B184356774", "Chapter 2")),("/Game/Levels/Level_3/L_Level3.L_Level3", NSLOCTEXT("[/Script/LoadingScreenSettings]", "3132A33A4C4D1781D269F88B79713C68", "Chapter 3")),("/Game/Levels/Level_4/L_Level4.L_Level4", NSLOCTEXT("[/Script/LoadingScreenSettings]", "C0EA4190480108E377AA78AA7BAA3A05", "Chapter 4")),("/Game/Levels/Level_5/L_Level5.L_Level5", NSLOCTEXT("[/Script/LoadingScreenSettings]", "61D418214496DCBC2286B89D87611BE2", "Chapter 5"))) diff --git a/UnrealProject/Lost_Edge/Content/Levels/Level_2/L_Level2.umap b/UnrealProject/Lost_Edge/Content/Levels/Level_2/L_Level2.umap index a4a37a3..978bb3c 100644 --- a/UnrealProject/Lost_Edge/Content/Levels/Level_2/L_Level2.umap +++ b/UnrealProject/Lost_Edge/Content/Levels/Level_2/L_Level2.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f53ae615db812cb4b817a33e6e51651690b0288ff1febda9b8e319324fc35b28 -size 38750125 +oid sha256:0a63ffd047526f10d338c768d43168a818bde8d1eb1ba11a51e447ec80bb29b6 +size 38742958 diff --git a/UnrealProject/Lost_Edge/Content/Levels/Level_2/Sequencers/Seq_Level2_SkillSelect.uasset b/UnrealProject/Lost_Edge/Content/Levels/Level_2/Sequencers/Seq_Level2_SkillSelect.uasset index 677c0cd..59b83dc 100644 --- a/UnrealProject/Lost_Edge/Content/Levels/Level_2/Sequencers/Seq_Level2_SkillSelect.uasset +++ b/UnrealProject/Lost_Edge/Content/Levels/Level_2/Sequencers/Seq_Level2_SkillSelect.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b48b3ab3e8cdb2b36cd836a60d614e9270e47af457925e4ea68b7cef4c985331 -size 22858 +oid sha256:a562b1456d7f53bd3ee8e5aee83882b7dec29f26139a5cc3b46cdc80c191f45c +size 28230 diff --git a/UnrealProject/Lost_Edge/Content/Levels/Level_2/Sequencers/Seq_Level2_TreeFall.uasset b/UnrealProject/Lost_Edge/Content/Levels/Level_2/Sequencers/Seq_Level2_TreeFall.uasset index 09286f0..cee1fce 100644 --- a/UnrealProject/Lost_Edge/Content/Levels/Level_2/Sequencers/Seq_Level2_TreeFall.uasset +++ b/UnrealProject/Lost_Edge/Content/Levels/Level_2/Sequencers/Seq_Level2_TreeFall.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9c8aa7448e4ea8b080a66b1ade509e6a959ce474f7a663fff5a2e33cc5d5f6ea -size 45361 +oid sha256:cec3a20c766bf5830abc08cd154e35248adb57eb252020fbdee5a1761a5bf384 +size 50799 diff --git a/UnrealProject/Lost_Edge/Content/Levels/Test/Actors/RuntimeLoadTest/BP_Test_RuntimeLoad.uasset b/UnrealProject/Lost_Edge/Content/Levels/Test/Actors/RuntimeLoadTest/BP_Test_RuntimeLoad.uasset index 09b4397..3d7f124 100644 --- a/UnrealProject/Lost_Edge/Content/Levels/Test/Actors/RuntimeLoadTest/BP_Test_RuntimeLoad.uasset +++ b/UnrealProject/Lost_Edge/Content/Levels/Test/Actors/RuntimeLoadTest/BP_Test_RuntimeLoad.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:de2d44f87a368a36c39a9461f9316638c65ee9977b6a8338c2376826b10ad365 -size 87003 +oid sha256:d25b5bfb6c1d5db31568e87c1fbae6296dec08e889f64512ac5c09125ac31893 +size 85074 diff --git a/UnrealProject/Lost_Edge/Plugins/FMODStudio/Source/FMODStudio/FMODStudio.Build.cs b/UnrealProject/Lost_Edge/Plugins/FMODStudio/Source/FMODStudio/FMODStudio.Build.cs index 9e02f45..3c3d14a 100644 --- a/UnrealProject/Lost_Edge/Plugins/FMODStudio/Source/FMODStudio/FMODStudio.Build.cs +++ b/UnrealProject/Lost_Edge/Plugins/FMODStudio/Source/FMODStudio/FMODStudio.Build.cs @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e6a12de125c72482954985c58f220fb0723a10114c3f91f920ef139a3f212204 -size 11742 +oid sha256:0cf3a7eeb32e6a9158c232c76337fae8fe775cbca8ea800bf1a28bb91eea5596 +size 11883 diff --git a/UnrealProject/Lost_Edge/Plugins/FMODStudio/Source/FMODStudioEditor/FMODStudioEditor.Build.cs b/UnrealProject/Lost_Edge/Plugins/FMODStudio/Source/FMODStudioEditor/FMODStudioEditor.Build.cs index 64fb4af..a701fda 100644 --- a/UnrealProject/Lost_Edge/Plugins/FMODStudio/Source/FMODStudioEditor/FMODStudioEditor.Build.cs +++ b/UnrealProject/Lost_Edge/Plugins/FMODStudio/Source/FMODStudioEditor/FMODStudioEditor.Build.cs @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1ab10820dd297408c4c955767c5f0f9ba20888aa90a10405c09a251fd442cd56 -size 2305 +oid sha256:51d973816e5f69750910f94f2334aaaca9c731ac61be375578f432658867ccc0 +size 2311 diff --git a/UnrealProject/Lost_Edge/Plugins/FMODStudioNiagara/Source/FMODStudioNiagara/FMODStudioNiagara.Build.cs b/UnrealProject/Lost_Edge/Plugins/FMODStudioNiagara/Source/FMODStudioNiagara/FMODStudioNiagara.Build.cs index 2124e37..6e8b2ff 100644 --- a/UnrealProject/Lost_Edge/Plugins/FMODStudioNiagara/Source/FMODStudioNiagara/FMODStudioNiagara.Build.cs +++ b/UnrealProject/Lost_Edge/Plugins/FMODStudioNiagara/Source/FMODStudioNiagara/FMODStudioNiagara.Build.cs @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:70b7603010c7c7ee604413fe1a375af9001f115d67116cb8514acbe8e64abc42 -size 1248 +oid sha256:67056ac9778bdf2a9c28e61cc5c1a75f2d956be932739cd05fe2378c1ec42bb6 +size 1234 diff --git a/UnrealProject/Lost_Edge/Plugins/FlatNodes/Source/FlatNodes/FlatNodes.Build.cs b/UnrealProject/Lost_Edge/Plugins/FlatNodes/Source/FlatNodes/FlatNodes.Build.cs index 3794c50..b2e7fbf 100644 --- a/UnrealProject/Lost_Edge/Plugins/FlatNodes/Source/FlatNodes/FlatNodes.Build.cs +++ b/UnrealProject/Lost_Edge/Plugins/FlatNodes/Source/FlatNodes/FlatNodes.Build.cs @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0f5e68f6f9e9b1dbca2c6a28e1525da5300a6a6d7c3f596ad8187caea727919e -size 1700 +oid sha256:c79baf0a6e71712365f838b3fafbcb518ac097294400d650a4bd67953acf89e1 +size 1686 diff --git a/UnrealProject/Lost_Edge/Plugins/LoadingScreen/LoadingScreen.uplugin b/UnrealProject/Lost_Edge/Plugins/LoadingScreen/LoadingScreen.uplugin new file mode 100644 index 0000000..8949008 --- /dev/null +++ b/UnrealProject/Lost_Edge/Plugins/LoadingScreen/LoadingScreen.uplugin @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ecb52987cf63e16928bc293699b06a5b096765520d219aea25183b61bc002e1c +size 892 diff --git a/UnrealProject/Lost_Edge/Plugins/StartupScreen/Resources/Icon128.png b/UnrealProject/Lost_Edge/Plugins/LoadingScreen/Resources/Icon128.png similarity index 100% rename from UnrealProject/Lost_Edge/Plugins/StartupScreen/Resources/Icon128.png rename to UnrealProject/Lost_Edge/Plugins/LoadingScreen/Resources/Icon128.png diff --git a/UnrealProject/Lost_Edge/Plugins/StartupScreen/Resources/Runtime/T_ImageA.png b/UnrealProject/Lost_Edge/Plugins/LoadingScreen/Resources/Runtime/T_ImageA.png similarity index 100% rename from UnrealProject/Lost_Edge/Plugins/StartupScreen/Resources/Runtime/T_ImageA.png rename to UnrealProject/Lost_Edge/Plugins/LoadingScreen/Resources/Runtime/T_ImageA.png diff --git a/UnrealProject/Lost_Edge/Plugins/StartupScreen/Resources/Runtime/T_ImageB.png b/UnrealProject/Lost_Edge/Plugins/LoadingScreen/Resources/Runtime/T_ImageB.png similarity index 100% rename from UnrealProject/Lost_Edge/Plugins/StartupScreen/Resources/Runtime/T_ImageB.png rename to UnrealProject/Lost_Edge/Plugins/LoadingScreen/Resources/Runtime/T_ImageB.png diff --git a/UnrealProject/Lost_Edge/Plugins/LoadingScreen/Source/LoadingScreen/LoadingScreen.Build.cs b/UnrealProject/Lost_Edge/Plugins/LoadingScreen/Source/LoadingScreen/LoadingScreen.Build.cs new file mode 100644 index 0000000..de4c93e --- /dev/null +++ b/UnrealProject/Lost_Edge/Plugins/LoadingScreen/Source/LoadingScreen/LoadingScreen.Build.cs @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:eda8d302f0034355f504416967b6fcd2f30d02dba4fc56797683aa502acbb5dc +size 1515 diff --git a/UnrealProject/Lost_Edge/Plugins/LoadingScreen/Source/LoadingScreen/Private/LoadingScreen.cpp b/UnrealProject/Lost_Edge/Plugins/LoadingScreen/Source/LoadingScreen/Private/LoadingScreen.cpp new file mode 100644 index 0000000..87d6ecd --- /dev/null +++ b/UnrealProject/Lost_Edge/Plugins/LoadingScreen/Source/LoadingScreen/Private/LoadingScreen.cpp @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ca4ab0acc8a723b3d2b1ad9e5fdd17b08651f04cc303070454b048b842af3d66 +size 2270 diff --git a/UnrealProject/Lost_Edge/Plugins/LoadingScreen/Source/LoadingScreen/Private/SLoadingScreenWidget.cpp b/UnrealProject/Lost_Edge/Plugins/LoadingScreen/Source/LoadingScreen/Private/SLoadingScreenWidget.cpp new file mode 100644 index 0000000..58089ed --- /dev/null +++ b/UnrealProject/Lost_Edge/Plugins/LoadingScreen/Source/LoadingScreen/Private/SLoadingScreenWidget.cpp @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:663e08b2e9eec8fc090b2e8f77ef13b696a2eda8e89ab2a4704fc13a2984f4a0 +size 1724 diff --git a/UnrealProject/Lost_Edge/Plugins/LoadingScreen/Source/LoadingScreen/Private/SLoadingScreenWidget.h b/UnrealProject/Lost_Edge/Plugins/LoadingScreen/Source/LoadingScreen/Private/SLoadingScreenWidget.h new file mode 100644 index 0000000..b463b25 --- /dev/null +++ b/UnrealProject/Lost_Edge/Plugins/LoadingScreen/Source/LoadingScreen/Private/SLoadingScreenWidget.h @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3bde8f0a987605d75a3f0fb18631791097b11b9041d469973875ab4dffbf7fc5 +size 650 diff --git a/UnrealProject/Lost_Edge/Plugins/LoadingScreen/Source/LoadingScreen/Public/LoadingScreen.h b/UnrealProject/Lost_Edge/Plugins/LoadingScreen/Source/LoadingScreen/Public/LoadingScreen.h new file mode 100644 index 0000000..a0aa64d --- /dev/null +++ b/UnrealProject/Lost_Edge/Plugins/LoadingScreen/Source/LoadingScreen/Public/LoadingScreen.h @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4c2d614911ed52919b2fe80c096d2580414722822e25c3306a66341d851609ef +size 433 diff --git a/UnrealProject/Lost_Edge/Plugins/LoadingScreen/Source/LoadingScreenSettings/LoadingScreenSettings.Build.cs b/UnrealProject/Lost_Edge/Plugins/LoadingScreen/Source/LoadingScreenSettings/LoadingScreenSettings.Build.cs new file mode 100644 index 0000000..c405bf8 --- /dev/null +++ b/UnrealProject/Lost_Edge/Plugins/LoadingScreen/Source/LoadingScreenSettings/LoadingScreenSettings.Build.cs @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:cbfa87888a1bbe264b1a95beb3c71514d5c53db6522224a367407c7a38293f27 +size 1227 diff --git a/UnrealProject/Lost_Edge/Plugins/LoadingScreen/Source/LoadingScreenSettings/Public/LoadingScreenSettings.h b/UnrealProject/Lost_Edge/Plugins/LoadingScreen/Source/LoadingScreenSettings/Public/LoadingScreenSettings.h new file mode 100644 index 0000000..5736c5b --- /dev/null +++ b/UnrealProject/Lost_Edge/Plugins/LoadingScreen/Source/LoadingScreenSettings/Public/LoadingScreenSettings.h @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:90fe965b944cea07c5390a0f141c4d0ab3c6a4eb53407bdb55265306e71cae13 +size 1008 diff --git a/UnrealProject/Lost_Edge/Plugins/LoadingScreen/Source/LoadingScreenSettings/Public/LoadingScreenSettingsModule.cpp b/UnrealProject/Lost_Edge/Plugins/LoadingScreen/Source/LoadingScreenSettings/Public/LoadingScreenSettingsModule.cpp new file mode 100644 index 0000000..ab1ce39 --- /dev/null +++ b/UnrealProject/Lost_Edge/Plugins/LoadingScreen/Source/LoadingScreenSettings/Public/LoadingScreenSettingsModule.cpp @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9aa9ef6d887119e7a222e05f89c3a0b9dc2d02e69f9066bb44cf75c54cddf015 +size 302 diff --git a/UnrealProject/Lost_Edge/Plugins/LoadingScreen/Source/PreStartupScreen/PreStartupScreen.Build.cs b/UnrealProject/Lost_Edge/Plugins/LoadingScreen/Source/PreStartupScreen/PreStartupScreen.Build.cs new file mode 100644 index 0000000..16e3bed --- /dev/null +++ b/UnrealProject/Lost_Edge/Plugins/LoadingScreen/Source/PreStartupScreen/PreStartupScreen.Build.cs @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:96640de14154366f5adf4e81ad38776b9eab58d5a00a9792dd29d5d4e4f2b59d +size 1311 diff --git a/UnrealProject/Lost_Edge/Plugins/StartupScreen/Source/PreStartupScreen/Private/PreStartupScreen.cpp b/UnrealProject/Lost_Edge/Plugins/LoadingScreen/Source/PreStartupScreen/Private/PreStartupScreen.cpp similarity index 100% rename from UnrealProject/Lost_Edge/Plugins/StartupScreen/Source/PreStartupScreen/Private/PreStartupScreen.cpp rename to UnrealProject/Lost_Edge/Plugins/LoadingScreen/Source/PreStartupScreen/Private/PreStartupScreen.cpp diff --git a/UnrealProject/Lost_Edge/Plugins/LoadingScreen/Source/PreStartupScreen/Private/PreStartupScreenPlayer.cpp b/UnrealProject/Lost_Edge/Plugins/LoadingScreen/Source/PreStartupScreen/Private/PreStartupScreenPlayer.cpp new file mode 100644 index 0000000..0f00333 --- /dev/null +++ b/UnrealProject/Lost_Edge/Plugins/LoadingScreen/Source/PreStartupScreen/Private/PreStartupScreenPlayer.cpp @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:89b9ad7b0c2c6a8180203ce91502f2ac786cb55b424911fe61aa0b597db6084f +size 500 diff --git a/UnrealProject/Lost_Edge/Plugins/LoadingScreen/Source/PreStartupScreen/Private/PreStartupScreenPlayer.h b/UnrealProject/Lost_Edge/Plugins/LoadingScreen/Source/PreStartupScreen/Private/PreStartupScreenPlayer.h new file mode 100644 index 0000000..af59df9 --- /dev/null +++ b/UnrealProject/Lost_Edge/Plugins/LoadingScreen/Source/PreStartupScreen/Private/PreStartupScreenPlayer.h @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9fbce9f338c50919b7bc239fe17bc0209cb8f367c7e9174bcfd0d618a936c724 +size 675 diff --git a/UnrealProject/Lost_Edge/Plugins/LoadingScreen/Source/PreStartupScreen/Private/SPreStartupScreenWidget.cpp b/UnrealProject/Lost_Edge/Plugins/LoadingScreen/Source/PreStartupScreen/Private/SPreStartupScreenWidget.cpp new file mode 100644 index 0000000..820efe3 --- /dev/null +++ b/UnrealProject/Lost_Edge/Plugins/LoadingScreen/Source/PreStartupScreen/Private/SPreStartupScreenWidget.cpp @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:961e2a02cda05ed9aed42d989d3a0ccc98931db3e7780bbd99802cad6115f48b +size 737 diff --git a/UnrealProject/Lost_Edge/Plugins/LoadingScreen/Source/PreStartupScreen/Private/SPreStartupScreenWidget.h b/UnrealProject/Lost_Edge/Plugins/LoadingScreen/Source/PreStartupScreen/Private/SPreStartupScreenWidget.h new file mode 100644 index 0000000..488451c --- /dev/null +++ b/UnrealProject/Lost_Edge/Plugins/LoadingScreen/Source/PreStartupScreen/Private/SPreStartupScreenWidget.h @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2b65ab220840ccc20a6a3fcbbf3570d18d5da4f758f2480683fe719deef1bf29 +size 442 diff --git a/UnrealProject/Lost_Edge/Plugins/StartupScreen/Source/PreStartupScreen/Public/PreStartupScreen.h b/UnrealProject/Lost_Edge/Plugins/LoadingScreen/Source/PreStartupScreen/Public/PreStartupScreen.h similarity index 100% rename from UnrealProject/Lost_Edge/Plugins/StartupScreen/Source/PreStartupScreen/Public/PreStartupScreen.h rename to UnrealProject/Lost_Edge/Plugins/LoadingScreen/Source/PreStartupScreen/Public/PreStartupScreen.h diff --git a/UnrealProject/Lost_Edge/Plugins/LoadingScreen/Source/StartupScreen/Private/SStartupScreenWidget.cpp b/UnrealProject/Lost_Edge/Plugins/LoadingScreen/Source/StartupScreen/Private/SStartupScreenWidget.cpp new file mode 100644 index 0000000..626b0f4 --- /dev/null +++ b/UnrealProject/Lost_Edge/Plugins/LoadingScreen/Source/StartupScreen/Private/SStartupScreenWidget.cpp @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:182a1b9b3ca356ff898856126c380014f2095937ee94bd3ef8d5bd20dbe8502c +size 3293 diff --git a/UnrealProject/Lost_Edge/Plugins/LoadingScreen/Source/StartupScreen/Private/SStartupScreenWidget.h b/UnrealProject/Lost_Edge/Plugins/LoadingScreen/Source/StartupScreen/Private/SStartupScreenWidget.h new file mode 100644 index 0000000..10ac78d --- /dev/null +++ b/UnrealProject/Lost_Edge/Plugins/LoadingScreen/Source/StartupScreen/Private/SStartupScreenWidget.h @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e85b8247c41875330091e264cc2518bd07d22006554a29428b789bd5a08dd107 +size 825 diff --git a/UnrealProject/Lost_Edge/Plugins/LoadingScreen/Source/StartupScreen/Private/StartupScreen.cpp b/UnrealProject/Lost_Edge/Plugins/LoadingScreen/Source/StartupScreen/Private/StartupScreen.cpp new file mode 100644 index 0000000..ad654e2 --- /dev/null +++ b/UnrealProject/Lost_Edge/Plugins/LoadingScreen/Source/StartupScreen/Private/StartupScreen.cpp @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3410e04b4ad5735aad95ed13bdbff7a7a560cb24aad8ee3d56b418ede6d6efb4 +size 3191 diff --git a/UnrealProject/Lost_Edge/Plugins/LoadingScreen/Source/StartupScreen/Private/StartupScreenPlayer.cpp b/UnrealProject/Lost_Edge/Plugins/LoadingScreen/Source/StartupScreen/Private/StartupScreenPlayer.cpp new file mode 100644 index 0000000..1ce35b3 --- /dev/null +++ b/UnrealProject/Lost_Edge/Plugins/LoadingScreen/Source/StartupScreen/Private/StartupScreenPlayer.cpp @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9f895afa323d01d918c4f5a267d336afa603ba10d7a6d8882cd1ba5b99c984b6 +size 616 diff --git a/UnrealProject/Lost_Edge/Plugins/LoadingScreen/Source/StartupScreen/Private/StartupScreenPlayer.h b/UnrealProject/Lost_Edge/Plugins/LoadingScreen/Source/StartupScreen/Private/StartupScreenPlayer.h new file mode 100644 index 0000000..3b7c734 --- /dev/null +++ b/UnrealProject/Lost_Edge/Plugins/LoadingScreen/Source/StartupScreen/Private/StartupScreenPlayer.h @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7ee15ee6bcdec9034086c6df333a1ca41fc720a2dfcab10295658f7ce741e052 +size 733 diff --git a/UnrealProject/Lost_Edge/Plugins/StartupScreen/Source/StartupScreen/Public/StartupScreen.h b/UnrealProject/Lost_Edge/Plugins/LoadingScreen/Source/StartupScreen/Public/StartupScreen.h similarity index 100% rename from UnrealProject/Lost_Edge/Plugins/StartupScreen/Source/StartupScreen/Public/StartupScreen.h rename to UnrealProject/Lost_Edge/Plugins/LoadingScreen/Source/StartupScreen/Public/StartupScreen.h diff --git a/UnrealProject/Lost_Edge/Plugins/StartupScreen/Source/StartupScreen/StartupScreen.Build.cs b/UnrealProject/Lost_Edge/Plugins/LoadingScreen/Source/StartupScreen/StartupScreen.Build.cs similarity index 100% rename from UnrealProject/Lost_Edge/Plugins/StartupScreen/Source/StartupScreen/StartupScreen.Build.cs rename to UnrealProject/Lost_Edge/Plugins/LoadingScreen/Source/StartupScreen/StartupScreen.Build.cs diff --git a/UnrealProject/Lost_Edge/Plugins/StartupScreen/Source/PreStartupScreen/PreStartupScreen.Build.cs b/UnrealProject/Lost_Edge/Plugins/StartupScreen/Source/PreStartupScreen/PreStartupScreen.Build.cs deleted file mode 100644 index b366fde..0000000 --- a/UnrealProject/Lost_Edge/Plugins/StartupScreen/Source/PreStartupScreen/PreStartupScreen.Build.cs +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:5725b79ae71de50b0f0a4061cb4f4e111dbd28a9134cf27677585b7f0e538872 -size 1329 diff --git a/UnrealProject/Lost_Edge/Plugins/StartupScreen/Source/PreStartupScreen/Private/PreStartupScreenPlayer.cpp b/UnrealProject/Lost_Edge/Plugins/StartupScreen/Source/PreStartupScreen/Private/PreStartupScreenPlayer.cpp deleted file mode 100644 index e0a3ad4..0000000 --- a/UnrealProject/Lost_Edge/Plugins/StartupScreen/Source/PreStartupScreen/Private/PreStartupScreenPlayer.cpp +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:58cf1439cdc82bee447156482474096071bcb0e8613d175cf4d801d1053dbe63 -size 684 diff --git a/UnrealProject/Lost_Edge/Plugins/StartupScreen/Source/PreStartupScreen/Private/PreStartupScreenPlayer.h b/UnrealProject/Lost_Edge/Plugins/StartupScreen/Source/PreStartupScreen/Private/PreStartupScreenPlayer.h deleted file mode 100644 index 7ecd63b..0000000 --- a/UnrealProject/Lost_Edge/Plugins/StartupScreen/Source/PreStartupScreen/Private/PreStartupScreenPlayer.h +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f766d356638ae963e4ebf74868d5dcd0fb94069b4f75ea59b10f8193b0114002 -size 730 diff --git a/UnrealProject/Lost_Edge/Plugins/StartupScreen/Source/PreStartupScreen/Private/PreStartupScreenSettings.h b/UnrealProject/Lost_Edge/Plugins/StartupScreen/Source/PreStartupScreen/Private/PreStartupScreenSettings.h deleted file mode 100644 index e579b18..0000000 --- a/UnrealProject/Lost_Edge/Plugins/StartupScreen/Source/PreStartupScreen/Private/PreStartupScreenSettings.h +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:b29d301e7cae3157d66396b86bd9617c7183f1943aff6e8480cc7f9baad16ef5 -size 599 diff --git a/UnrealProject/Lost_Edge/Plugins/StartupScreen/Source/PreStartupScreen/Private/SPreStartupScreenWidget.cpp b/UnrealProject/Lost_Edge/Plugins/StartupScreen/Source/PreStartupScreen/Private/SPreStartupScreenWidget.cpp deleted file mode 100644 index 9e234d4..0000000 --- a/UnrealProject/Lost_Edge/Plugins/StartupScreen/Source/PreStartupScreen/Private/SPreStartupScreenWidget.cpp +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:eb8264b40e931ae26fe56268a9047099cee92e093c5dd7fd459bed0dd4a27136 -size 666 diff --git a/UnrealProject/Lost_Edge/Plugins/StartupScreen/Source/PreStartupScreen/Private/SPreStartupScreenWidget.h b/UnrealProject/Lost_Edge/Plugins/StartupScreen/Source/PreStartupScreen/Private/SPreStartupScreenWidget.h deleted file mode 100644 index c590b3e..0000000 --- a/UnrealProject/Lost_Edge/Plugins/StartupScreen/Source/PreStartupScreen/Private/SPreStartupScreenWidget.h +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d79d375b95dd55cd427ffdceb6b8b3a6710629f8a752fbe0e13760cf229dd70b -size 354 diff --git a/UnrealProject/Lost_Edge/Plugins/StartupScreen/Source/StartupScreen/Private/SStartupScreenWidget.cpp b/UnrealProject/Lost_Edge/Plugins/StartupScreen/Source/StartupScreen/Private/SStartupScreenWidget.cpp deleted file mode 100644 index f00e5ab..0000000 --- a/UnrealProject/Lost_Edge/Plugins/StartupScreen/Source/StartupScreen/Private/SStartupScreenWidget.cpp +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:cce3ff15a32902d512b13049f568675dc0d7de5746dd9596a87fe99725c45427 -size 1900 diff --git a/UnrealProject/Lost_Edge/Plugins/StartupScreen/Source/StartupScreen/Private/SStartupScreenWidget.h b/UnrealProject/Lost_Edge/Plugins/StartupScreen/Source/StartupScreen/Private/SStartupScreenWidget.h deleted file mode 100644 index 49b5267..0000000 --- a/UnrealProject/Lost_Edge/Plugins/StartupScreen/Source/StartupScreen/Private/SStartupScreenWidget.h +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:52b759b16910ac829cd74a06f64577d44925b063233a834eda0388561ff0c78f -size 610 diff --git a/UnrealProject/Lost_Edge/Plugins/StartupScreen/Source/StartupScreen/Private/StartupScreen.cpp b/UnrealProject/Lost_Edge/Plugins/StartupScreen/Source/StartupScreen/Private/StartupScreen.cpp deleted file mode 100644 index f753b28..0000000 --- a/UnrealProject/Lost_Edge/Plugins/StartupScreen/Source/StartupScreen/Private/StartupScreen.cpp +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:2486ede5d5e958cea074071afa3b0967cfbb0c045774856b3391703d2a089da0 -size 2389 diff --git a/UnrealProject/Lost_Edge/Plugins/StartupScreen/Source/StartupScreen/Private/StartupScreenPlayer.cpp b/UnrealProject/Lost_Edge/Plugins/StartupScreen/Source/StartupScreen/Private/StartupScreenPlayer.cpp deleted file mode 100644 index 29d89f4..0000000 --- a/UnrealProject/Lost_Edge/Plugins/StartupScreen/Source/StartupScreen/Private/StartupScreenPlayer.cpp +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f86db28aeca1b58801e620a9e369573079fb8dfd7d380ffa55635b6b303b29a7 -size 669 diff --git a/UnrealProject/Lost_Edge/Plugins/StartupScreen/Source/StartupScreen/Private/StartupScreenPlayer.h b/UnrealProject/Lost_Edge/Plugins/StartupScreen/Source/StartupScreen/Private/StartupScreenPlayer.h deleted file mode 100644 index a1b4f04..0000000 --- a/UnrealProject/Lost_Edge/Plugins/StartupScreen/Source/StartupScreen/Private/StartupScreenPlayer.h +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:cdc74ad44e44b0e9322a125ecae02eb6d2277770f58d8f8a8382fa3e6c73c425 -size 931 diff --git a/UnrealProject/Lost_Edge/Plugins/StartupScreen/Source/StartupScreen/Private/StartupScreenSettings.h b/UnrealProject/Lost_Edge/Plugins/StartupScreen/Source/StartupScreen/Private/StartupScreenSettings.h deleted file mode 100644 index b47b34a..0000000 --- a/UnrealProject/Lost_Edge/Plugins/StartupScreen/Source/StartupScreen/Private/StartupScreenSettings.h +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:eb9f69d90378713fb9b0e1dda85f8ddd9e7fccdb19e88105d9f3cb5144f0dc76 -size 927 diff --git a/UnrealProject/Lost_Edge/Plugins/StartupScreen/StartupScreen.uplugin b/UnrealProject/Lost_Edge/Plugins/StartupScreen/StartupScreen.uplugin deleted file mode 100644 index 28216fd..0000000 --- a/UnrealProject/Lost_Edge/Plugins/StartupScreen/StartupScreen.uplugin +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:4f7fc6f98da3295374b28037c179a65f31b143aba32417905b344d27e118e252 -size 642 diff --git a/UnrealProject/Lost_Edge/Source/Lost_Edge/Private/CommonFunctions.h b/UnrealProject/Lost_Edge/Source/Lost_Edge/Private/CommonFunctions.h index 01cc6a5..5d04150 100644 --- a/UnrealProject/Lost_Edge/Source/Lost_Edge/Private/CommonFunctions.h +++ b/UnrealProject/Lost_Edge/Source/Lost_Edge/Private/CommonFunctions.h @@ -16,13 +16,13 @@ struct FIntByteView public: UPROPERTY(EditAnywhere, BlueprintReadWrite) - uint8 first; + uint8 first = 0; UPROPERTY(EditAnywhere, BlueprintReadWrite) - uint8 second; + uint8 second = 0; UPROPERTY(EditAnywhere, BlueprintReadWrite) - uint8 third; + uint8 third = 0; UPROPERTY(EditAnywhere, BlueprintReadWrite) - uint8 fourth; + uint8 fourth = 0; static FIntByteView Make(const int32 in); int32 AsInt() const; @@ -70,7 +70,6 @@ public: - UFUNCTION(BlueprintPure, Category = TypeCasts) static FIntByteView MakeIntByteView(const int32 in); UFUNCTION(BlueprintPure) diff --git a/UnrealProject/Lost_Edge/Source/Lost_Edge/Private/GraphicsSettingsHelper.h b/UnrealProject/Lost_Edge/Source/Lost_Edge/Private/GraphicsSettingsHelper.h index 6cae13e..95fa48e 100644 --- a/UnrealProject/Lost_Edge/Source/Lost_Edge/Private/GraphicsSettingsHelper.h +++ b/UnrealProject/Lost_Edge/Source/Lost_Edge/Private/GraphicsSettingsHelper.h @@ -13,7 +13,7 @@ struct FResolutionAndRefreshRates public: UPROPERTY(EditAnywhere, BlueprintReadWrite) - FIntPoint resolution; + FIntPoint resolution = { 0, 0 }; UPROPERTY(EditAnywhere, BlueprintReadWrite) TArray refreshRates; }; diff --git a/UnrealProject/Lost_Edge/Source/Lost_Edge/Private/Interactable/Interactable.h b/UnrealProject/Lost_Edge/Source/Lost_Edge/Private/Interactable/Interactable.h index 868cc8d..8f27ae6 100644 --- a/UnrealProject/Lost_Edge/Source/Lost_Edge/Private/Interactable/Interactable.h +++ b/UnrealProject/Lost_Edge/Source/Lost_Edge/Private/Interactable/Interactable.h @@ -85,7 +85,7 @@ protected: void OnDeactivate(EActivatorType type); /** Mask of active activator types */ - UPROPERTY(EditAnywhere, BlueprintReadWrite, meta = (Bitmask, BitmaskEnum = "EActivatorType")) + UPROPERTY(EditAnywhere, BlueprintReadWrite, meta = (Bitmask, BitmaskEnum = "/Script/Lost_Edge.EActivatorType")) int32 activated = 0; UPROPERTY(EditAnywhere) bool lockOnBeginPlay = false; diff --git a/UnrealProject/Lost_Edge/Source/Lost_Edge/Private/Interactable/Modificators/InteractableModificator.h b/UnrealProject/Lost_Edge/Source/Lost_Edge/Private/Interactable/Modificators/InteractableModificator.h index 3a48246..04be842 100644 --- a/UnrealProject/Lost_Edge/Source/Lost_Edge/Private/Interactable/Modificators/InteractableModificator.h +++ b/UnrealProject/Lost_Edge/Source/Lost_Edge/Private/Interactable/Modificators/InteractableModificator.h @@ -51,7 +51,7 @@ protected: UPROPERTY(EditDefaultsOnly) TArray inputDescription; - UPROPERTY(EditDefaultsOnly, NoClear, meta = (Bitmask, BitmaskEnum = "EActivatorType")) + UPROPERTY(EditDefaultsOnly, NoClear, meta = (Bitmask, BitmaskEnum = "/Script/Lost_Edge.EActivatorType")) int32 activatorTypes = 0; }; diff --git a/UnrealProject/Lost_Edge/Source/Lost_Edge/Private/Minigame/Fishing/FishingManager.h b/UnrealProject/Lost_Edge/Source/Lost_Edge/Private/Minigame/Fishing/FishingManager.h index 5ba2abe..59736f1 100644 --- a/UnrealProject/Lost_Edge/Source/Lost_Edge/Private/Minigame/Fishing/FishingManager.h +++ b/UnrealProject/Lost_Edge/Source/Lost_Edge/Private/Minigame/Fishing/FishingManager.h @@ -12,19 +12,19 @@ struct FFishVariation GENERATED_BODY() UPROPERTY(EditAnywhere, BlueprintReadWrite) - float difficulty; + float difficulty = 1.0f; UPROPERTY(EditAnywhere, BlueprintReadWrite) - float size; + float size = 1.0f; UPROPERTY(EditAnywhere, BlueprintReadWrite) - float duration; + float duration = 1.0f; UPROPERTY(EditAnywhere, BlueprintReadWrite) - int32 price; + int32 price = 100; UPROPERTY(EditAnywhere, BlueprintReadWrite) - FLinearColor color; + FLinearColor color = FLinearColor::Blue; }; UCLASS(Blueprintable, BlueprintType, MinimalAPI) diff --git a/UnrealProject/Lost_Edge/Source/Lost_Edge/Private/PlayerBase.h b/UnrealProject/Lost_Edge/Source/Lost_Edge/Private/PlayerBase.h index a2e44b9..18fecd1 100644 --- a/UnrealProject/Lost_Edge/Source/Lost_Edge/Private/PlayerBase.h +++ b/UnrealProject/Lost_Edge/Source/Lost_Edge/Private/PlayerBase.h @@ -17,17 +17,17 @@ struct FPlayerLock GENERATED_BODY() UPROPERTY(BlueprintReadWrite) - uint8 walk : 1; + uint8 walk : 1 = 0; UPROPERTY(BlueprintReadWrite) - uint8 jump : 1; + uint8 jump : 1 = 0; UPROPERTY(BlueprintReadWrite) - uint8 run : 1; + uint8 run : 1 = 0; UPROPERTY(BlueprintReadWrite) - uint8 interaction : 1; + uint8 interaction : 1 = 0; UPROPERTY(BlueprintReadWrite) - uint8 camera : 1; + uint8 camera : 1 = 0; UPROPERTY(BlueprintReadWrite) - uint8 inventory : 1; + uint8 inventory : 1 = 0; static FPlayerLock All(); };