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 22d4b4f..7db1124 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:3ae4f8d697d46434366827562a388480f4b09f9fe022e12ba3b5f7aade8ffbc4 -size 174730 +oid sha256:287b7da240ae63d1770a781d18460c709b2657941c436c0b888ffc6e19f0580e +size 274 diff --git a/UnrealProject/Lost_Edge/Content/UI/Blueprints/MainMenu/UI_MainMenuCredits.uasset b/UnrealProject/Lost_Edge/Content/UI/Blueprints/MainMenu/UI_MainMenuCredits.uasset index 76c474d..81d1b43 100644 --- a/UnrealProject/Lost_Edge/Content/UI/Blueprints/MainMenu/UI_MainMenuCredits.uasset +++ b/UnrealProject/Lost_Edge/Content/UI/Blueprints/MainMenu/UI_MainMenuCredits.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:aa445eb438ecf53694584bda7e43c7746a2c61238d98b4e5b0665e3b98b4e87f -size 929306 +oid sha256:8ab688626ebc28882eec58916d67c8a4585bf87dacaaf12589007c8c20bd67d2 +size 928720 diff --git a/UnrealProject/Lost_Edge/Content/UI/Blueprints/MainMenu/UI_MainMenuOptions.uasset b/UnrealProject/Lost_Edge/Content/UI/Blueprints/MainMenu/UI_MainMenuOptions.uasset index 3510003..378bc0a 100644 --- a/UnrealProject/Lost_Edge/Content/UI/Blueprints/MainMenu/UI_MainMenuOptions.uasset +++ b/UnrealProject/Lost_Edge/Content/UI/Blueprints/MainMenu/UI_MainMenuOptions.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:647b375075ad14af64932e5ef664da6e22b0a375c7867811f5f1c436f24808cc -size 62215 +oid sha256:b67a7eb6301cbdfe80bfb26236a87b775d742cf950d025e044ddf22bd4262566 +size 61650 diff --git a/UnrealProject/Lost_Edge/Content/UI/Blueprints/MainMenu/UI_MainMenuOptionsAudio.uasset b/UnrealProject/Lost_Edge/Content/UI/Blueprints/MainMenu/UI_MainMenuOptionsAudio.uasset index d7f116d..4d003c3 100644 --- a/UnrealProject/Lost_Edge/Content/UI/Blueprints/MainMenu/UI_MainMenuOptionsAudio.uasset +++ b/UnrealProject/Lost_Edge/Content/UI/Blueprints/MainMenu/UI_MainMenuOptionsAudio.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9e247836e085546324e4f68c3a5070b4d37992b60082ef5a525160e79ca9ea5f -size 95551 +oid sha256:33a18cd2916a18ff5b23156ac150d658ea27e3c5de70d5359ad498b41badfbf8 +size 95057 diff --git a/UnrealProject/Lost_Edge/Content/UI/Blueprints/MainMenu/UI_MainMenuOptionsControls.uasset b/UnrealProject/Lost_Edge/Content/UI/Blueprints/MainMenu/UI_MainMenuOptionsControls.uasset index 828f58f..a52ed5d 100644 --- a/UnrealProject/Lost_Edge/Content/UI/Blueprints/MainMenu/UI_MainMenuOptionsControls.uasset +++ b/UnrealProject/Lost_Edge/Content/UI/Blueprints/MainMenu/UI_MainMenuOptionsControls.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a1c5e7352b100ccabe043eee5ffd02b83fd1b2d5109144c28c687609841291b0 -size 130173 +oid sha256:105aec43f2b8b03c59303dcc6742bba14821bd07590d0e1a3c3a6a465043be87 +size 129718 diff --git a/UnrealProject/Lost_Edge/Content/UI/Blueprints/MainMenu/UI_MainMenuOptionsGame.uasset b/UnrealProject/Lost_Edge/Content/UI/Blueprints/MainMenu/UI_MainMenuOptionsGame.uasset index 60b0c2c..c5d5491 100644 --- a/UnrealProject/Lost_Edge/Content/UI/Blueprints/MainMenu/UI_MainMenuOptionsGame.uasset +++ b/UnrealProject/Lost_Edge/Content/UI/Blueprints/MainMenu/UI_MainMenuOptionsGame.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:26321fde0b37a5dc8b876f8caee0d4c02eef2cb23264915a9aa181a53c133a93 -size 89011 +oid sha256:20a16a39b734aea1667daf868019d854e9b64e1471425e6a1caa7eb664bb76fb +size 88552 diff --git a/UnrealProject/Lost_Edge/Content/UI/Blueprints/MainMenu/UI_MainMenuOptionsVideo.uasset b/UnrealProject/Lost_Edge/Content/UI/Blueprints/MainMenu/UI_MainMenuOptionsVideo.uasset index 9405b9e..86c8b4a 100644 --- a/UnrealProject/Lost_Edge/Content/UI/Blueprints/MainMenu/UI_MainMenuOptionsVideo.uasset +++ b/UnrealProject/Lost_Edge/Content/UI/Blueprints/MainMenu/UI_MainMenuOptionsVideo.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:43af47b809caafb6762158d0d3521fe80d7cbae5efc46b511c5126d6a7708043 -size 116192 +oid sha256:56043613f6d61527de8ac8e6088022ef55d725b3a96b6fc53e6b5ad4aa2b0991 +size 115640 diff --git a/UnrealProject/Lost_Edge/Content/UI/Blueprints/UI_CameraMode.uasset b/UnrealProject/Lost_Edge/Content/UI/Blueprints/UI_CameraMode.uasset new file mode 100644 index 0000000..d7afef2 --- /dev/null +++ b/UnrealProject/Lost_Edge/Content/UI/Blueprints/UI_CameraMode.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:957aae0325c9a55b4fdc34a104cbf47874eaffd344b1879c0044055e8c17e3ca +size 23020 diff --git a/UnrealProject/Lost_Edge/Content/UI/Components/MainMenu/UIC_MainMenu_OptionsButton.uasset b/UnrealProject/Lost_Edge/Content/UI/Components/MainMenu/UIC_MainMenu_OptionsButton.uasset new file mode 100644 index 0000000..9af86dd --- /dev/null +++ b/UnrealProject/Lost_Edge/Content/UI/Components/MainMenu/UIC_MainMenu_OptionsButton.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5b086b58e78b4ef68b8bbe7f1f8946f7527c0fb57c2dc9a7a77f7ceb2e7409a8 +size 341219 diff --git a/UnrealProject/Lost_Edge/Content/UI/Components/MainMenu/UIC_MainMenu_OptionsCategory.uasset b/UnrealProject/Lost_Edge/Content/UI/Components/MainMenu/UIC_MainMenu_OptionsCategory.uasset new file mode 100644 index 0000000..9210b14 --- /dev/null +++ b/UnrealProject/Lost_Edge/Content/UI/Components/MainMenu/UIC_MainMenu_OptionsCategory.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ef994644b46a4ed535529b0327bd52fa76f0c8796097b6224921ecc448b87b5f +size 38214 diff --git a/UnrealProject/Lost_Edge/Content/UI/Components/MainMenu/UIC_MainMenu_OptionsComboBox.uasset b/UnrealProject/Lost_Edge/Content/UI/Components/MainMenu/UIC_MainMenu_OptionsComboBox.uasset new file mode 100644 index 0000000..8f974aa --- /dev/null +++ b/UnrealProject/Lost_Edge/Content/UI/Components/MainMenu/UIC_MainMenu_OptionsComboBox.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:72e80cfa9fbca423e52811b25984e2d8b74594eada2840ecc497749c5c87b996 +size 39355 diff --git a/UnrealProject/Lost_Edge/Content/UI/Components/MainMenu/UIC_MainMenu_OptionsKeySelector.uasset b/UnrealProject/Lost_Edge/Content/UI/Components/MainMenu/UIC_MainMenu_OptionsKeySelector.uasset new file mode 100644 index 0000000..3f36c24 --- /dev/null +++ b/UnrealProject/Lost_Edge/Content/UI/Components/MainMenu/UIC_MainMenu_OptionsKeySelector.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8a0ddf658d78675ea52a00a98cd8920884f4a2526b2d68cb6d739608c96563dc +size 39468 diff --git a/UnrealProject/Lost_Edge/Content/UI/Components/MainMenu/UIC_MainMenu_OptionsSlider.uasset b/UnrealProject/Lost_Edge/Content/UI/Components/MainMenu/UIC_MainMenu_OptionsSlider.uasset new file mode 100644 index 0000000..b3adfd0 --- /dev/null +++ b/UnrealProject/Lost_Edge/Content/UI/Components/MainMenu/UIC_MainMenu_OptionsSlider.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:29db694c09f8e1142aaf99e7d303445322bb5d47e9f73aca6f8e92a256b3d8d5 +size 55300 diff --git a/UnrealProject/Lost_Edge/Content/UI/Components/MainMenu/UIC_MainMenu_OptionsSwitchButton.uasset b/UnrealProject/Lost_Edge/Content/UI/Components/MainMenu/UIC_MainMenu_OptionsSwitchButton.uasset new file mode 100644 index 0000000..e894a43 --- /dev/null +++ b/UnrealProject/Lost_Edge/Content/UI/Components/MainMenu/UIC_MainMenu_OptionsSwitchButton.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:160cc1b89e0f6d31d6ae89b104ae344739d8dfa15dcdc7282df1ae2e66b784cd +size 39460 diff --git a/UnrealProject/Lost_Edge/Content/UI/Components/MainMenu/UIC_MainMenu_PageButton.uasset b/UnrealProject/Lost_Edge/Content/UI/Components/MainMenu/UIC_MainMenu_PageButton.uasset new file mode 100644 index 0000000..a3eea6d --- /dev/null +++ b/UnrealProject/Lost_Edge/Content/UI/Components/MainMenu/UIC_MainMenu_PageButton.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c9f005ac62de09eacf47c32db4129df4ed5e54069ee4ef937b3cfd1afe8d3d91 +size 358638 diff --git a/UnrealProject/Lost_Edge/Content/UI/Components/MainMenu/UIC_MainMenu_Title.uasset b/UnrealProject/Lost_Edge/Content/UI/Components/MainMenu/UIC_MainMenu_Title.uasset new file mode 100644 index 0000000..8790098 --- /dev/null +++ b/UnrealProject/Lost_Edge/Content/UI/Components/MainMenu/UIC_MainMenu_Title.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:bf3b43467c9fe8b2a23647036e4cc83587efcb3dc588d35dac76546d37059cc0 +size 447489 diff --git a/UnrealProject/Lost_Edge/Content/UI/Components/UIC_MainMenu_OptionsButton.uasset b/UnrealProject/Lost_Edge/Content/UI/Components/UIC_MainMenu_OptionsButton.uasset deleted file mode 100644 index 44cd3ff..0000000 --- a/UnrealProject/Lost_Edge/Content/UI/Components/UIC_MainMenu_OptionsButton.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d8eb2ca474902a3180db5dafe6dc2ac2d9972a83384bb6a3a05c2ba51d58005e -size 341174 diff --git a/UnrealProject/Lost_Edge/Content/UI/Components/UIC_MainMenu_OptionsCategory.uasset b/UnrealProject/Lost_Edge/Content/UI/Components/UIC_MainMenu_OptionsCategory.uasset deleted file mode 100644 index 6e8eb9f..0000000 --- a/UnrealProject/Lost_Edge/Content/UI/Components/UIC_MainMenu_OptionsCategory.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:02463404f82d89ab8062a78728dc6a77e2246cb51522b5e47567d14649e8c12c -size 38169 diff --git a/UnrealProject/Lost_Edge/Content/UI/Components/UIC_MainMenu_OptionsComboBox.uasset b/UnrealProject/Lost_Edge/Content/UI/Components/UIC_MainMenu_OptionsComboBox.uasset deleted file mode 100644 index ea80e93..0000000 --- a/UnrealProject/Lost_Edge/Content/UI/Components/UIC_MainMenu_OptionsComboBox.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:aa41827ace0e485a32ad9ba233912f258ee5cfd0990ccdd117eaa007cb8379ae -size 39310 diff --git a/UnrealProject/Lost_Edge/Content/UI/Components/UIC_MainMenu_OptionsKeySelector.uasset b/UnrealProject/Lost_Edge/Content/UI/Components/UIC_MainMenu_OptionsKeySelector.uasset deleted file mode 100644 index b8c0590..0000000 --- a/UnrealProject/Lost_Edge/Content/UI/Components/UIC_MainMenu_OptionsKeySelector.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:3e7383a2ca520d9cae3f262a2f4c2d858f9e27921bda642df800558977fc0b0a -size 39423 diff --git a/UnrealProject/Lost_Edge/Content/UI/Components/UIC_MainMenu_OptionsSlider.uasset b/UnrealProject/Lost_Edge/Content/UI/Components/UIC_MainMenu_OptionsSlider.uasset deleted file mode 100644 index 89dcec6..0000000 --- a/UnrealProject/Lost_Edge/Content/UI/Components/UIC_MainMenu_OptionsSlider.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:b22ad29cebdf628e50306fa7ec0eadfd98d8f817bd02cee0f1e7c0186070ee49 -size 55275 diff --git a/UnrealProject/Lost_Edge/Content/UI/Components/UIC_MainMenu_OptionsSwitchButton.uasset b/UnrealProject/Lost_Edge/Content/UI/Components/UIC_MainMenu_OptionsSwitchButton.uasset deleted file mode 100644 index 1fb0cc3..0000000 --- a/UnrealProject/Lost_Edge/Content/UI/Components/UIC_MainMenu_OptionsSwitchButton.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:ccdc4694adbbda575bd02ebfdc77f17e4020fce859243133ad4e999dacb14ff2 -size 39415 diff --git a/UnrealProject/Lost_Edge/Content/UI/Components/UIC_MainMenu_PageButton.uasset b/UnrealProject/Lost_Edge/Content/UI/Components/UIC_MainMenu_PageButton.uasset deleted file mode 100644 index 994ba3e..0000000 --- a/UnrealProject/Lost_Edge/Content/UI/Components/UIC_MainMenu_PageButton.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f3ca9755fe19acf488007b1ed6ca99f8ef93f8bfce932d0939fab5502b136e55 -size 358593 diff --git a/UnrealProject/Lost_Edge/Content/UI/Components/UIC_MainMenu_Title.uasset b/UnrealProject/Lost_Edge/Content/UI/Components/UIC_MainMenu_Title.uasset deleted file mode 100644 index a73c9d5..0000000 --- a/UnrealProject/Lost_Edge/Content/UI/Components/UIC_MainMenu_Title.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:1643864c41e24f3b31d7cc2e7ae81d5a81662e040da7ed680094fc3035edcb02 -size 447458 diff --git a/UnrealProject/Lost_Edge/Source/Lost_Edge/Private/CameraModeBase.cpp b/UnrealProject/Lost_Edge/Source/Lost_Edge/Private/CameraModeBase.cpp index 1742346..af0b6fe 100644 --- a/UnrealProject/Lost_Edge/Source/Lost_Edge/Private/CameraModeBase.cpp +++ b/UnrealProject/Lost_Edge/Source/Lost_Edge/Private/CameraModeBase.cpp @@ -67,4 +67,4 @@ void ACameraModeBase::SwitchRun(bool run) // GetMovement()->MaxWalkSpeed = moveSpeed * runSpeedMultiplier; //else // GetCharacterMovement()->MaxWalkSpeed = moveSpeed; -} \ No newline at end of file +} diff --git a/UnrealProject/Lost_Edge/Source/Lost_Edge/Private/Widgets/InteractableHintWidget.h b/UnrealProject/Lost_Edge/Source/Lost_Edge/Private/Widgets/InteractableHintWidget.h index 1002430..00a9fb6 100644 --- a/UnrealProject/Lost_Edge/Source/Lost_Edge/Private/Widgets/InteractableHintWidget.h +++ b/UnrealProject/Lost_Edge/Source/Lost_Edge/Private/Widgets/InteractableHintWidget.h @@ -13,8 +13,8 @@ class UInteractableHintWidget : public UResolutionResponsiveUserWidget, public I GENERATED_BODY() public: - UPROPERTY(meta = (BindWidget)) + UPROPERTY(BlueprintReadWrite, meta = (BindWidget)) class UTextBlock* keyText; - UPROPERTY(meta = (BindWidget)) + UPROPERTY(BlueprintReadWrite, meta = (BindWidget)) class UTextBlock* descriptionText; }; diff --git a/UnrealProject/Lost_Edge/Source/Lost_Edge/Private/Widgets/PhotoModeWidget.cpp b/UnrealProject/Lost_Edge/Source/Lost_Edge/Private/Widgets/PhotoModeWidget.cpp new file mode 100644 index 0000000..f910eaf --- /dev/null +++ b/UnrealProject/Lost_Edge/Source/Lost_Edge/Private/Widgets/PhotoModeWidget.cpp @@ -0,0 +1,5 @@ +// Oleg Petruny proprietary. + + +#include "PhotoModeWidget.h" + diff --git a/UnrealProject/Lost_Edge/Source/Lost_Edge/Private/Widgets/PhotoModeWidget.h b/UnrealProject/Lost_Edge/Source/Lost_Edge/Private/Widgets/PhotoModeWidget.h new file mode 100644 index 0000000..a87a4a3 --- /dev/null +++ b/UnrealProject/Lost_Edge/Source/Lost_Edge/Private/Widgets/PhotoModeWidget.h @@ -0,0 +1,22 @@ +// Oleg Petruny proprietary. + +#pragma once + +#include "Blueprint/UserWidget.h" + +#include "PhotoModeWidget.generated.h" + +UCLASS(Blueprintable, Abstract) +class UPhotoModeWidget : public UUserWidget +{ + GENERATED_BODY() + +public: + // hints + UPROPERTY(meta = (BindWidget)) + class UInteractableHintWidget* move; + UPROPERTY(meta = (BindWidget)) + class UInteractableHintWidget* rotate; + UPROPERTY(meta = (BindWidget)) + class UInteractableHintWidget* distace; +}; diff --git a/UnrealProject/Lost_Edge/Source/Lost_Edge/Private/Widgets/QuickTimeEventWidget.cpp b/UnrealProject/Lost_Edge/Source/Lost_Edge/Private/Widgets/QuickTimeEventWidget.cpp index 56923d7..6d27a63 100644 --- a/UnrealProject/Lost_Edge/Source/Lost_Edge/Private/Widgets/QuickTimeEventWidget.cpp +++ b/UnrealProject/Lost_Edge/Source/Lost_Edge/Private/Widgets/QuickTimeEventWidget.cpp @@ -9,6 +9,8 @@ void UQuickTimeEventWidget::NativeConstruct() { + Super::NativeConstruct(); + FWidgetAnimationDynamicEvent onTimerFinish; onTimerFinish.BindDynamic(this, &UQuickTimeEventWidget::RemoveEvent); BindToAnimationFinished(eventAnimation, onTimerFinish); @@ -16,8 +18,6 @@ void UQuickTimeEventWidget::NativeConstruct() FWidgetAnimationDynamicEvent onRemove; onRemove.BindDynamic(this, &UQuickTimeEventWidget::RemoveFromManager); BindToAnimationFinished(removeAnimation, onRemove); - - return Super::NativeConstruct(); } void UQuickTimeEventWidget::Show()