diff --git a/Images/ImageTitle/old/title1.png b/Images/ImageTitle/old/title1.png index dae2213..517610b 100644 Binary files a/Images/ImageTitle/old/title1.png and b/Images/ImageTitle/old/title1.png differ diff --git a/Images/ImageTitle/old/title2.png b/Images/ImageTitle/old/title2.png index c4d1f42..35b8836 100644 Binary files a/Images/ImageTitle/old/title2.png and b/Images/ImageTitle/old/title2.png differ diff --git a/UnrealProject/Lost_Edge/Config/DefaultGame.ini b/UnrealProject/Lost_Edge/Config/DefaultGame.ini index e77086e..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,3 +131,7 @@ bShouldAcquireMissingChunksOnLoad=False bShouldWarnAboutInvalidAssets=True MetaDataTagsForAssetRegistry=() +[/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/Audio/Sounds/Knock.uasset b/UnrealProject/Lost_Edge/Content/Audio/Sounds/Knock.uasset deleted file mode 100644 index 9bac2eb..0000000 --- a/UnrealProject/Lost_Edge/Content/Audio/Sounds/Knock.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:9fe1f29d2b08e8ab4a89d8fd9ca90fee07045422efc18103ceacd81e499a2e10 -size 1459 diff --git a/UnrealProject/Lost_Edge/Content/Blueprints/BP_CustomGameInstance.uasset b/UnrealProject/Lost_Edge/Content/Blueprints/BP_CustomGameInstance.uasset index 9833752..5412ccc 100644 --- a/UnrealProject/Lost_Edge/Content/Blueprints/BP_CustomGameInstance.uasset +++ b/UnrealProject/Lost_Edge/Content/Blueprints/BP_CustomGameInstance.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9c9c93e846c0b9f7c8ef0d79047da3cda2eb17550062c0bea1fcfa64a4688ecc -size 54469 +oid sha256:accfe3fc1e69419a339db8a54be9396ed6e1c96249be5e96dd0e9b7fcaf39324 +size 52991 diff --git a/UnrealProject/Lost_Edge/Content/Levels/Level_2/Blueprints/BP_Level2_Tree.uasset b/UnrealProject/Lost_Edge/Content/Levels/Level_2/Blueprints/BP_Level2_Tree.uasset index bf91fa6..94728c5 100644 --- a/UnrealProject/Lost_Edge/Content/Levels/Level_2/Blueprints/BP_Level2_Tree.uasset +++ b/UnrealProject/Lost_Edge/Content/Levels/Level_2/Blueprints/BP_Level2_Tree.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:242e7b3d8a80a16a9f5b74f93a28d5dcbd2ccf14fb0821f5cb4f396242a6a511 -size 45071 +oid sha256:875fbf46a52c2ad248739d8456d601e845b78dc08a8ca3b2c9f351c521cb8883 +size 52610 diff --git a/UnrealProject/Lost_Edge/Content/Levels/Level_2/Blueprints/SM_Level2_CrossyRoad.uasset b/UnrealProject/Lost_Edge/Content/Levels/Level_2/Blueprints/SM_Level2_CrossyRoad.uasset deleted file mode 100644 index dee35f6..0000000 --- a/UnrealProject/Lost_Edge/Content/Levels/Level_2/Blueprints/SM_Level2_CrossyRoad.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:32e2f4e2718431ebfc6c7ed89715683f574777bc643abdde224fc103775008f2 -size 2774 diff --git a/UnrealProject/Lost_Edge/Content/Levels/Level_2/Blueprints/SM_Level2_Fishing.uasset b/UnrealProject/Lost_Edge/Content/Levels/Level_2/Blueprints/SM_Level2_Fishing.uasset deleted file mode 100644 index ad307b3..0000000 --- a/UnrealProject/Lost_Edge/Content/Levels/Level_2/Blueprints/SM_Level2_Fishing.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d6745bf6fcfa3161cdf15ad4b308f9bc008a1db07d4a5c4b64b81be71c75f4c4 -size 2705 diff --git a/UnrealProject/Lost_Edge/Content/Levels/Level_2/Blueprints/SM_Level2_RythmClick.uasset b/UnrealProject/Lost_Edge/Content/Levels/Level_2/Blueprints/SM_Level2_RythmClick.uasset deleted file mode 100644 index a696415..0000000 --- a/UnrealProject/Lost_Edge/Content/Levels/Level_2/Blueprints/SM_Level2_RythmClick.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:6407b0d7ae05d0ce97e676bc9acbba5c107dc948c59a700753b4c9474e3398c7 -size 2702 diff --git a/UnrealProject/Lost_Edge/Content/Levels/Level_2/Blueprints/SM_Level2_SubwaySurf.uasset b/UnrealProject/Lost_Edge/Content/Levels/Level_2/Blueprints/SM_Level2_SubwaySurf.uasset deleted file mode 100644 index 9b05d81..0000000 --- a/UnrealProject/Lost_Edge/Content/Levels/Level_2/Blueprints/SM_Level2_SubwaySurf.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:c599d34d32f5f5fa8c40795f5a2b5a60330037923dfbac602ada2b604d1e36e2 -size 2774 diff --git a/UnrealProject/Lost_Edge/Content/Levels/Level_2/Blueprints/SM_Level2_Tree.uasset b/UnrealProject/Lost_Edge/Content/Levels/Level_2/Blueprints/SM_Level2_Tree.uasset deleted file mode 100644 index ba5cab0..0000000 --- a/UnrealProject/Lost_Edge/Content/Levels/Level_2/Blueprints/SM_Level2_Tree.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:15131c28c4abd3d64ce0547e1f00df38864c1a39899c7f8fe46d1a052d27cf9d -size 2636 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..a4b9bd9 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:e9b76bb84eef4e930e0789adb42b5853fd5c024dc483119fbc9fcda93240b564 +size 38742261 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..707bec1 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:1efb0628464ab2d89f9e98cb2ea390c219b90a96cc238a193782cf1444627c1c +size 45709 diff --git a/UnrealProject/Lost_Edge/Content/Levels/Level_2/Sequencers/Seq_Level2_begin.uasset b/UnrealProject/Lost_Edge/Content/Levels/Level_2/Sequencers/Seq_Level2_begin.uasset index 62548f0..951f0d7 100644 --- a/UnrealProject/Lost_Edge/Content/Levels/Level_2/Sequencers/Seq_Level2_begin.uasset +++ b/UnrealProject/Lost_Edge/Content/Levels/Level_2/Sequencers/Seq_Level2_begin.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9fdd9272cfb4a2c9703b1801cc2fe7fa3e6aa0c2f59cbfd50aa3d72224cf0333 -size 19001 +oid sha256:2e01c85451c9b69b3226ae7c88415a41f28768098ebf0f294c8f477bae1b04e2 +size 20916 diff --git a/UnrealProject/Lost_Edge/Content/Levels/Level_3/L_Level3.umap b/UnrealProject/Lost_Edge/Content/Levels/Level_3/L_Level3.umap index 09021ec..e5681fe 100644 --- a/UnrealProject/Lost_Edge/Content/Levels/Level_3/L_Level3.umap +++ b/UnrealProject/Lost_Edge/Content/Levels/Level_3/L_Level3.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:dc8123353f751e03e15ecda6ec7984dffae82055b81ec48cf8dc341b77893108 -size 2404910 +oid sha256:7d3271efaeb1c80fffe888881f52c68cc0c519354b8a4fd870a6a285e09f498a +size 2404056 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/Content/UI/Blueprints/UI_CutsceneSkip.uasset b/UnrealProject/Lost_Edge/Content/UI/Blueprints/UI_CutsceneSkip.uasset index 2b47b5a..a427b4a 100644 --- a/UnrealProject/Lost_Edge/Content/UI/Blueprints/UI_CutsceneSkip.uasset +++ b/UnrealProject/Lost_Edge/Content/UI/Blueprints/UI_CutsceneSkip.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1593e8c6d047caf9a6d150cd1ee3169cfdb72bebe74a7ee7b53e434ce4a2f589 -size 128443 +oid sha256:46a8f5e26eff8288bea6b3c4a81992fa29c5f71a6ad9e4b58dbf997e22a858aa +size 125903 diff --git a/UnrealProject/Lost_Edge/Lost_Edge.uproject b/UnrealProject/Lost_Edge/Lost_Edge.uproject index 12e3b2c..09012ef 100644 --- a/UnrealProject/Lost_Edge/Lost_Edge.uproject +++ b/UnrealProject/Lost_Edge/Lost_Edge.uproject @@ -22,6 +22,11 @@ "AdditionalDependencies": [ "Engine" ] + }, + { + "Name": "Lost_EdgeStyle", + "Type": "Runtime", + "LoadingPhase": "PostConfigInit" } ], "Plugins": [ 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 49a12d6..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:a2ceca7d34685f1e3ffb03d56b91e7db14e362464e6170f2339e2aaef990b3f9 -size 11654 +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 280838b..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:d84ce1c9b70ad8ea489e47222b233d0c6a85a13ed6b4c1fb5517116bef715cf7 -size 2080 +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 8c80cd9..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:792b181d212d99a6a0e39a69b9aa1e0bd59979f0f2281db8ab553e37e3928bfe -size 1005 +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 871a008..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:8c1bd1f012d230b98824baacf4c223f7535e5bcd7256cbb9a04085d9c95f7550 -size 1457 +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/LoadingScreen/Resources/Icon128.png b/UnrealProject/Lost_Edge/Plugins/LoadingScreen/Resources/Icon128.png new file mode 100644 index 0000000..26245f6 --- /dev/null +++ b/UnrealProject/Lost_Edge/Plugins/LoadingScreen/Resources/Icon128.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f7239efaeefbd82de33ebe18518e50de075ea4188a468a9e4991396433d2275f +size 12699 diff --git a/UnrealProject/Lost_Edge/Plugins/LoadingScreen/Resources/Runtime/T_ImageA.png b/UnrealProject/Lost_Edge/Plugins/LoadingScreen/Resources/Runtime/T_ImageA.png new file mode 100644 index 0000000..c7e0c29 --- /dev/null +++ b/UnrealProject/Lost_Edge/Plugins/LoadingScreen/Resources/Runtime/T_ImageA.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d3b9348e879ab500bb2bd7efefbcd10ea6436646f82836b49354eda99675b944 +size 298380 diff --git a/UnrealProject/Lost_Edge/Plugins/LoadingScreen/Resources/Runtime/T_ImageB.png b/UnrealProject/Lost_Edge/Plugins/LoadingScreen/Resources/Runtime/T_ImageB.png new file mode 100644 index 0000000..a52973e --- /dev/null +++ b/UnrealProject/Lost_Edge/Plugins/LoadingScreen/Resources/Runtime/T_ImageB.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4c3c8a99287f49d81b1427b62365b7d76870e6e9df82b6dd07ca5392e72a4f93 +size 319623 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/LoadingScreen/Source/PreStartupScreen/Private/PreStartupScreen.cpp b/UnrealProject/Lost_Edge/Plugins/LoadingScreen/Source/PreStartupScreen/Private/PreStartupScreen.cpp new file mode 100644 index 0000000..f13ca3c --- /dev/null +++ b/UnrealProject/Lost_Edge/Plugins/LoadingScreen/Source/PreStartupScreen/Private/PreStartupScreen.cpp @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f8f1133695352db75624f959c79dfc6615ad95234642a445863395e5582577b5 +size 991 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/LoadingScreen/Source/PreStartupScreen/Public/PreStartupScreen.h b/UnrealProject/Lost_Edge/Plugins/LoadingScreen/Source/PreStartupScreen/Public/PreStartupScreen.h new file mode 100644 index 0000000..873c32c --- /dev/null +++ b/UnrealProject/Lost_Edge/Plugins/LoadingScreen/Source/PreStartupScreen/Public/PreStartupScreen.h @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b4d461f0b9f68948567027a182850ff884f5ea26b770e4bf9acb7d23c0adf602 +size 366 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/LoadingScreen/Source/StartupScreen/Public/StartupScreen.h b/UnrealProject/Lost_Edge/Plugins/LoadingScreen/Source/StartupScreen/Public/StartupScreen.h new file mode 100644 index 0000000..2f37636 --- /dev/null +++ b/UnrealProject/Lost_Edge/Plugins/LoadingScreen/Source/StartupScreen/Public/StartupScreen.h @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b40f0a2d117cff3f259a0244154deb29c8d61c3120afc749b49c05bffb47d9bf +size 604 diff --git a/UnrealProject/Lost_Edge/Plugins/LoadingScreen/Source/StartupScreen/StartupScreen.Build.cs b/UnrealProject/Lost_Edge/Plugins/LoadingScreen/Source/StartupScreen/StartupScreen.Build.cs new file mode 100644 index 0000000..5bddbb4 --- /dev/null +++ b/UnrealProject/Lost_Edge/Plugins/LoadingScreen/Source/StartupScreen/StartupScreen.Build.cs @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:fc3fd0123686d9ef559772a770bb3b64ec43fe07e3ef75c894605e9e47dcb6c6 +size 1517 diff --git a/UnrealProject/Lost_Edge/Source/Lost_Edge.Target.cs b/UnrealProject/Lost_Edge/Source/Lost_Edge.Target.cs index 7ca225a..629010e 100644 --- a/UnrealProject/Lost_Edge/Source/Lost_Edge.Target.cs +++ b/UnrealProject/Lost_Edge/Source/Lost_Edge.Target.cs @@ -2,8 +2,10 @@ using UnrealBuildTool; -public class Lost_EdgeTarget : TargetRules { - public Lost_EdgeTarget(TargetInfo Target) : base(Target) { +public class Lost_EdgeTarget : TargetRules +{ + public Lost_EdgeTarget(TargetInfo Target) : base(Target) + { Type = TargetType.Game; DefaultBuildSettings = BuildSettingsVersion.Latest; IncludeOrderVersion = EngineIncludeOrderVersion.Latest; diff --git a/UnrealProject/Lost_Edge/Source/Lost_Edge/Lost_Edge.Build.cs b/UnrealProject/Lost_Edge/Source/Lost_Edge/Lost_Edge.Build.cs index 40b6071..9e5bb83 100644 --- a/UnrealProject/Lost_Edge/Source/Lost_Edge/Lost_Edge.Build.cs +++ b/UnrealProject/Lost_Edge/Source/Lost_Edge/Lost_Edge.Build.cs @@ -12,7 +12,7 @@ public class Lost_Edge : ModuleRules PublicDependencyModuleNames.AddRange(new string[] { "Core", "CoreUObject", "Engine", "InputCore", "OpenCV" }); PrivateDependencyModuleNames.AddRange(new string[] { "EnhancedInput", "UMG", "RHI", "RenderCore", "Lost_EdgeShaders", "PakFile", //"TextureCompressor", - "LevelSequence", "MovieScene", "HTTP", "Json", "ApplicationCore", "ProceduralMeshComponent", "Landscape", }); // "Slate", "SlateCore" + "LevelSequence", "MovieScene", "HTTP", "Json", "ApplicationCore", "ProceduralMeshComponent", "Landscape" }); if (Target.bBuildEditor) { diff --git a/UnrealProject/Lost_Edge/Source/Lost_Edge/Lost_EdgeGameModeBase.cpp b/UnrealProject/Lost_Edge/Source/Lost_Edge/Lost_EdgeGameModeBase.cpp deleted file mode 100644 index f131c28..0000000 --- a/UnrealProject/Lost_Edge/Source/Lost_Edge/Lost_EdgeGameModeBase.cpp +++ /dev/null @@ -1,4 +0,0 @@ -// Copyright Epic Games, Inc. All Rights Reserved. - -#include "Lost_EdgeGameModeBase.h" - diff --git a/UnrealProject/Lost_Edge/Source/Lost_Edge/Lost_EdgeGameModeBase.h b/UnrealProject/Lost_Edge/Source/Lost_Edge/Lost_EdgeGameModeBase.h deleted file mode 100644 index 1f1065d..0000000 --- a/UnrealProject/Lost_Edge/Source/Lost_Edge/Lost_EdgeGameModeBase.h +++ /dev/null @@ -1,17 +0,0 @@ -// Copyright Epic Games, Inc. All Rights Reserved. - -#pragma once - -#include "CoreMinimal.h" -#include "GameFramework/GameModeBase.h" -#include "Lost_EdgeGameModeBase.generated.h" - -/** - * - */ -UCLASS() -class LOST_EDGE_API ALost_EdgeGameModeBase : public AGameModeBase -{ - GENERATED_BODY() - -}; 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/ContentLoader.cpp b/UnrealProject/Lost_Edge/Source/Lost_Edge/Private/ContentLoader.cpp index 7e56715..8f9040c 100644 --- a/UnrealProject/Lost_Edge/Source/Lost_Edge/Private/ContentLoader.cpp +++ b/UnrealProject/Lost_Edge/Source/Lost_Edge/Private/ContentLoader.cpp @@ -24,7 +24,7 @@ namespace const auto pakFileSavePath = FString::Printf(TEXT("%sDownloaded/"), *FPaths::ProjectDir()); } -void UContentLoader::BeginDestroy() +void UContentLoader::Deinitialize() { //if(mountedFiles.Num() > 0) //{ @@ -34,7 +34,7 @@ void UContentLoader::BeginDestroy() // FPlatformFileManager::Get().RemovePlatformFile(GetPakPlatformFile()); //} - UObject::BeginDestroy(); + Super::Deinitialize(); } void UContentLoader::HttpGet(const FString& url, FHttpRequestCompleteDelegate requestCompleteCallback) diff --git a/UnrealProject/Lost_Edge/Source/Lost_Edge/Private/ContentLoader.h b/UnrealProject/Lost_Edge/Source/Lost_Edge/Private/ContentLoader.h index ba774d9..50e9dae 100644 --- a/UnrealProject/Lost_Edge/Source/Lost_Edge/Private/ContentLoader.h +++ b/UnrealProject/Lost_Edge/Source/Lost_Edge/Private/ContentLoader.h @@ -3,7 +3,7 @@ #pragma once #include "Http.h" -#include "UObject/Object.h" +#include "Subsystems/GameInstanceSubsystem.h" #include "ContentLoader.generated.h" @@ -21,7 +21,7 @@ DECLARE_DYNAMIC_DELEGATE_OneParam(FContentDownloadedCallback, FString, pakFilePa * High language wrapper for Paks(Assets) download and loading. */ UCLASS(BlueprintType) -class UContentLoader : public UObject +class UContentLoader : public UGameInstanceSubsystem { GENERATED_BODY() @@ -36,7 +36,7 @@ public: bool UnloadPak(const FString& pakFilePath); protected: - virtual void BeginDestroy() override; + virtual void Deinitialize() override; /** Sends http get request */ void HttpGet(const FString& url, FHttpRequestCompleteDelegate requestCompleteCallback); diff --git a/UnrealProject/Lost_Edge/Source/Lost_Edge/Private/CustomGameInstance.cpp b/UnrealProject/Lost_Edge/Source/Lost_Edge/Private/CustomGameInstance.cpp index 60769f0..8c97f6a 100644 --- a/UnrealProject/Lost_Edge/Source/Lost_Edge/Private/CustomGameInstance.cpp +++ b/UnrealProject/Lost_Edge/Source/Lost_Edge/Private/CustomGameInstance.cpp @@ -21,11 +21,11 @@ UCustomGameInstance* UCustomGameInstance::instance = nullptr; void UCustomGameInstance::Init() { + // init game instance UGameInstance::Init(); - instance = this; - contentLoader = NewObject(this); + // setup global singletons for(auto& _class : globalInstancesClasses) { UObject* gi = NewObject(_class); @@ -34,10 +34,19 @@ void UCustomGameInstance::Init() } globalInstancesClasses.Empty(); + // set current save if(auto save = UGameplayStatics::LoadGameFromSlot(saveName, saveIndex)) saveData = Cast(save); else saveData = Cast(UGameplayStatics::CreateSaveGameObject(USaveData::StaticClass())); + + //FCoreUObjectDelegates::PreLoadMap.AddLambda([&](const FString& mapName) + // { + // if(auto loadingScreen = FModuleManager::LoadModulePtr("LoadingScreen")) + // loadingScreen->StartLoadingScreen(); + // }); + + //FCoreUObjectDelegates::PostLoadMapWithWorld.AddLambda(loadingScreen, &ULoadingScreen::EndLoadingScreen); } void UCustomGameInstance::Shutdown() @@ -56,7 +65,7 @@ UCustomGameInstance* UCustomGameInstance::Get() UContentLoader* UCustomGameInstance::GetContentLoader() { if(auto GI = Get()) - return GI->contentLoader; + return GI->GetSubsystem(); return nullptr; } diff --git a/UnrealProject/Lost_Edge/Source/Lost_Edge/Private/CustomGameInstance.h b/UnrealProject/Lost_Edge/Source/Lost_Edge/Private/CustomGameInstance.h index d2cd197..28f820b 100644 --- a/UnrealProject/Lost_Edge/Source/Lost_Edge/Private/CustomGameInstance.h +++ b/UnrealProject/Lost_Edge/Source/Lost_Edge/Private/CustomGameInstance.h @@ -25,7 +25,7 @@ public: UFUNCTION(BlueprintPure, meta = (DisplayName = "Get Custom Game Instance")) static UCustomGameInstance* Get(); - UFUNCTION(BlueprintPure) + UFUNCTION(BlueprintPure, meta = (DeprecatedFunction, DeprecationMessage = "Use original Get Submodule pure function instead.")) static class UContentLoader* GetContentLoader(); UFUNCTION(BlueprintPure) static UObject* GetGlobalInstance(UClass* _class); @@ -50,9 +50,6 @@ public: class USaveData* saveData = nullptr; protected: - UPROPERTY() - class UContentLoader* contentLoader; - UPROPERTY(EditDefaultsOnly) TSet> globalInstancesClasses; TMap globalInstances; diff --git a/UnrealProject/Lost_Edge/Source/Lost_Edge/Private/CutsceneManager.cpp b/UnrealProject/Lost_Edge/Source/Lost_Edge/Private/CutsceneManager.cpp index 076716b..effbed2 100644 --- a/UnrealProject/Lost_Edge/Source/Lost_Edge/Private/CutsceneManager.cpp +++ b/UnrealProject/Lost_Edge/Source/Lost_Edge/Private/CutsceneManager.cpp @@ -159,7 +159,6 @@ void UCutsceneManager::OnFirstCutsceneInit() // most first sequence, so widgets static FSkipCutsceneDelegate skipCutsceneDelegate; if(!skipCutsceneDelegate.IsBound()) skipCutsceneDelegate.BindDynamic(this, &UCutsceneManager::SkipSequence); - WM->AnimateCutsceneWidget(EInputAnimatedWidgetAnimation::Reset); WM->EnableCutsceneWidget(skipCutsceneDelegate); } } 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(); }; diff --git a/UnrealProject/Lost_Edge/Source/Lost_Edge/Private/Widgets/CutsceneSkipWidget.cpp b/UnrealProject/Lost_Edge/Source/Lost_Edge/Private/Widgets/CutsceneSkipWidget.cpp index 5e36fbb..7b54bed 100644 --- a/UnrealProject/Lost_Edge/Source/Lost_Edge/Private/Widgets/CutsceneSkipWidget.cpp +++ b/UnrealProject/Lost_Edge/Source/Lost_Edge/Private/Widgets/CutsceneSkipWidget.cpp @@ -4,5 +4,6 @@ void UCutsceneSkipWidget::SetVisibility(ESlateVisibility InVisibility) { if(InVisibility == ESlateVisibility::Hidden) RunAnimation(EInputAnimatedWidgetAnimation::Reset); + PlayAnimation(unHide, 0.0f, 1, (InVisibility == ESlateVisibility::Visible ? EUMGSequencePlayMode::Forward : EUMGSequencePlayMode::Reverse)); Super::SetVisibility(InVisibility); } diff --git a/UnrealProject/Lost_Edge/Source/Lost_Edge/Private/Widgets/CutsceneSkipWidget.h b/UnrealProject/Lost_Edge/Source/Lost_Edge/Private/Widgets/CutsceneSkipWidget.h index 57725b5..92893f2 100644 --- a/UnrealProject/Lost_Edge/Source/Lost_Edge/Private/Widgets/CutsceneSkipWidget.h +++ b/UnrealProject/Lost_Edge/Source/Lost_Edge/Private/Widgets/CutsceneSkipWidget.h @@ -22,6 +22,9 @@ public: UPROPERTY(meta = (BindWidget)) class UTextBlock* keyText; + UPROPERTY(Transient, meta = (BindWidgetAnim)) + class UWidgetAnimation* unHide; + protected: UFUNCTION(BlueprintCallable) void SkipCutscene() { skipCutsceneDelegate.Execute(); } diff --git a/UnrealProject/Lost_Edge/Source/Lost_EdgeEditor.Target.cs b/UnrealProject/Lost_Edge/Source/Lost_EdgeEditor.Target.cs index 49b23a9..df60e44 100644 --- a/UnrealProject/Lost_Edge/Source/Lost_EdgeEditor.Target.cs +++ b/UnrealProject/Lost_Edge/Source/Lost_EdgeEditor.Target.cs @@ -2,8 +2,10 @@ using UnrealBuildTool; -public class Lost_EdgeEditorTarget : TargetRules { - public Lost_EdgeEditorTarget(TargetInfo Target) : base(Target) { +public class Lost_EdgeEditorTarget : TargetRules +{ + public Lost_EdgeEditorTarget(TargetInfo Target) : base(Target) + { Type = TargetType.Editor; DefaultBuildSettings = BuildSettingsVersion.Latest; IncludeOrderVersion = EngineIncludeOrderVersion.Latest; diff --git a/UnrealProject/Lost_Edge/Source/Lost_EdgeShaders/Lost_EdgeShaders.Build.cs b/UnrealProject/Lost_Edge/Source/Lost_EdgeShaders/Lost_EdgeShaders.Build.cs index dfe2864..26b7416 100644 --- a/UnrealProject/Lost_Edge/Source/Lost_EdgeShaders/Lost_EdgeShaders.Build.cs +++ b/UnrealProject/Lost_Edge/Source/Lost_EdgeShaders/Lost_EdgeShaders.Build.cs @@ -1,13 +1,14 @@ // Oleg Petruny proprietary. +using System.IO; using UnrealBuildTool; public class Lost_EdgeShaders : ModuleRules { public Lost_EdgeShaders(ReadOnlyTargetRules Target) : base(Target) { - //bPrecompile = true; - //bUsePrecompiled = true; + //if (File.Exists($"{PlatformDirectory.FullName}\\..\\..\\Intermediate\\Build\\Win64\\x64\\UnrealEditor\\DebugGame\\{Path.GetFileName(PlatformDirectory.FullName)}\\UnrealEditor-{Path.GetFileName(PlatformDirectory.FullName)}-Win64-DebugGame.lib")) + // bUsePrecompiled = true; PCHUsage = PCHUsageMode.UseExplicitOrSharedPCHs; PublicDependencyModuleNames.AddRange(new string[] { }); PrivateDependencyModuleNames.AddRange(new string[] { "Core", diff --git a/UnrealProject/Lost_Edge/Source/Lost_EdgeStyle/Lost_EdgeStyle.Build.cs b/UnrealProject/Lost_Edge/Source/Lost_EdgeStyle/Lost_EdgeStyle.Build.cs new file mode 100644 index 0000000..22e46ad --- /dev/null +++ b/UnrealProject/Lost_Edge/Source/Lost_EdgeStyle/Lost_EdgeStyle.Build.cs @@ -0,0 +1,23 @@ +// Oleg Petruny proprietary. + +using System; +using System.IO; +using System.Reflection; +using UnrealBuildTool; + +public class Lost_EdgeStyle : ModuleRules +{ + public Lost_EdgeStyle(ReadOnlyTargetRules Target) : base(Target) + { + //if (File.Exists($"{PlatformDirectory.FullName}\\..\\..\\Intermediate\\Build\\Win64\\x64\\UnrealEditor\\DebugGame\\{Path.GetFileName(PlatformDirectory.FullName)}\\UnrealEditor-{Path.GetFileName(PlatformDirectory.FullName)}-Win64-DebugGame.lib")) + // bUsePrecompiled = true; + PCHUsage = PCHUsageMode.UseExplicitOrSharedPCHs; + PublicDependencyModuleNames.AddRange(new string[] { }); + PrivateDependencyModuleNames.AddRange(new string[] { + "Core", + "CoreUObject", + "Slate", + "SlateCore" + }); + } +} diff --git a/UnrealProject/Lost_Edge/Source/Lost_EdgeStyle/Private/Lost_EdgeStyle.cpp b/UnrealProject/Lost_Edge/Source/Lost_EdgeStyle/Private/Lost_EdgeStyle.cpp new file mode 100644 index 0000000..96e911d --- /dev/null +++ b/UnrealProject/Lost_Edge/Source/Lost_EdgeStyle/Private/Lost_EdgeStyle.cpp @@ -0,0 +1,48 @@ +// Oleg Petruny proprietary. + +#include "Lost_EdgeStyle.h" + +#include "Styling/SlateStyleRegistry.h" + +TUniquePtr FLost_EdgeStyle::style = nullptr; + +void FLost_EdgeStyle::StartupModule() +{ + if(style.IsValid()) + return; + + style = MakeUnique(GetStyleSetName()); + + style->Set(TEXT("BackgroundBlack"), FLinearColor(0.01f, 0.01f, 0.01f, 0)); + style->Set(TEXT("BackgroundBlack"), FSlateColor(style->GetColor(TEXT("BackgroundBlack")))); + style->Set(TEXT("BackgroundBlack"), new FSlateColorBrush(style->GetColor(TEXT("BackgroundBlack")))); + + FSlateStyleRegistry::RegisterSlateStyle(Get()); +} + +void FLost_EdgeStyle::ShutdownModule() +{ + if(!style.IsValid()) + return; + + FSlateStyleRegistry::UnRegisterSlateStyle(Get()); + style.Reset(); +} + +bool FLost_EdgeStyle::IsGameModule() const +{ + return true; +} + +const ISlateStyle& FLost_EdgeStyle::Get() +{ + return *style.Get(); +} + +FName FLost_EdgeStyle::GetStyleSetName() +{ + static const FName name(TEXT("Lost_EdgeStyle")); + return name; +} + +IMPLEMENT_GAME_MODULE(FLost_EdgeStyle, Lost_EdgeStyle); \ No newline at end of file diff --git a/UnrealProject/Lost_Edge/Source/Lost_EdgeStyle/Public/Lost_EdgeStyle.h b/UnrealProject/Lost_Edge/Source/Lost_EdgeStyle/Public/Lost_EdgeStyle.h new file mode 100644 index 0000000..b4d8d20 --- /dev/null +++ b/UnrealProject/Lost_Edge/Source/Lost_EdgeStyle/Public/Lost_EdgeStyle.h @@ -0,0 +1,21 @@ +// Oleg Petruny proprietary. + +#pragma once + +#include "Modules/ModuleInterface.h" +#include "Styling/SlateStyle.h" + +class LOST_EDGESTYLE_API FLost_EdgeStyle : public IModuleInterface +{ +public: + virtual void StartupModule() override; + virtual void ShutdownModule() override; + virtual bool IsGameModule() const override; + + static const ISlateStyle& Get(); + static FName GetStyleSetName(); + +private: + static TUniquePtr style; + +};