From eaff75b65242de415bf8dbf5032f8046adb374a0 Mon Sep 17 00:00:00 2001 From: Oleg Petruny Date: Fri, 11 Jul 2025 00:01:19 +0200 Subject: [PATCH] Bugfixes and review --- Audio/Sounds/source.txt | 2 + .../Lost_Edge/Config/DefaultGame.ini | 8 ++++ .../Config/DefaultGameUserSettings.ini | 2 + .../Blueprints/BP_InWorlTextLine.uasset | 4 +- .../Blueprints/Characters/BP_Player.uasset | 4 +- .../BP_StealthGuardAIController.uasset | 4 +- .../BP_Minigame_CrossyRoadManager.uasset | 4 +- .../BP_Minigame_RythmClickManager.uasset | 4 +- .../BP_Minigame_SubwaySurfManager.uasset | 4 +- .../Content/Input/Actions/IA_OpenMenu.uasset | 4 +- .../BP_TriggerBoxScene3Teleport.uasset | 3 ++ .../Blueprints/BP_TriggerBoxScene4_End.uasset | 4 +- .../Level_1/Blueprints/BP_candle.uasset | 4 +- .../Lights/BP_LightFlickering.uasset | 4 +- .../Content/Levels/Level_1/L_Level1.umap | 4 +- .../Levels/Level_1/L_Level1_BuiltData.uasset | 4 +- ...MI_Level1_TechnicalRoom_BlinkCandle.uasset | 3 ++ .../Level_2/Blueprints/BP_Level2_Tree.uasset | 4 +- .../Content/Levels/Level_2/L_Level2.umap | 4 +- .../Level_2/Materials/PurpleMetal.uasset | 4 +- .../Content/Levels/Level_3/L_Level3.umap | 4 +- .../MI_Level3_TechnicalRoom_BlinkSiren.uasset | 4 +- .../Level_3/Other/GC_Level3_GlassWall.uasset | 4 +- .../Content/Levels/Level_4/L_Level4.umap | 4 +- .../Blueprints/BP_Level5_ExitGame.uasset | 3 ++ .../Blueprints/BP_Level5_LoadTestLevel.uasset | 3 ++ .../BP_Level5_LoadTestLevelTrigger.uasset | 3 ++ .../Content/Levels/Level_5/L_Level5.umap | 4 +- .../Levels/Level_5/L_Level5_BuiltData.uasset | 3 ++ .../Lost_Edge/Content/Levels/Test/L_Test.umap | 4 +- .../Levels/Test/L_Test_BuiltData.uasset | 4 +- .../MaterialsLibrary/M_BlinkColor.uasset | 4 +- .../Content/MaterialsLibrary/M_Moss4.uasset | 4 +- .../MaterialsLibrary/M_Wireframe.uasset | 4 +- .../Characters/Human/BPA_HumanPlayer.uasset | 4 +- .../Materials/M_LaptopColor.uasset | 4 +- .../Materials/M_LaptopKeyboard.uasset | 4 +- .../Materials/M_LaptopScreen.uasset | 4 +- .../LowPolyOffice/Materials/M_MugColor.uasset | 4 +- .../Classes/UICC_MainMenu_Page.uasset | 4 +- .../Pages/UI_MainMenu_Page_Credits.uasset | 4 +- .../Pages/UI_MainMenu_Page_Home.uasset | 4 +- .../Pages/UI_MainMenu_Page_Options.uasset | 4 +- .../UI_MainMenu_Page_Options_Audio.uasset | 4 +- .../UI_MainMenu_Page_Options_Game.uasset | 4 +- .../UI_MainMenu_Page_Options_Graphics.uasset | 4 +- .../MainMenu/ST_MainMenu_Credits.uasset | 4 +- .../UI/Blueprints/MainMenu/UI_MainMenu.uasset | 4 +- .../UI_QuickTimeEventMultiPress.uasset | 4 +- .../Content/UI/Blueprints/UI_CheatMenu.uasset | 4 +- .../Content/UI/Blueprints/UI_Journal.uasset | 4 +- .../Content/UI/Blueprints/UI_TextLine.uasset | 4 +- .../Content/UI/Components/UIC_ComboBox.uasset | 4 +- .../Lost_Edge/Private/CommonFunctions.cpp | 11 +++++ .../Lost_Edge/Private/CommonFunctions.h | 2 + .../Lost_Edge/Private/CustomGameInstance.cpp | 14 +++--- .../Private/GraphicsSettingsHelper.cpp | 15 ++++--- .../Lost_Edge/Private/Levels/Level1.cpp | 8 +++- .../Lost_Edge/Private/Levels/Level2.cpp | 5 +++ .../Lost_Edge/Private/Levels/Level3.cpp | 6 ++- .../Lost_Edge/Private/Levels/LevelBase.cpp | 43 +++++++++++-------- .../Lost_Edge/Private/Minigame/Minigame.cpp | 8 ++++ .../Lost_Edge/Private/Minigame/Minigame.h | 2 + .../Source/Lost_Edge/Private/PlayerBase.cpp | 25 +---------- .../Widgets/MainMenu/MainMenuWidget.cpp | 24 +++++++++++ .../Private/Widgets/MainMenu/MainMenuWidget.h | 6 +++ .../Private/Widgets/WidgetsManager.cpp | 28 ++++++++++++ .../Private/Widgets/WidgetsManager.h | 3 ++ 68 files changed, 257 insertions(+), 149 deletions(-) create mode 100644 UnrealProject/Lost_Edge/Content/Levels/Level_1/Blueprints/BP_TriggerBoxScene3Teleport.uasset create mode 100644 UnrealProject/Lost_Edge/Content/Levels/Level_1/Materials/MI_Level1_TechnicalRoom_BlinkCandle.uasset create mode 100644 UnrealProject/Lost_Edge/Content/Levels/Level_5/Blueprints/BP_Level5_ExitGame.uasset create mode 100644 UnrealProject/Lost_Edge/Content/Levels/Level_5/Blueprints/BP_Level5_LoadTestLevel.uasset create mode 100644 UnrealProject/Lost_Edge/Content/Levels/Level_5/Blueprints/BP_Level5_LoadTestLevelTrigger.uasset create mode 100644 UnrealProject/Lost_Edge/Content/Levels/Level_5/L_Level5_BuiltData.uasset diff --git a/Audio/Sounds/source.txt b/Audio/Sounds/source.txt index 7966ed6..65d1fec 100644 --- a/Audio/Sounds/source.txt +++ b/Audio/Sounds/source.txt @@ -1,3 +1,5 @@ +All sounds are liecesed under [CC0](https://creativecommons.org/publicdomain/zero/1.0/) when was downloaded. + Click - https://freesound.org/people/ccr_fs/sounds/484719/ ElectricTransform - https://freesound.org/people/ShahruhAudio/sounds/336881/ ElectricZap - https://freesound.org/people/egomassive/sounds/536741/ diff --git a/UnrealProject/Lost_Edge/Config/DefaultGame.ini b/UnrealProject/Lost_Edge/Config/DefaultGame.ini index 528ef25..2ef8df0 100644 --- a/UnrealProject/Lost_Edge/Config/DefaultGame.ini +++ b/UnrealProject/Lost_Edge/Config/DefaultGame.ini @@ -62,10 +62,13 @@ InternationalizationPreset=English LocalizationTargetCatchAllChunkId=0 bCookAll=False bCookMapsOnly=False +bTreatWarningsAsErrorsOnCook=False bSkipEditorContent=True bSkipMovies=False -IniKeyDenylist=KeyStorePassword -IniKeyDenylist=KeyPassword +-IniKeyDenylist=DebugKeyStorePassword +-IniKeyDenylist=DebugKeyPassword -IniKeyDenylist=rsa.privateexp -IniKeyDenylist=rsa.modulus -IniKeyDenylist=rsa.publicexp @@ -81,6 +84,8 @@ bSkipMovies=False -IniKeyDenylist=MobileProvision -IniKeyDenylist=IniKeyDenylist -IniKeyDenylist=IniSectionDenylist ++IniKeyDenylist=DebugKeyStorePassword ++IniKeyDenylist=DebugKeyPassword +IniKeyDenylist=KeyStorePassword +IniKeyDenylist=KeyPassword +IniKeyDenylist=rsa.privateexp @@ -100,6 +105,8 @@ bSkipMovies=False +IniKeyDenylist=IniSectionDenylist -IniSectionDenylist=HordeStorageServers -IniSectionDenylist=StorageServers +-IniSectionDenylist=/Script/AndroidFileServerEditor.AndroidFileServerRuntimeSettings ++IniSectionDenylist=/Script/AndroidFileServerEditor.AndroidFileServerRuntimeSettings +IniSectionDenylist=HordeStorageServers +IniSectionDenylist=StorageServers +DirectoriesToAlwaysCook=(Path="/Game/Misc/Interactables") @@ -115,6 +122,7 @@ bSkipMovies=False +DirectoriesToAlwaysCook=(Path="/Game/Audio/FMOD/Reverbs") +DirectoriesToAlwaysCook=(Path="/Game/Audio/FMOD/Snapshots") +DirectoriesToAlwaysCook=(Path="/Game/Audio/FMOD/VCAs") ++DirectoriesToAlwaysCook=(Path="/NNEDenoiser") +DirectoriesToAlwaysStageAsNonUFS=(Path="Audio/FMOD/Desktop") bRetainStagedDirectory=False CustomStageCopyHandler= diff --git a/UnrealProject/Lost_Edge/Config/DefaultGameUserSettings.ini b/UnrealProject/Lost_Edge/Config/DefaultGameUserSettings.ini index 0b9dddb..d9f51a0 100644 --- a/UnrealProject/Lost_Edge/Config/DefaultGameUserSettings.ini +++ b/UnrealProject/Lost_Edge/Config/DefaultGameUserSettings.ini @@ -37,3 +37,5 @@ HDRDisplayOutputNits=1000 [/Script/Engine.GameUserSettings] bUseDesiredScreenHeight=False +[ScalabilityGroups] +sg.ResolutionQuality=100 diff --git a/UnrealProject/Lost_Edge/Content/Blueprints/BP_InWorlTextLine.uasset b/UnrealProject/Lost_Edge/Content/Blueprints/BP_InWorlTextLine.uasset index c98bc00..21dc311 100644 --- a/UnrealProject/Lost_Edge/Content/Blueprints/BP_InWorlTextLine.uasset +++ b/UnrealProject/Lost_Edge/Content/Blueprints/BP_InWorlTextLine.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:dc90497aa1206439959e0847752a4f22be51b20bf8a575516fbfcb2605220aac -size 40946 +oid sha256:b0ea4525ec383541ebbd7014a68721235a12b7aa4f53ed095839d432503121be +size 43708 diff --git a/UnrealProject/Lost_Edge/Content/Blueprints/Characters/BP_Player.uasset b/UnrealProject/Lost_Edge/Content/Blueprints/Characters/BP_Player.uasset index 16be0ba..3ec353b 100644 --- a/UnrealProject/Lost_Edge/Content/Blueprints/Characters/BP_Player.uasset +++ b/UnrealProject/Lost_Edge/Content/Blueprints/Characters/BP_Player.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d5ab9ac887ac3ffc32d57192270ac1b8e6328d590b7a4e8a589145137efa6bea -size 447199 +oid sha256:bf11e58a579c1b7d42efc63570f6c4853d6d088824d93359146a81c3054d6c29 +size 447196 diff --git a/UnrealProject/Lost_Edge/Content/Blueprints/Characters/StealthGuard/BP_StealthGuardAIController.uasset b/UnrealProject/Lost_Edge/Content/Blueprints/Characters/StealthGuard/BP_StealthGuardAIController.uasset index 1c448f2..c9af451 100644 --- a/UnrealProject/Lost_Edge/Content/Blueprints/Characters/StealthGuard/BP_StealthGuardAIController.uasset +++ b/UnrealProject/Lost_Edge/Content/Blueprints/Characters/StealthGuard/BP_StealthGuardAIController.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c4364a4eab2a5909e0e81c881bdef654beda07425fa54b0f75ece5aeae20fba0 -size 92552 +oid sha256:4e83a0874b6366795a963b4907b5f2e5c41446c730675f3c140fc1799bc4d53f +size 97781 diff --git a/UnrealProject/Lost_Edge/Content/Blueprints/Minigames/CrossyRoad/BP_Minigame_CrossyRoadManager.uasset b/UnrealProject/Lost_Edge/Content/Blueprints/Minigames/CrossyRoad/BP_Minigame_CrossyRoadManager.uasset index cee6485..43ded9b 100644 --- a/UnrealProject/Lost_Edge/Content/Blueprints/Minigames/CrossyRoad/BP_Minigame_CrossyRoadManager.uasset +++ b/UnrealProject/Lost_Edge/Content/Blueprints/Minigames/CrossyRoad/BP_Minigame_CrossyRoadManager.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f365881f19ad38551595f5f50bf9efa87fb272f54bb889a446ef4387b4dfccd4 -size 74058 +oid sha256:eeb6bd175395792a5075f625b73383da48fb9d27d330de7b4daad372de0c90a5 +size 82898 diff --git a/UnrealProject/Lost_Edge/Content/Blueprints/Minigames/RythmClick/BP_Minigame_RythmClickManager.uasset b/UnrealProject/Lost_Edge/Content/Blueprints/Minigames/RythmClick/BP_Minigame_RythmClickManager.uasset index 12c3ffc..56c95f6 100644 --- a/UnrealProject/Lost_Edge/Content/Blueprints/Minigames/RythmClick/BP_Minigame_RythmClickManager.uasset +++ b/UnrealProject/Lost_Edge/Content/Blueprints/Minigames/RythmClick/BP_Minigame_RythmClickManager.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:436ac7d8cc671cda0b46ac1d948d45b536c18d3570b849f708b495a54fe31880 -size 68230 +oid sha256:c51ceabc0968d40bfbbde7c6db69c6f0091995fa3694deefd787b94d11b180f8 +size 68662 diff --git a/UnrealProject/Lost_Edge/Content/Blueprints/Minigames/SubwaySurf/BP_Minigame_SubwaySurfManager.uasset b/UnrealProject/Lost_Edge/Content/Blueprints/Minigames/SubwaySurf/BP_Minigame_SubwaySurfManager.uasset index 2af808c..31a4d56 100644 --- a/UnrealProject/Lost_Edge/Content/Blueprints/Minigames/SubwaySurf/BP_Minigame_SubwaySurfManager.uasset +++ b/UnrealProject/Lost_Edge/Content/Blueprints/Minigames/SubwaySurf/BP_Minigame_SubwaySurfManager.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ab747a21559e473f55a8ba69f0b1343e3bd6b8dbd5083dabd862d5f8e4f54477 -size 57999 +oid sha256:5fcd62dcc528b62e34279849527f22477b4b49771b63a1280854fadb60881c98 +size 66485 diff --git a/UnrealProject/Lost_Edge/Content/Input/Actions/IA_OpenMenu.uasset b/UnrealProject/Lost_Edge/Content/Input/Actions/IA_OpenMenu.uasset index 1c9ec45..3926a9a 100644 --- a/UnrealProject/Lost_Edge/Content/Input/Actions/IA_OpenMenu.uasset +++ b/UnrealProject/Lost_Edge/Content/Input/Actions/IA_OpenMenu.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7307aa0e167c8675ff50adae812d1b3acec7323887089d4e3056e70b97a4aab4 -size 1956 +oid sha256:d82cfbf1f6fd45a8546e6950af77495fdb979cc00bf879cb8830a653b69118c0 +size 2008 diff --git a/UnrealProject/Lost_Edge/Content/Levels/Level_1/Blueprints/BP_TriggerBoxScene3Teleport.uasset b/UnrealProject/Lost_Edge/Content/Levels/Level_1/Blueprints/BP_TriggerBoxScene3Teleport.uasset new file mode 100644 index 0000000..47e9855 --- /dev/null +++ b/UnrealProject/Lost_Edge/Content/Levels/Level_1/Blueprints/BP_TriggerBoxScene3Teleport.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:621d78f64a6db7d5988b5b494601c7414a4b9b100f24ac75f12683e72b7c1875 +size 37116 diff --git a/UnrealProject/Lost_Edge/Content/Levels/Level_1/Blueprints/BP_TriggerBoxScene4_End.uasset b/UnrealProject/Lost_Edge/Content/Levels/Level_1/Blueprints/BP_TriggerBoxScene4_End.uasset index 36a3e37..cad7cc4 100644 --- a/UnrealProject/Lost_Edge/Content/Levels/Level_1/Blueprints/BP_TriggerBoxScene4_End.uasset +++ b/UnrealProject/Lost_Edge/Content/Levels/Level_1/Blueprints/BP_TriggerBoxScene4_End.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4465a067aaed50e8a33dec88335d4a4d4334f4d0a4ca74171d7c3bea19a10824 -size 40428 +oid sha256:75dda5bf2440540543258be6ef910d74f9242c28a53bffedb9b3a4070d120cfe +size 40550 diff --git a/UnrealProject/Lost_Edge/Content/Levels/Level_1/Blueprints/BP_candle.uasset b/UnrealProject/Lost_Edge/Content/Levels/Level_1/Blueprints/BP_candle.uasset index 5a2e13f..d527e88 100644 --- a/UnrealProject/Lost_Edge/Content/Levels/Level_1/Blueprints/BP_candle.uasset +++ b/UnrealProject/Lost_Edge/Content/Levels/Level_1/Blueprints/BP_candle.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:df8fb1e696cba84340325ea58e96379dd25989d9641c62621767b3983fdb5c6c -size 32787 +oid sha256:9a8ad3ebbc22edae1a47d22a17be57a266eb3a480fb41db141998ed54e1161d8 +size 35362 diff --git a/UnrealProject/Lost_Edge/Content/Levels/Level_1/Blueprints/Lights/BP_LightFlickering.uasset b/UnrealProject/Lost_Edge/Content/Levels/Level_1/Blueprints/Lights/BP_LightFlickering.uasset index 467ea8a..85e243f 100644 --- a/UnrealProject/Lost_Edge/Content/Levels/Level_1/Blueprints/Lights/BP_LightFlickering.uasset +++ b/UnrealProject/Lost_Edge/Content/Levels/Level_1/Blueprints/Lights/BP_LightFlickering.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3f87fb5fc0457aa8c0309018c6ed5d86340d8b4af72792b60fde6004a42c9502 -size 47147 +oid sha256:42a294891e03c07b8c59f19d6729681257f9203cf0015e62ad4be7ee30a6d08c +size 14926 diff --git a/UnrealProject/Lost_Edge/Content/Levels/Level_1/L_Level1.umap b/UnrealProject/Lost_Edge/Content/Levels/Level_1/L_Level1.umap index 2938b70..017393d 100644 --- a/UnrealProject/Lost_Edge/Content/Levels/Level_1/L_Level1.umap +++ b/UnrealProject/Lost_Edge/Content/Levels/Level_1/L_Level1.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f69c6ed4bc6903242d58271db2900acf72bb727af25731f8c375b81d8f6b9aaa -size 388196375 +oid sha256:d76c25b30f7c3e2bbc96b27813c2ffe5ea85f2dd3e6930d0608298d20ae84832 +size 388253587 diff --git a/UnrealProject/Lost_Edge/Content/Levels/Level_1/L_Level1_BuiltData.uasset b/UnrealProject/Lost_Edge/Content/Levels/Level_1/L_Level1_BuiltData.uasset index 0b5dd5a..c3a301c 100644 --- a/UnrealProject/Lost_Edge/Content/Levels/Level_1/L_Level1_BuiltData.uasset +++ b/UnrealProject/Lost_Edge/Content/Levels/Level_1/L_Level1_BuiltData.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0bf777eed3d2ac3c4cda56fc90a1fbb70d5f0b737236557811f92b468d62380f -size 1587465 +oid sha256:6ba93f3460208e236fe0bf5a7479c7f9cac40ca79bd2bb43b3a465c9f4bf9dd2 +size 1434734 diff --git a/UnrealProject/Lost_Edge/Content/Levels/Level_1/Materials/MI_Level1_TechnicalRoom_BlinkCandle.uasset b/UnrealProject/Lost_Edge/Content/Levels/Level_1/Materials/MI_Level1_TechnicalRoom_BlinkCandle.uasset new file mode 100644 index 0000000..3e4f677 --- /dev/null +++ b/UnrealProject/Lost_Edge/Content/Levels/Level_1/Materials/MI_Level1_TechnicalRoom_BlinkCandle.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2a146f52be18bd76aaac0e00655f25639a7862c138c19c80344bd4ebeb3999fb +size 7926 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 94728c5..8640972 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:875fbf46a52c2ad248739d8456d601e845b78dc08a8ca3b2c9f351c521cb8883 -size 52610 +oid sha256:71725cefc670a5d8801b14f1b3c40b34afbad69e11f35f0ea70fbc7cdfc1fd8a +size 46079 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 a4b9bd9..7f9745b 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:e9b76bb84eef4e930e0789adb42b5853fd5c024dc483119fbc9fcda93240b564 -size 38742261 +oid sha256:cbf55346ad6e39a3ac3ee4f495b16d46852b5b3e42a6f392d7debdf976b53480 +size 38745745 diff --git a/UnrealProject/Lost_Edge/Content/Levels/Level_2/Materials/PurpleMetal.uasset b/UnrealProject/Lost_Edge/Content/Levels/Level_2/Materials/PurpleMetal.uasset index b9d0d22..c3ccdc7 100644 --- a/UnrealProject/Lost_Edge/Content/Levels/Level_2/Materials/PurpleMetal.uasset +++ b/UnrealProject/Lost_Edge/Content/Levels/Level_2/Materials/PurpleMetal.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7178f2815615584c0af83939f7ae3e3dc467eed7970a5ea150fb2b196336804f -size 127868 +oid sha256:9677ef75a0b3f314f286814bced828e8a1712ba5255fed488c4e4555dbef32a8 +size 128289 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 a1e6977..7767a50 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:436041d119859a7da3544309874dd9f19ccad8985918a06d38d4d78108a65666 -size 2805776 +oid sha256:59563dd2899361719b5527d9864f57fc4847887b4d60894cf2f3c74ffa98556d +size 2828905 diff --git a/UnrealProject/Lost_Edge/Content/Levels/Level_3/Materials/TechnicalRoom/MI_Level3_TechnicalRoom_BlinkSiren.uasset b/UnrealProject/Lost_Edge/Content/Levels/Level_3/Materials/TechnicalRoom/MI_Level3_TechnicalRoom_BlinkSiren.uasset index 50945a2..3383699 100644 --- a/UnrealProject/Lost_Edge/Content/Levels/Level_3/Materials/TechnicalRoom/MI_Level3_TechnicalRoom_BlinkSiren.uasset +++ b/UnrealProject/Lost_Edge/Content/Levels/Level_3/Materials/TechnicalRoom/MI_Level3_TechnicalRoom_BlinkSiren.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:fddd7b40fb429c3d13dfc6e0fd363cc05f6af0e0363556d48bc91f1785b59aa8 -size 10387 +oid sha256:e08f91cff405da056695b1dc95cbfc9842c55d05e76c2b3b275fc8f6e4329dc6 +size 10222 diff --git a/UnrealProject/Lost_Edge/Content/Levels/Level_3/Other/GC_Level3_GlassWall.uasset b/UnrealProject/Lost_Edge/Content/Levels/Level_3/Other/GC_Level3_GlassWall.uasset index 80e04a0..e21eb1a 100644 --- a/UnrealProject/Lost_Edge/Content/Levels/Level_3/Other/GC_Level3_GlassWall.uasset +++ b/UnrealProject/Lost_Edge/Content/Levels/Level_3/Other/GC_Level3_GlassWall.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ed287e2c13d3f4f419f43d5fc0bd2db753b04fe31612ac4775d419e9d200b4ba -size 539757 +oid sha256:ff793d88bfd43aca08a9d8df0a75d50264378af08bd055a34c1cab857f8bd21c +size 539939 diff --git a/UnrealProject/Lost_Edge/Content/Levels/Level_4/L_Level4.umap b/UnrealProject/Lost_Edge/Content/Levels/Level_4/L_Level4.umap index 22c4d0c..b9d51d2 100644 --- a/UnrealProject/Lost_Edge/Content/Levels/Level_4/L_Level4.umap +++ b/UnrealProject/Lost_Edge/Content/Levels/Level_4/L_Level4.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4b4e3370e13978be2e9d9dfb0164d56c4ddd158bf5f498c603c3a294d54c5b7b -size 359975 +oid sha256:7986c970df283d6bee51b4a67343a16708754f72ac4aea4fac72dcd500330525 +size 362710 diff --git a/UnrealProject/Lost_Edge/Content/Levels/Level_5/Blueprints/BP_Level5_ExitGame.uasset b/UnrealProject/Lost_Edge/Content/Levels/Level_5/Blueprints/BP_Level5_ExitGame.uasset new file mode 100644 index 0000000..c6bafd3 --- /dev/null +++ b/UnrealProject/Lost_Edge/Content/Levels/Level_5/Blueprints/BP_Level5_ExitGame.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:94c713dbcfce0477a1c4061df66ea58c1cb4e09bda8b57782eb5810355f6134d +size 34154 diff --git a/UnrealProject/Lost_Edge/Content/Levels/Level_5/Blueprints/BP_Level5_LoadTestLevel.uasset b/UnrealProject/Lost_Edge/Content/Levels/Level_5/Blueprints/BP_Level5_LoadTestLevel.uasset new file mode 100644 index 0000000..eed7321 --- /dev/null +++ b/UnrealProject/Lost_Edge/Content/Levels/Level_5/Blueprints/BP_Level5_LoadTestLevel.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e8963659fece8937f42c40bb38d47b2138e0260e32a7874d2f7575a0e1016233 +size 34783 diff --git a/UnrealProject/Lost_Edge/Content/Levels/Level_5/Blueprints/BP_Level5_LoadTestLevelTrigger.uasset b/UnrealProject/Lost_Edge/Content/Levels/Level_5/Blueprints/BP_Level5_LoadTestLevelTrigger.uasset new file mode 100644 index 0000000..7540b80 --- /dev/null +++ b/UnrealProject/Lost_Edge/Content/Levels/Level_5/Blueprints/BP_Level5_LoadTestLevelTrigger.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e1a77ffb10784f7e6e212007001689b7c98d491321eb193cc5e1c56ac58d1d2f +size 37697 diff --git a/UnrealProject/Lost_Edge/Content/Levels/Level_5/L_Level5.umap b/UnrealProject/Lost_Edge/Content/Levels/Level_5/L_Level5.umap index 7372cc4..e1ffd2e 100644 --- a/UnrealProject/Lost_Edge/Content/Levels/Level_5/L_Level5.umap +++ b/UnrealProject/Lost_Edge/Content/Levels/Level_5/L_Level5.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0d3ed49e60679beb039c9c3a2c6ff3e2c806b8d87c174b9538529d74fc704dc8 -size 32696 +oid sha256:77411408cc34a915c39e94dbbee4b5ae6e682e14696d315d60ba4b978edce9d8 +size 46443 diff --git a/UnrealProject/Lost_Edge/Content/Levels/Level_5/L_Level5_BuiltData.uasset b/UnrealProject/Lost_Edge/Content/Levels/Level_5/L_Level5_BuiltData.uasset new file mode 100644 index 0000000..689c91b --- /dev/null +++ b/UnrealProject/Lost_Edge/Content/Levels/Level_5/L_Level5_BuiltData.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:31b0932c3b478b8659294b14f851581b149fa5fe157dcffcd66f4f5326e6657d +size 850610 diff --git a/UnrealProject/Lost_Edge/Content/Levels/Test/L_Test.umap b/UnrealProject/Lost_Edge/Content/Levels/Test/L_Test.umap index b2297b9..acd9c00 100644 --- a/UnrealProject/Lost_Edge/Content/Levels/Test/L_Test.umap +++ b/UnrealProject/Lost_Edge/Content/Levels/Test/L_Test.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:22b4df730eb43da5587b60a25f4056519a7bffa33cab7645711fb382ee7b6d6b -size 2916247 +oid sha256:41c9eff0cd19f52c528b902900e72752c6984cc26022eb74f7ebf1daa705b34c +size 2932816 diff --git a/UnrealProject/Lost_Edge/Content/Levels/Test/L_Test_BuiltData.uasset b/UnrealProject/Lost_Edge/Content/Levels/Test/L_Test_BuiltData.uasset index 2100858..e9fb9fa 100644 --- a/UnrealProject/Lost_Edge/Content/Levels/Test/L_Test_BuiltData.uasset +++ b/UnrealProject/Lost_Edge/Content/Levels/Test/L_Test_BuiltData.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4709c1328015fe0ec6ae192210f49e06972893eb6ab740df18bb7a18a181a2c0 -size 585835 +oid sha256:c86fd07942df1d6f4e5af3100023e1f17c09fd4a3f224699e5fe4de706b080e8 +size 368420 diff --git a/UnrealProject/Lost_Edge/Content/MaterialsLibrary/M_BlinkColor.uasset b/UnrealProject/Lost_Edge/Content/MaterialsLibrary/M_BlinkColor.uasset index b95e559..020d806 100644 --- a/UnrealProject/Lost_Edge/Content/MaterialsLibrary/M_BlinkColor.uasset +++ b/UnrealProject/Lost_Edge/Content/MaterialsLibrary/M_BlinkColor.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:165171b486a084333b230c983b1931b8270d30d41f72198f85f774ed3f9dea51 -size 16313 +oid sha256:b723a18b312da1a34c749619c9464cde96e156012f787bc52356bb9eec55525e +size 17490 diff --git a/UnrealProject/Lost_Edge/Content/MaterialsLibrary/M_Moss4.uasset b/UnrealProject/Lost_Edge/Content/MaterialsLibrary/M_Moss4.uasset index e9dd8a6..8507cda 100644 --- a/UnrealProject/Lost_Edge/Content/MaterialsLibrary/M_Moss4.uasset +++ b/UnrealProject/Lost_Edge/Content/MaterialsLibrary/M_Moss4.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2bbdef4dca4eb91b380d5c1e258169abe352359a86dc102871364d6597c0b9c5 -size 22445 +oid sha256:04b335f4f8a2dcd04d015f6dd5e7f1a1457bf34369201c45393c1733687c51f9 +size 22502 diff --git a/UnrealProject/Lost_Edge/Content/MaterialsLibrary/M_Wireframe.uasset b/UnrealProject/Lost_Edge/Content/MaterialsLibrary/M_Wireframe.uasset index 0b71b01..afeeddd 100644 --- a/UnrealProject/Lost_Edge/Content/MaterialsLibrary/M_Wireframe.uasset +++ b/UnrealProject/Lost_Edge/Content/MaterialsLibrary/M_Wireframe.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e851eacf2a05a550d657c58e63cfd9f913f28c1bf2948df642cf72ed6f1852b8 -size 149433 +oid sha256:d3e4116531716b04719d66f530865fb1df4cdb7dd11599db329a31631002aa84 +size 149833 diff --git a/UnrealProject/Lost_Edge/Content/Models/Characters/Human/BPA_HumanPlayer.uasset b/UnrealProject/Lost_Edge/Content/Models/Characters/Human/BPA_HumanPlayer.uasset index 7b0139f..dab8a4b 100644 --- a/UnrealProject/Lost_Edge/Content/Models/Characters/Human/BPA_HumanPlayer.uasset +++ b/UnrealProject/Lost_Edge/Content/Models/Characters/Human/BPA_HumanPlayer.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:67b06536b5eff9a0160c8629420599696e924d919b4870890a15d7e6ad7d0680 -size 1211899 +oid sha256:34f1614e5eaf14222936babdd2c55f65d638938948189093a137af3a180f21ef +size 1208585 diff --git a/UnrealProject/Lost_Edge/Content/Models/Marketplace/LowPolyOffice/Materials/M_LaptopColor.uasset b/UnrealProject/Lost_Edge/Content/Models/Marketplace/LowPolyOffice/Materials/M_LaptopColor.uasset index 2b7f670..24e03e3 100644 --- a/UnrealProject/Lost_Edge/Content/Models/Marketplace/LowPolyOffice/Materials/M_LaptopColor.uasset +++ b/UnrealProject/Lost_Edge/Content/Models/Marketplace/LowPolyOffice/Materials/M_LaptopColor.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2bbaadaec6722227f04c9bac2fc39821d6d569bc0bc0cd5b123c9e33112b6863 -size 51992 +oid sha256:bb585701ef70be8f9d4a7696df82b99f05a043a10b92ee5789c0ef01abacb014 +size 52049 diff --git a/UnrealProject/Lost_Edge/Content/Models/Marketplace/LowPolyOffice/Materials/M_LaptopKeyboard.uasset b/UnrealProject/Lost_Edge/Content/Models/Marketplace/LowPolyOffice/Materials/M_LaptopKeyboard.uasset index 95b029c..9d6fcd0 100644 --- a/UnrealProject/Lost_Edge/Content/Models/Marketplace/LowPolyOffice/Materials/M_LaptopKeyboard.uasset +++ b/UnrealProject/Lost_Edge/Content/Models/Marketplace/LowPolyOffice/Materials/M_LaptopKeyboard.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:edcda8d5a611cff50e83ea35d2e14c266f6ae9d3e0797b2c86f3813b14a064ef -size 53351 +oid sha256:23c3de660cd5ce484f3b163c65cab26bafcbb969cc93864addf11a60041927e9 +size 53408 diff --git a/UnrealProject/Lost_Edge/Content/Models/Marketplace/LowPolyOffice/Materials/M_LaptopScreen.uasset b/UnrealProject/Lost_Edge/Content/Models/Marketplace/LowPolyOffice/Materials/M_LaptopScreen.uasset index 9deca76..b993709 100644 --- a/UnrealProject/Lost_Edge/Content/Models/Marketplace/LowPolyOffice/Materials/M_LaptopScreen.uasset +++ b/UnrealProject/Lost_Edge/Content/Models/Marketplace/LowPolyOffice/Materials/M_LaptopScreen.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:93cc1d864edfde4dc680d87156286dd91c0b5bf178cc45e978a6ed212540e905 -size 51330 +oid sha256:58d72d54c5ef33cf8cb9f557c5819a34ad2443af66dc83fc664634c0dc7ed947 +size 51387 diff --git a/UnrealProject/Lost_Edge/Content/Models/Marketplace/LowPolyOffice/Materials/M_MugColor.uasset b/UnrealProject/Lost_Edge/Content/Models/Marketplace/LowPolyOffice/Materials/M_MugColor.uasset index d93f96f..c14de4e 100644 --- a/UnrealProject/Lost_Edge/Content/Models/Marketplace/LowPolyOffice/Materials/M_MugColor.uasset +++ b/UnrealProject/Lost_Edge/Content/Models/Marketplace/LowPolyOffice/Materials/M_MugColor.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f7a14b6a725e6615316c2227f2f264162d81339746502a85757f5c9133f4ed1e -size 53530 +oid sha256:7c688eda341d2db8d9a92f5cbb3fa3e517a9586f7e0d84fa46cb0b5db79409a0 +size 53587 diff --git a/UnrealProject/Lost_Edge/Content/UI/Blueprints/MainMenu/Components/Classes/UICC_MainMenu_Page.uasset b/UnrealProject/Lost_Edge/Content/UI/Blueprints/MainMenu/Components/Classes/UICC_MainMenu_Page.uasset index bd484a6..53887c8 100644 --- a/UnrealProject/Lost_Edge/Content/UI/Blueprints/MainMenu/Components/Classes/UICC_MainMenu_Page.uasset +++ b/UnrealProject/Lost_Edge/Content/UI/Blueprints/MainMenu/Components/Classes/UICC_MainMenu_Page.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b2e2b41d5236566cf0955b14d5fa49d0475768a03a04c493d2ef63ed438c9416 -size 16200 +oid sha256:302f1a39c62972f91b1241d95efdf6145dd017fb796dba85244024945f710552 +size 20877 diff --git a/UnrealProject/Lost_Edge/Content/UI/Blueprints/MainMenu/Pages/UI_MainMenu_Page_Credits.uasset b/UnrealProject/Lost_Edge/Content/UI/Blueprints/MainMenu/Pages/UI_MainMenu_Page_Credits.uasset index 53fe73b..dc7236a 100644 --- a/UnrealProject/Lost_Edge/Content/UI/Blueprints/MainMenu/Pages/UI_MainMenu_Page_Credits.uasset +++ b/UnrealProject/Lost_Edge/Content/UI/Blueprints/MainMenu/Pages/UI_MainMenu_Page_Credits.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:69348139e6eb99f394c939e809e87b4e256db6e8e8949f158040a3c0e47a9ccb -size 118034 +oid sha256:ddb4c1c4ba8ee61c83af9cd1e55637e100868b26cb1b329fb2a566d46fdabfee +size 163400 diff --git a/UnrealProject/Lost_Edge/Content/UI/Blueprints/MainMenu/Pages/UI_MainMenu_Page_Home.uasset b/UnrealProject/Lost_Edge/Content/UI/Blueprints/MainMenu/Pages/UI_MainMenu_Page_Home.uasset index d6cc9f0..761e625 100644 --- a/UnrealProject/Lost_Edge/Content/UI/Blueprints/MainMenu/Pages/UI_MainMenu_Page_Home.uasset +++ b/UnrealProject/Lost_Edge/Content/UI/Blueprints/MainMenu/Pages/UI_MainMenu_Page_Home.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3b32af64f58e111f0510ad254359fabc311a3b658325d9a67e5681fd08ce757f -size 130008 +oid sha256:f229bfcf6d1123cb46485f8c386ff40b1301f153d8116c42ca6b21b5a16d0f1c +size 96777 diff --git a/UnrealProject/Lost_Edge/Content/UI/Blueprints/MainMenu/Pages/UI_MainMenu_Page_Options.uasset b/UnrealProject/Lost_Edge/Content/UI/Blueprints/MainMenu/Pages/UI_MainMenu_Page_Options.uasset index ebde59a..b8e17a4 100644 --- a/UnrealProject/Lost_Edge/Content/UI/Blueprints/MainMenu/Pages/UI_MainMenu_Page_Options.uasset +++ b/UnrealProject/Lost_Edge/Content/UI/Blueprints/MainMenu/Pages/UI_MainMenu_Page_Options.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b0e781aa6d6836355b90fbd758ed2a1c628813e7492f62e982105f74f0580e0b -size 67822 +oid sha256:8338c9dd61a3d2ba3e7fcf02c5b7b2a02bd727535976c3c067dc640d6f3e36b9 +size 68269 diff --git a/UnrealProject/Lost_Edge/Content/UI/Blueprints/MainMenu/Pages/UI_MainMenu_Page_Options_Audio.uasset b/UnrealProject/Lost_Edge/Content/UI/Blueprints/MainMenu/Pages/UI_MainMenu_Page_Options_Audio.uasset index c2a5540..f773079 100644 --- a/UnrealProject/Lost_Edge/Content/UI/Blueprints/MainMenu/Pages/UI_MainMenu_Page_Options_Audio.uasset +++ b/UnrealProject/Lost_Edge/Content/UI/Blueprints/MainMenu/Pages/UI_MainMenu_Page_Options_Audio.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3bc5f9b896b15b2594d32e270eb79a78f080890bbb4bb3c9a9108293863a7a9c -size 178556 +oid sha256:485ff8cc6d42623144fd5ebc12499cf3c310a53f53f3ce166592af7785b54b96 +size 180474 diff --git a/UnrealProject/Lost_Edge/Content/UI/Blueprints/MainMenu/Pages/UI_MainMenu_Page_Options_Game.uasset b/UnrealProject/Lost_Edge/Content/UI/Blueprints/MainMenu/Pages/UI_MainMenu_Page_Options_Game.uasset index 89640c2..d1a3265 100644 --- a/UnrealProject/Lost_Edge/Content/UI/Blueprints/MainMenu/Pages/UI_MainMenu_Page_Options_Game.uasset +++ b/UnrealProject/Lost_Edge/Content/UI/Blueprints/MainMenu/Pages/UI_MainMenu_Page_Options_Game.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7550073813e62fc6695d9241ff67ba456526a907227420c8fcf1de0f078338c1 -size 96918 +oid sha256:3ee8d0d261b0cb4b00855555feb2e658fd245ac46aab4960ab7229a5f8eccebc +size 97877 diff --git a/UnrealProject/Lost_Edge/Content/UI/Blueprints/MainMenu/Pages/UI_MainMenu_Page_Options_Graphics.uasset b/UnrealProject/Lost_Edge/Content/UI/Blueprints/MainMenu/Pages/UI_MainMenu_Page_Options_Graphics.uasset index 5951c6e..c35b25e 100644 --- a/UnrealProject/Lost_Edge/Content/UI/Blueprints/MainMenu/Pages/UI_MainMenu_Page_Options_Graphics.uasset +++ b/UnrealProject/Lost_Edge/Content/UI/Blueprints/MainMenu/Pages/UI_MainMenu_Page_Options_Graphics.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1370ea26a0c7ea1bbccf45fb4ac9a0a153717bfb0a179bf00489bed808003463 -size 504314 +oid sha256:83126fef3de7a5464e33fcdd789895d2e5fffa303c9396b04248ffc12e573ac2 +size 593303 diff --git a/UnrealProject/Lost_Edge/Content/UI/Blueprints/MainMenu/ST_MainMenu_Credits.uasset b/UnrealProject/Lost_Edge/Content/UI/Blueprints/MainMenu/ST_MainMenu_Credits.uasset index b35b144..2c70428 100644 --- a/UnrealProject/Lost_Edge/Content/UI/Blueprints/MainMenu/ST_MainMenu_Credits.uasset +++ b/UnrealProject/Lost_Edge/Content/UI/Blueprints/MainMenu/ST_MainMenu_Credits.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:84777a6eed88995348564ed18ebedfbd22bcda155bd5b432c383d468ca9b61c4 -size 2848 +oid sha256:28446afc2a76eb1d48fbaa0954c6d7e48931bf4e45a7b95f495980d922c86aaf +size 2964 diff --git a/UnrealProject/Lost_Edge/Content/UI/Blueprints/MainMenu/UI_MainMenu.uasset b/UnrealProject/Lost_Edge/Content/UI/Blueprints/MainMenu/UI_MainMenu.uasset index 7b7195f..190a999 100644 --- a/UnrealProject/Lost_Edge/Content/UI/Blueprints/MainMenu/UI_MainMenu.uasset +++ b/UnrealProject/Lost_Edge/Content/UI/Blueprints/MainMenu/UI_MainMenu.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ff06f385a335042c3d5d0af814283bd9c622745fd44bde88c5dd0fc73a5f53ed -size 242163 +oid sha256:246fbe716376b184e911829a63d7d78247f3d5b91508db3217765e177006124f +size 253289 diff --git a/UnrealProject/Lost_Edge/Content/UI/Blueprints/QuickTimeEvents/UI_QuickTimeEventMultiPress.uasset b/UnrealProject/Lost_Edge/Content/UI/Blueprints/QuickTimeEvents/UI_QuickTimeEventMultiPress.uasset index f259ae4..85309f5 100644 --- a/UnrealProject/Lost_Edge/Content/UI/Blueprints/QuickTimeEvents/UI_QuickTimeEventMultiPress.uasset +++ b/UnrealProject/Lost_Edge/Content/UI/Blueprints/QuickTimeEvents/UI_QuickTimeEventMultiPress.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7378ac82cd924820c60ac5cc3cb182211e57d9f3970ed7310c4c74f4e2472828 -size 459172 +oid sha256:0ba3ebd8c6c41fca55f04e1b7921e3dc29033b7ef7d870bb42e07b4ce08a6f1f +size 454080 diff --git a/UnrealProject/Lost_Edge/Content/UI/Blueprints/UI_CheatMenu.uasset b/UnrealProject/Lost_Edge/Content/UI/Blueprints/UI_CheatMenu.uasset index 47f0e59..46d6a92 100644 --- a/UnrealProject/Lost_Edge/Content/UI/Blueprints/UI_CheatMenu.uasset +++ b/UnrealProject/Lost_Edge/Content/UI/Blueprints/UI_CheatMenu.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9c23d118c9aa51dfb18a02aa675a76161268e4bcaed314d4f3cf2c9966da4221 -size 197051 +oid sha256:5a0f87fb54c6e0c02b8e19e2b344860e428e207b1ac3277ae6fbf28c041c9f98 +size 202962 diff --git a/UnrealProject/Lost_Edge/Content/UI/Blueprints/UI_Journal.uasset b/UnrealProject/Lost_Edge/Content/UI/Blueprints/UI_Journal.uasset index 340bf04..3dc0890 100644 --- a/UnrealProject/Lost_Edge/Content/UI/Blueprints/UI_Journal.uasset +++ b/UnrealProject/Lost_Edge/Content/UI/Blueprints/UI_Journal.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0df779105a105e7f3a925f65f7e0295b8923617945cb44f3c84d25e490f115b4 -size 57000 +oid sha256:339fa860de0ac3bb4347fa98409c2d95052b352e77c2fb3bede704de77298cdb +size 57050 diff --git a/UnrealProject/Lost_Edge/Content/UI/Blueprints/UI_TextLine.uasset b/UnrealProject/Lost_Edge/Content/UI/Blueprints/UI_TextLine.uasset index 533a265..4abdc26 100644 --- a/UnrealProject/Lost_Edge/Content/UI/Blueprints/UI_TextLine.uasset +++ b/UnrealProject/Lost_Edge/Content/UI/Blueprints/UI_TextLine.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:434c240eec1737cac4b8c0558550a8ca59fb478c03710fb3acbd01ffc4b3526d -size 39490 +oid sha256:048e0388d0feb824fa656a4df3e38505e2f0ea774f0f237287dc952e60bfb996 +size 39335 diff --git a/UnrealProject/Lost_Edge/Content/UI/Components/UIC_ComboBox.uasset b/UnrealProject/Lost_Edge/Content/UI/Components/UIC_ComboBox.uasset index ce88df7..3de3162 100644 --- a/UnrealProject/Lost_Edge/Content/UI/Components/UIC_ComboBox.uasset +++ b/UnrealProject/Lost_Edge/Content/UI/Components/UIC_ComboBox.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2ec78da0d043e7360e94e96bd38f4e14aa4fa8d4a13bd9743585a49898202c83 -size 203180 +oid sha256:b5547ed103e9745a3f0a214e2baca5e9568c1665d20ea015dad9f52d52a4a78a +size 200629 diff --git a/UnrealProject/Lost_Edge/Source/Lost_Edge/Private/CommonFunctions.cpp b/UnrealProject/Lost_Edge/Source/Lost_Edge/Private/CommonFunctions.cpp index 02be0f6..7378717 100644 --- a/UnrealProject/Lost_Edge/Source/Lost_Edge/Private/CommonFunctions.cpp +++ b/UnrealProject/Lost_Edge/Source/Lost_Edge/Private/CommonFunctions.cpp @@ -55,6 +55,17 @@ int32 UCommonFunctions::StringIndexInTextArray(const TArray& array, const return -1; } +int32 UCommonFunctions::SubstringCount(const FString& in, const FString& substr) +{ + int32 result = 0; + + int32 i = -1; + while((i = in.Find(substr, ESearchCase::Type::CaseSensitive, ESearchDir::Type::FromStart, i + 1)) != INDEX_NONE) + ++result; + + return result; +} + void UCommonFunctions::DestroyActorRecursively(AActor* actor) { TArray childs; diff --git a/UnrealProject/Lost_Edge/Source/Lost_Edge/Private/CommonFunctions.h b/UnrealProject/Lost_Edge/Source/Lost_Edge/Private/CommonFunctions.h index 0ea1804..25cff9e 100644 --- a/UnrealProject/Lost_Edge/Source/Lost_Edge/Private/CommonFunctions.h +++ b/UnrealProject/Lost_Edge/Source/Lost_Edge/Private/CommonFunctions.h @@ -53,6 +53,8 @@ public: UFUNCTION(BlueprintPure) static int32 StringIndexInTextArray(const TArray& array, const FString& value); + UFUNCTION(BlueprintPure) + static int32 SubstringCount(const FString& in, const FString& substr); /** Recursively destroy actor and all its childs (the default Destroy doesn't have consistent behavior) */ UFUNCTION(BlueprintCallable, Category = Actor) diff --git a/UnrealProject/Lost_Edge/Source/Lost_Edge/Private/CustomGameInstance.cpp b/UnrealProject/Lost_Edge/Source/Lost_Edge/Private/CustomGameInstance.cpp index 31fcfbd..f5eff9b 100644 --- a/UnrealProject/Lost_Edge/Source/Lost_Edge/Private/CustomGameInstance.cpp +++ b/UnrealProject/Lost_Edge/Source/Lost_Edge/Private/CustomGameInstance.cpp @@ -130,21 +130,19 @@ void UCustomGameInstance::SaveGame(FName checkpointName) if(!levelScript) return; - auto player = APlayerBase::Get(); - if(!player) - return; - saveData->level = GetWorld()->GetFName(); saveData->state = levelScript->GetState(); saveData->checkpoint = checkpointName; - if(player->leftPocketItem) + + auto player = APlayerBase::Get(); + if(player && player->leftPocketItem) saveData->playerLeftPocketItem = player->leftPocketItem->GetFName(); else - saveData->playerLeftPocketItem = FName(TEXT("")); - if(player->rightPocketItem) + saveData->playerLeftPocketItem = {}; + if(player && player->rightPocketItem) saveData->playerRightPocketItem = player->rightPocketItem->GetFName(); else - saveData->playerRightPocketItem = FName(TEXT("")); + saveData->playerRightPocketItem = {}; UGameplayStatics::SaveGameToSlot(saveData, saveName, saveIndex); } diff --git a/UnrealProject/Lost_Edge/Source/Lost_Edge/Private/GraphicsSettingsHelper.cpp b/UnrealProject/Lost_Edge/Source/Lost_Edge/Private/GraphicsSettingsHelper.cpp index bc7223c..5aace6e 100644 --- a/UnrealProject/Lost_Edge/Source/Lost_Edge/Private/GraphicsSettingsHelper.cpp +++ b/UnrealProject/Lost_Edge/Source/Lost_Edge/Private/GraphicsSettingsHelper.cpp @@ -116,11 +116,7 @@ void UGraphicsSettingsHelper::CenterWindowPosition(UCustomGameSettings* settings return; FIntPoint position; - if(GetDisplayMode(settings) == EDisplayMode::Fullscreen) - { - position = { 0, 0 }; - } - else + if(GetDisplayMode(settings) == EDisplayMode::Windowed) { auto monitors = GetAvailableMonitors(); int32 monitorId = GetMonitorId(settings); @@ -132,6 +128,10 @@ void UGraphicsSettingsHelper::CenterWindowPosition(UCustomGameSettings* settings FIntPoint window = GetResolution(settings); position = { offset + (monitor.X - window.X) / 2, (monitor.Y - window.Y) / 2 }; } + else + { + position = { 0, 0 }; + } SetWindowPosition(settings, position); } @@ -361,8 +361,9 @@ FIntPoint UGraphicsSettingsHelper::FilterClosestResolution(const TArray 1 && c < coefficient) - || (coefficient < 1 && c > coefficient && c < 1)) + if((coefficient > 1 && c < coefficient) // 1 < new result < old result + || (c < 1 && c > coefficient) // old result < new result < 1 + || UCommonFunctions::FloatIsZero(c - 1)) // new result == Omega(1) { coefficient = c; resultId = i; diff --git a/UnrealProject/Lost_Edge/Source/Lost_Edge/Private/Levels/Level1.cpp b/UnrealProject/Lost_Edge/Source/Lost_Edge/Private/Levels/Level1.cpp index 3d7fd6d..b6e1eff 100644 --- a/UnrealProject/Lost_Edge/Source/Lost_Edge/Private/Levels/Level1.cpp +++ b/UnrealProject/Lost_Edge/Source/Lost_Edge/Private/Levels/Level1.cpp @@ -10,14 +10,18 @@ #include "Engine/SkyLight.h" #include "LevelSequencePlayer.h" +#include "CustomGameInstance.h" #include "CutsceneManager.h" void ALevel1::BeginPlay() { ALevelBase::BeginPlay(); - TurnLight(false); - TurnFog(false); + //TurnLight(false); + //TurnFog(false); + + if(auto GI = UCustomGameInstance::Get()) + GI->SaveGame({}); CallNextState(); } diff --git a/UnrealProject/Lost_Edge/Source/Lost_Edge/Private/Levels/Level2.cpp b/UnrealProject/Lost_Edge/Source/Lost_Edge/Private/Levels/Level2.cpp index 9915566..4061bf8 100644 --- a/UnrealProject/Lost_Edge/Source/Lost_Edge/Private/Levels/Level2.cpp +++ b/UnrealProject/Lost_Edge/Source/Lost_Edge/Private/Levels/Level2.cpp @@ -2,9 +2,14 @@ #include "Level2.h" +#include "CustomGameInstance.h" + void ALevel2::BeginPlay() { ALevelBase::BeginPlay(); + if(auto GI = UCustomGameInstance::Get()) + GI->SaveGame({}); + CallNextState(); } diff --git a/UnrealProject/Lost_Edge/Source/Lost_Edge/Private/Levels/Level3.cpp b/UnrealProject/Lost_Edge/Source/Lost_Edge/Private/Levels/Level3.cpp index 82126eb..4ad87ac 100644 --- a/UnrealProject/Lost_Edge/Source/Lost_Edge/Private/Levels/Level3.cpp +++ b/UnrealProject/Lost_Edge/Source/Lost_Edge/Private/Levels/Level3.cpp @@ -8,6 +8,7 @@ #include "Engine/SkyLight.h" #include "LevelSequencePlayer.h" +#include "CustomGameInstance.h" #include "CutsceneManager.h" #include "MainGameModeBase.h" @@ -15,5 +16,8 @@ void ALevel3::BeginPlay() { ALevelBase::BeginPlay(); - CallNextState(); + if(auto GI = UCustomGameInstance::Get()) + GI->SaveGame({}); + + //CallNextState(); } diff --git a/UnrealProject/Lost_Edge/Source/Lost_Edge/Private/Levels/LevelBase.cpp b/UnrealProject/Lost_Edge/Source/Lost_Edge/Private/Levels/LevelBase.cpp index 1658907..9cde47b 100644 --- a/UnrealProject/Lost_Edge/Source/Lost_Edge/Private/Levels/LevelBase.cpp +++ b/UnrealProject/Lost_Edge/Source/Lost_Edge/Private/Levels/LevelBase.cpp @@ -89,32 +89,37 @@ void ALevelBase::ApplySaveData() if(!player) return; - for(TActorIterator it(GetWorld()); it; ++it) + if(!GI->saveData->checkpoint.IsNone()) { - if(it->GetFName() == GI->saveData->checkpoint) + for(TActorIterator it(GetWorld()); it; ++it) { - player->SetActorLocation(it->GetActorLocation(), false, nullptr, ETeleportType::ResetPhysics); - player->Controller->SetControlRotation(it->GetActorRotation()); - break; + if(it->GetFName() == GI->saveData->checkpoint) + { + player->SetActorLocation(it->GetActorLocation(), false, nullptr, ETeleportType::ResetPhysics); + player->Controller->SetControlRotation(it->GetActorRotation()); + break; + } } } - int pocketItems = 0; - for(TActorIterator it(GetWorld()); it; ++it) + if(!GI->saveData->playerLeftPocketItem.IsNone() || !GI->saveData->playerRightPocketItem.IsNone()) { - if(it->GetFName() == GI->saveData->playerLeftPocketItem) + int pocketItems = 0; + for(TActorIterator it(GetWorld()); it; ++it) { - ++pocketItems; - player->TakeItemToLeftHand(*it); - } - else if(it->GetFName() == GI->saveData->playerRightPocketItem) - { - ++pocketItems; - player->TakeItemToRightHand(*it); - } - if(pocketItems > 1) - { - break; + if(pocketItems > 1) + break; + + if(it->GetFName() == GI->saveData->playerLeftPocketItem) + { + ++pocketItems; + player->TakeItemToLeftHand(*it); + } + else if(it->GetFName() == GI->saveData->playerRightPocketItem) + { + ++pocketItems; + player->TakeItemToRightHand(*it); + } } } } diff --git a/UnrealProject/Lost_Edge/Source/Lost_Edge/Private/Minigame/Minigame.cpp b/UnrealProject/Lost_Edge/Source/Lost_Edge/Private/Minigame/Minigame.cpp index fe4b8b6..61c65fe 100644 --- a/UnrealProject/Lost_Edge/Source/Lost_Edge/Private/Minigame/Minigame.cpp +++ b/UnrealProject/Lost_Edge/Source/Lost_Edge/Private/Minigame/Minigame.cpp @@ -56,3 +56,11 @@ void AMinigame::Restart() OnRestart_Internal(); OnRestart(); } + +void AMinigame::EndPlay(const EEndPlayReason::Type EndPlayReason) +{ + if(instance == this) + instance = nullptr; + + Super::EndPlay(EndPlayReason); +} diff --git a/UnrealProject/Lost_Edge/Source/Lost_Edge/Private/Minigame/Minigame.h b/UnrealProject/Lost_Edge/Source/Lost_Edge/Private/Minigame/Minigame.h index 6244a0f..aecc48c 100644 --- a/UnrealProject/Lost_Edge/Source/Lost_Edge/Private/Minigame/Minigame.h +++ b/UnrealProject/Lost_Edge/Source/Lost_Edge/Private/Minigame/Minigame.h @@ -47,6 +47,8 @@ public: TSoftObjectPtr GetInputMappings() { return context; } protected: + virtual void EndPlay(const EEndPlayReason::Type EndPlayReason) override; + virtual void OnStart_Internal() {} UFUNCTION(BlueprintImplementableEvent) void OnStart(); diff --git a/UnrealProject/Lost_Edge/Source/Lost_Edge/Private/PlayerBase.cpp b/UnrealProject/Lost_Edge/Source/Lost_Edge/Private/PlayerBase.cpp index 4b1749d..74786d3 100644 --- a/UnrealProject/Lost_Edge/Source/Lost_Edge/Private/PlayerBase.cpp +++ b/UnrealProject/Lost_Edge/Source/Lost_Edge/Private/PlayerBase.cpp @@ -348,30 +348,7 @@ void APlayerBase::ShowJournal() void APlayerBase::ShowMenu() { if(auto WM = AMainGameModeBase::GetWidgetsManager()) - { - if(GetWorld()->IsPaused()) - { - WM->HideMainMenu(); - if(auto PC = ACustomPlayerController::Get()) - { - PC->SetShowMouseCursor(false); - PC->SetInputMode(FInputModeGameOnly{}); - } - UnlockPlayer(FPlayerLock::All()); - UGameplayStatics::SetGamePaused(GetWorld(), false); - } - else - { - WM->ShowMainMenu(); - if(auto PC = ACustomPlayerController::Get()) - { - PC->SetShowMouseCursor(true); - PC->SetInputMode(FInputModeGameAndUI{}); - } - LockPlayer(FPlayerLock::All()); - UGameplayStatics::SetGamePaused(GetWorld(), true); - } - } + WM->MenuCall(); } FPlayerLock FPlayerLock::All() diff --git a/UnrealProject/Lost_Edge/Source/Lost_Edge/Private/Widgets/MainMenu/MainMenuWidget.cpp b/UnrealProject/Lost_Edge/Source/Lost_Edge/Private/Widgets/MainMenu/MainMenuWidget.cpp index acff3d2..c046b32 100644 --- a/UnrealProject/Lost_Edge/Source/Lost_Edge/Private/Widgets/MainMenu/MainMenuWidget.cpp +++ b/UnrealProject/Lost_Edge/Source/Lost_Edge/Private/Widgets/MainMenu/MainMenuWidget.cpp @@ -9,6 +9,11 @@ #include "MainMenuButtonWidget.h" #include "Widgets/WidgetsManager.h" +namespace +{ + constexpr float userCallDelaySeconds = 0.1f; +} + bool UMainMenuWidget::Initialize() { //FWidgetAnimationDynamicEvent closeFinished; @@ -18,6 +23,25 @@ bool UMainMenuWidget::Initialize() return UUserWidget::Initialize(); } +void UMainMenuWidget::UserCall() +{ + float time = GetWorld()->GetRealTimeSeconds(); + if(time - userCallTimeStamp < userCallDelaySeconds) + return; + userCallTimeStamp = time; + + if(Visibility == ESlateVisibility::Hidden) + { + if(auto GM = AMainGameModeBase::Get()) + if(auto WM = GM->GetWidgetsManager()) + WM->ShowMainMenu(true); + } + else + { + OnUserCall(); + } +} + void UMainMenuWidget::Show(bool fast) { SetVisibility(ESlateVisibility::Visible); diff --git a/UnrealProject/Lost_Edge/Source/Lost_Edge/Private/Widgets/MainMenu/MainMenuWidget.h b/UnrealProject/Lost_Edge/Source/Lost_Edge/Private/Widgets/MainMenu/MainMenuWidget.h index 550bc7b..e32bc2a 100644 --- a/UnrealProject/Lost_Edge/Source/Lost_Edge/Private/Widgets/MainMenu/MainMenuWidget.h +++ b/UnrealProject/Lost_Edge/Source/Lost_Edge/Private/Widgets/MainMenu/MainMenuWidget.h @@ -18,6 +18,9 @@ class UMainMenuWidget : public UUserWidget public: virtual bool Initialize() override; + void UserCall(); + UFUNCTION(BlueprintImplementableEvent) + void OnUserCall(); UFUNCTION(BlueprintCallable) void Show(bool fast = true); UFUNCTION(BlueprintCallable) @@ -38,4 +41,7 @@ public: protected: UFUNCTION() void Closed(); + +private: + float userCallTimeStamp = 0; }; diff --git a/UnrealProject/Lost_Edge/Source/Lost_Edge/Private/Widgets/WidgetsManager.cpp b/UnrealProject/Lost_Edge/Source/Lost_Edge/Private/Widgets/WidgetsManager.cpp index ba1d1e7..ed27cd1 100644 --- a/UnrealProject/Lost_Edge/Source/Lost_Edge/Private/Widgets/WidgetsManager.cpp +++ b/UnrealProject/Lost_Edge/Source/Lost_Edge/Private/Widgets/WidgetsManager.cpp @@ -11,6 +11,7 @@ #include "CustomGameInstance.h" #include "CustomGameSettings.h" +#include "CustomPlayerController.h" #include "Interactable/Interactable.h" #include "Interactable/Modificators/InteractableModificator.h" #include "Interactable/Modificators/InventoryInteractableModificator.h" @@ -165,8 +166,24 @@ void UWidgetsManager::RemoveOverlayWidget(UUserWidget* widget) +void UWidgetsManager::MenuCall() +{ + mainMenuWidget->UserCall(); +} + void UWidgetsManager::ShowMainMenu(bool pause) { + if(auto PC = ACustomPlayerController::Get()) + { + PC->SetShowMouseCursor(true); + PC->SetInputMode(FInputModeGameAndUI{}); + } + if(auto p = APlayerBase::Get()) + { + p->LockPlayer(FPlayerLock::All()); + } + UGameplayStatics::SetGamePaused(GetWorld(), true); + mainMenuWidget->Show(pause); HideJournal(); HideCheatMenu(); @@ -174,6 +191,17 @@ void UWidgetsManager::ShowMainMenu(bool pause) void UWidgetsManager::HideMainMenu() { + if(auto PC = ACustomPlayerController::Get()) + { + PC->SetShowMouseCursor(false); + PC->SetInputMode(FInputModeGameOnly{}); + } + if(auto p = APlayerBase::Get()) + { + p->UnlockPlayer(FPlayerLock::All()); + } + UGameplayStatics::SetGamePaused(GetWorld(), false); + mainMenuWidget->Hide(); } diff --git a/UnrealProject/Lost_Edge/Source/Lost_Edge/Private/Widgets/WidgetsManager.h b/UnrealProject/Lost_Edge/Source/Lost_Edge/Private/Widgets/WidgetsManager.h index 2403073..8a763f4 100644 --- a/UnrealProject/Lost_Edge/Source/Lost_Edge/Private/Widgets/WidgetsManager.h +++ b/UnrealProject/Lost_Edge/Source/Lost_Edge/Private/Widgets/WidgetsManager.h @@ -32,7 +32,10 @@ public: UFUNCTION(BlueprintCallable, Category = WidgetsManager) void RemoveOverlayWidget(class UUserWidget* widget); + void MenuCall(); + UFUNCTION(BlueprintCallable, Category = WidgetsManager) void ShowMainMenu(bool pause = true); + UFUNCTION(BlueprintCallable, Category = WidgetsManager) void HideMainMenu(); UFUNCTION(BlueprintCallable, Category = WidgetsManager)