diff --git a/UnrealProject/Lost_Edge/Content/Blueprints/EUBP_EditorUtilities.uasset b/UnrealProject/Lost_Edge/Content/Blueprints/EUBP_EditorUtilities.uasset new file mode 100644 index 0000000..bf8528c --- /dev/null +++ b/UnrealProject/Lost_Edge/Content/Blueprints/EUBP_EditorUtilities.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:920d22a6999d6233250eef9a3b42e092428b29ad7297f071f8abb524baec4290 +size 42224 diff --git a/UnrealProject/Lost_Edge/Content/Blueprints/Minigames/AgeOfWar/UI_Minigame_AgeOfWar.uasset b/UnrealProject/Lost_Edge/Content/Blueprints/Minigames/AgeOfWar/UI_Minigame_AgeOfWar.uasset index 08c3412..9f5c5a6 100644 --- a/UnrealProject/Lost_Edge/Content/Blueprints/Minigames/AgeOfWar/UI_Minigame_AgeOfWar.uasset +++ b/UnrealProject/Lost_Edge/Content/Blueprints/Minigames/AgeOfWar/UI_Minigame_AgeOfWar.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:bd73e8683b46355038b4921e52202d05b44eebfd571f83a1feb38656267e960d -size 212213 +oid sha256:72ed0e104513dd6ecbc8f74c552bbc2916c117a290a8896b0b73686fff8fb1d6 +size 212913 diff --git a/UnrealProject/Lost_Edge/Content/Blueprints/Minigames/Fishing/UI_Minigame_Fishing.uasset b/UnrealProject/Lost_Edge/Content/Blueprints/Minigames/Fishing/UI_Minigame_Fishing.uasset index d45693e..3f55ec9 100644 --- a/UnrealProject/Lost_Edge/Content/Blueprints/Minigames/Fishing/UI_Minigame_Fishing.uasset +++ b/UnrealProject/Lost_Edge/Content/Blueprints/Minigames/Fishing/UI_Minigame_Fishing.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:306c27ad9488349c97e003ec5c4e49d5f3383bd33c407c89ee9dc25dd4039148 -size 486840 +oid sha256:e93cb8b3d14817ca9d141c35aafa937b8e2a6a14acb2fb0d0f1ffc9972637257 +size 482940 diff --git a/UnrealProject/Lost_Edge/Content/Blueprints/Minigames/RythmClick/UIC_Minigame_RythmClickButton.uasset b/UnrealProject/Lost_Edge/Content/Blueprints/Minigames/RythmClick/UIC_Minigame_RythmClickButton.uasset index a972c64..5fcf18e 100644 --- a/UnrealProject/Lost_Edge/Content/Blueprints/Minigames/RythmClick/UIC_Minigame_RythmClickButton.uasset +++ b/UnrealProject/Lost_Edge/Content/Blueprints/Minigames/RythmClick/UIC_Minigame_RythmClickButton.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a90f2e194848e2aeabe1476bf66c531e909fd915fe7db13695632fd8ea1ad5f5 -size 248722 +oid sha256:639a147377af2a194fbb977ca1394e21deec184f532a28dd55d7b27b4488dcfc +size 247253 diff --git a/UnrealProject/Lost_Edge/Content/UI/Blueprints/Overlays/UI_Crosshair.uasset b/UnrealProject/Lost_Edge/Content/UI/Blueprints/Overlays/UI_Crosshair.uasset index 259987b..d535f98 100644 --- a/UnrealProject/Lost_Edge/Content/UI/Blueprints/Overlays/UI_Crosshair.uasset +++ b/UnrealProject/Lost_Edge/Content/UI/Blueprints/Overlays/UI_Crosshair.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ceda19c38cd2460d24dc73fae28c3f56bfefc14dd9d081f19a6216c2b94a7bf9 -size 15456 +oid sha256:be449754436e25a553da784db487d590b5990b9ab0edc3c04ea757d5acf218c7 +size 15255 diff --git a/UnrealProject/Lost_Edge/Content/UI/Blueprints/Overlays/UI_DevelopBuildWarning.uasset b/UnrealProject/Lost_Edge/Content/UI/Blueprints/Overlays/UI_DevelopBuildWarning.uasset index 635ea81..06b2d4d 100644 --- a/UnrealProject/Lost_Edge/Content/UI/Blueprints/Overlays/UI_DevelopBuildWarning.uasset +++ b/UnrealProject/Lost_Edge/Content/UI/Blueprints/Overlays/UI_DevelopBuildWarning.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d1e28d0627eb43f6ccbd5cdcd114c6c42ef13b93c1b72f975c05403b1559cb95 -size 13836 +oid sha256:7932c329679ea3c7d0ae5d5764dc839240321f676cad7bbebc55622326fd9b0f +size 13635 diff --git a/UnrealProject/Lost_Edge/Source/Lost_Edge/Private/Widgets/AutohideWidget.h b/UnrealProject/Lost_Edge/Source/Lost_Edge/Private/Widgets/AutohideWidget.h index 1cdc664..332a500 100644 --- a/UnrealProject/Lost_Edge/Source/Lost_Edge/Private/Widgets/AutohideWidget.h +++ b/UnrealProject/Lost_Edge/Source/Lost_Edge/Private/Widgets/AutohideWidget.h @@ -2,7 +2,7 @@ #pragma once -#include "ResolutionResponsiveUserWidget.h" +#include "ResolutionResponsiveWidget.h" #include "AutohideWidget.generated.h" @@ -10,7 +10,7 @@ * Automatically hides itself after some period */ UCLASS() -class UAutohideWidget : public UResolutionResponsiveUserWidget +class UAutohideWidget : public UResolutionResponsiveWidget { GENERATED_BODY() 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 f903e74..5fe62cc 100644 --- a/UnrealProject/Lost_Edge/Source/Lost_Edge/Private/Widgets/CutsceneSkipWidget.h +++ b/UnrealProject/Lost_Edge/Source/Lost_Edge/Private/Widgets/CutsceneSkipWidget.h @@ -3,14 +3,14 @@ #pragma once #include "InputAnimatedWidgetInterface.h" -#include "ResolutionResponsiveUserWidget.h" +#include "ResolutionResponsiveWidget.h" #include "CutsceneSkipWidget.generated.h" DECLARE_DYNAMIC_DELEGATE(FSkipCutsceneDelegate); UCLASS(Blueprintable, Abstract) -class UCutsceneSkipWidget : public UResolutionResponsiveUserWidget, public IInputAnimatedWidgetInterface +class UCutsceneSkipWidget : public UResolutionResponsiveWidget, public IInputAnimatedWidgetInterface { GENERATED_BODY() diff --git a/UnrealProject/Lost_Edge/Source/Lost_Edge/Private/Widgets/DialogueRowWidget.h b/UnrealProject/Lost_Edge/Source/Lost_Edge/Private/Widgets/DialogueRowWidget.h index 6241e72..7ac8ed8 100644 --- a/UnrealProject/Lost_Edge/Source/Lost_Edge/Private/Widgets/DialogueRowWidget.h +++ b/UnrealProject/Lost_Edge/Source/Lost_Edge/Private/Widgets/DialogueRowWidget.h @@ -2,14 +2,14 @@ #pragma once -#include "ResolutionResponsiveUserWidget.h" +#include "ResolutionResponsiveWidget.h" #include "DialogueRowWidget.generated.h" enum class EDialogueWaveType : uint8; UCLASS(Blueprintable, Abstract) -class UDialogueRowWidget : public UResolutionResponsiveUserWidget +class UDialogueRowWidget : public UResolutionResponsiveWidget { GENERATED_BODY() diff --git a/UnrealProject/Lost_Edge/Source/Lost_Edge/Private/Widgets/DialogueSkipWidget.h b/UnrealProject/Lost_Edge/Source/Lost_Edge/Private/Widgets/DialogueSkipWidget.h index 92e2deb..05bb62d 100644 --- a/UnrealProject/Lost_Edge/Source/Lost_Edge/Private/Widgets/DialogueSkipWidget.h +++ b/UnrealProject/Lost_Edge/Source/Lost_Edge/Private/Widgets/DialogueSkipWidget.h @@ -3,14 +3,14 @@ #pragma once #include "InputAnimatedWidgetInterface.h" -#include "ResolutionResponsiveUserWidget.h" +#include "ResolutionResponsiveWidget.h" #include "DialogueSkipWidget.generated.h" DECLARE_DYNAMIC_DELEGATE(FDialogueSkipDelegate); UCLASS(Blueprintable, Abstract) -class UDialogueSkipWidget : public UResolutionResponsiveUserWidget, public IInputAnimatedWidgetInterface +class UDialogueSkipWidget : public UResolutionResponsiveWidget, public IInputAnimatedWidgetInterface { GENERATED_BODY() 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..7d9bbdf 100644 --- a/UnrealProject/Lost_Edge/Source/Lost_Edge/Private/Widgets/InteractableHintWidget.h +++ b/UnrealProject/Lost_Edge/Source/Lost_Edge/Private/Widgets/InteractableHintWidget.h @@ -3,12 +3,12 @@ #pragma once #include "InputAnimatedWidgetInterface.h" -#include "ResolutionResponsiveUserWidget.h" +#include "ResolutionResponsiveWidget.h" #include "InteractableHintWidget.generated.h" UCLASS(Blueprintable, Abstract) -class UInteractableHintWidget : public UResolutionResponsiveUserWidget, public IInputAnimatedWidgetInterface +class UInteractableHintWidget : public UResolutionResponsiveWidget, public IInputAnimatedWidgetInterface { GENERATED_BODY() diff --git a/UnrealProject/Lost_Edge/Source/Lost_Edge/Private/Widgets/JournalWidget.h b/UnrealProject/Lost_Edge/Source/Lost_Edge/Private/Widgets/JournalWidget.h index 089036d..a49652b 100644 --- a/UnrealProject/Lost_Edge/Source/Lost_Edge/Private/Widgets/JournalWidget.h +++ b/UnrealProject/Lost_Edge/Source/Lost_Edge/Private/Widgets/JournalWidget.h @@ -3,7 +3,7 @@ #pragma once #include "AutohideWidget.h" -#include "ResolutionResponsiveUserWidget.h" +#include "ResolutionResponsiveWidget.h" #include "JournalWidget.generated.h" 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 a3678c5..a5bccff 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 @@ -2,7 +2,7 @@ #pragma once -#include "Widgets/ResolutionResponsiveUserWidget.h" +#include "Widgets/ResolutionResponsiveWidget.h" #include "MainMenuWidget.generated.h" diff --git a/UnrealProject/Lost_Edge/Source/Lost_Edge/Private/Widgets/QuickTimeEventWidget.h b/UnrealProject/Lost_Edge/Source/Lost_Edge/Private/Widgets/QuickTimeEventWidget.h index 680fa15..4b6a291 100644 --- a/UnrealProject/Lost_Edge/Source/Lost_Edge/Private/Widgets/QuickTimeEventWidget.h +++ b/UnrealProject/Lost_Edge/Source/Lost_Edge/Private/Widgets/QuickTimeEventWidget.h @@ -3,14 +3,14 @@ #pragma once #include "QuickTimeEvent.h" // forward declaration of EQuickTimeEventResult is somehow insufficient on some machines -#include "Widgets/ResolutionResponsiveUserWidget.h" +#include "Widgets/ResolutionResponsiveWidget.h" #include "QuickTimeEventWidget.generated.h" enum class EQuickTimeEventResult : uint8; UCLASS(Blueprintable, Abstract) -class UQuickTimeEventWidget : public UResolutionResponsiveUserWidget +class UQuickTimeEventWidget : public UResolutionResponsiveWidget { GENERATED_BODY() diff --git a/UnrealProject/Lost_Edge/Source/Lost_Edge/Private/Widgets/QuickTimeEventWidgetManager.h b/UnrealProject/Lost_Edge/Source/Lost_Edge/Private/Widgets/QuickTimeEventWidgetManager.h index ded4f4a..f13c8ae 100644 --- a/UnrealProject/Lost_Edge/Source/Lost_Edge/Private/Widgets/QuickTimeEventWidgetManager.h +++ b/UnrealProject/Lost_Edge/Source/Lost_Edge/Private/Widgets/QuickTimeEventWidgetManager.h @@ -2,7 +2,7 @@ #pragma once -#include "Widgets/WorldDilationResponsiveUserWidget.h" +#include "Widgets/WorldDilationResponsiveWidget.h" #include "QuickTimeEventWidgetManager.generated.h" @@ -12,7 +12,7 @@ enum class EQuickTimeEventResult : uint8; class UQuickTimeEventWidget; UCLASS(Blueprintable, Abstract) -class UQuickTimeEventWidgetManager : public UWorldDilationResponsiveUserWidget +class UQuickTimeEventWidgetManager : public UWorldDilationResponsiveWidget { GENERATED_BODY() diff --git a/UnrealProject/Lost_Edge/Source/Lost_Edge/Private/Widgets/ResolutionResponsiveUserWidget.cpp b/UnrealProject/Lost_Edge/Source/Lost_Edge/Private/Widgets/ResolutionResponsiveWidget.cpp similarity index 56% rename from UnrealProject/Lost_Edge/Source/Lost_Edge/Private/Widgets/ResolutionResponsiveUserWidget.cpp rename to UnrealProject/Lost_Edge/Source/Lost_Edge/Private/Widgets/ResolutionResponsiveWidget.cpp index fbfedde..2c4298a 100644 --- a/UnrealProject/Lost_Edge/Source/Lost_Edge/Private/Widgets/ResolutionResponsiveUserWidget.cpp +++ b/UnrealProject/Lost_Edge/Source/Lost_Edge/Private/Widgets/ResolutionResponsiveWidget.cpp @@ -1,18 +1,18 @@ // Oleg Petruny proprietary. -#include "ResolutionResponsiveUserWidget.h" +#include "ResolutionResponsiveWidget.h" #include "Components/PanelSlot.h" #include "UnrealClient.h" -bool UResolutionResponsiveUserWidget::Initialize() +bool UResolutionResponsiveWidget::Initialize() { - _viewportResizedEventHandle = FViewport::ViewportResizedEvent.AddUObject(this, &UResolutionResponsiveUserWidget::Rescale); + _viewportResizedEventHandle = FViewport::ViewportResizedEvent.AddUObject(this, &UResolutionResponsiveWidget::Rescale); return UUserWidget::Initialize(); } -void UResolutionResponsiveUserWidget::BeginDestroy() +void UResolutionResponsiveWidget::BeginDestroy() { if(_viewportResizedEventHandle.IsValid()) { @@ -22,18 +22,18 @@ void UResolutionResponsiveUserWidget::BeginDestroy() UUserWidget::BeginDestroy(); } -void UResolutionResponsiveUserWidget::Rescale(FViewport* ViewPort, uint32 val) +void UResolutionResponsiveWidget::Rescale(FViewport* ViewPort, uint32 val) { _scale = (float)defaultResolution / ViewPort->GetSizeXY().GetMin(); Rescale(); } -void UResolutionResponsiveUserWidget::Rescale_Implementation() +void UResolutionResponsiveWidget::Rescale_Implementation() { SetRenderScale(FVector2D{ _scale }); } -float UResolutionResponsiveUserWidget::GetScale() const +float UResolutionResponsiveWidget::GetScale() const { return _scale; } \ No newline at end of file diff --git a/UnrealProject/Lost_Edge/Source/Lost_Edge/Private/Widgets/ResolutionResponsiveUserWidget.h b/UnrealProject/Lost_Edge/Source/Lost_Edge/Private/Widgets/ResolutionResponsiveWidget.h similarity index 87% rename from UnrealProject/Lost_Edge/Source/Lost_Edge/Private/Widgets/ResolutionResponsiveUserWidget.h rename to UnrealProject/Lost_Edge/Source/Lost_Edge/Private/Widgets/ResolutionResponsiveWidget.h index 159a5d4..5e6300d 100644 --- a/UnrealProject/Lost_Edge/Source/Lost_Edge/Private/Widgets/ResolutionResponsiveUserWidget.h +++ b/UnrealProject/Lost_Edge/Source/Lost_Edge/Private/Widgets/ResolutionResponsiveWidget.h @@ -4,13 +4,13 @@ #include "Blueprint/UserWidget.h" -#include "ResolutionResponsiveUserWidget.generated.h" +#include "ResolutionResponsiveWidget.generated.h" /** * Automatically scale itself for current resolution to keep UI sizes universal. */ UCLASS() -class UResolutionResponsiveUserWidget : public UUserWidget +class UResolutionResponsiveWidget : public UUserWidget { GENERATED_BODY() diff --git a/UnrealProject/Lost_Edge/Source/Lost_Edge/Private/Widgets/WorldDilationResponsiveUserWidget.cpp b/UnrealProject/Lost_Edge/Source/Lost_Edge/Private/Widgets/WorldDilationResponsiveWidget.cpp similarity index 80% rename from UnrealProject/Lost_Edge/Source/Lost_Edge/Private/Widgets/WorldDilationResponsiveUserWidget.cpp rename to UnrealProject/Lost_Edge/Source/Lost_Edge/Private/Widgets/WorldDilationResponsiveWidget.cpp index e427bd5..e6b64f0 100644 --- a/UnrealProject/Lost_Edge/Source/Lost_Edge/Private/Widgets/WorldDilationResponsiveUserWidget.cpp +++ b/UnrealProject/Lost_Edge/Source/Lost_Edge/Private/Widgets/WorldDilationResponsiveWidget.cpp @@ -1,6 +1,6 @@ // Oleg Petruny proprietary. -#include "WorldDilationResponsiveUserWidget.h" +#include "WorldDilationResponsiveWidget.h" #include "Animation/UMGSequencePlayer.h" #include "Animation/WidgetAnimation.h" @@ -8,21 +8,21 @@ #include "CommonFunctions.h" -bool UWorldDilationResponsiveUserWidget::Initialize() +bool UWorldDilationResponsiveWidget::Initialize() { - UCommonFunctions::GetWorldDilationChangedDelegate().AddDynamic(this, &UWorldDilationResponsiveUserWidget::UpdateAnimations); + UCommonFunctions::GetWorldDilationChangedDelegate().AddDynamic(this, &UWorldDilationResponsiveWidget::UpdateAnimations); return UUserWidget::Initialize(); } -void UWorldDilationResponsiveUserWidget::BeginDestroy() +void UWorldDilationResponsiveWidget::BeginDestroy() { - UCommonFunctions::GetWorldDilationChangedDelegate().RemoveDynamic(this, &UWorldDilationResponsiveUserWidget::UpdateAnimations); + UCommonFunctions::GetWorldDilationChangedDelegate().RemoveDynamic(this, &UWorldDilationResponsiveWidget::UpdateAnimations); UUserWidget::BeginDestroy(); } -void UWorldDilationResponsiveUserWidget::UpdateAnimations(float newSpeed) +void UWorldDilationResponsiveWidget::UpdateAnimations(float newSpeed) { UpdateAnimation(GetRootWidget(), newSpeed); @@ -70,7 +70,7 @@ void UWorldDilationResponsiveUserWidget::UpdateAnimations(float newSpeed) } } -void UWorldDilationResponsiveUserWidget::UpdateAnimation(UWidget* widget, float newSpeed) +void UWorldDilationResponsiveWidget::UpdateAnimation(UWidget* widget, float newSpeed) { if(auto userWidget = Cast(widget)) { diff --git a/UnrealProject/Lost_Edge/Source/Lost_Edge/Private/Widgets/WorldDilationResponsiveUserWidget.h b/UnrealProject/Lost_Edge/Source/Lost_Edge/Private/Widgets/WorldDilationResponsiveWidget.h similarity index 80% rename from UnrealProject/Lost_Edge/Source/Lost_Edge/Private/Widgets/WorldDilationResponsiveUserWidget.h rename to UnrealProject/Lost_Edge/Source/Lost_Edge/Private/Widgets/WorldDilationResponsiveWidget.h index c6535bc..e221496 100644 --- a/UnrealProject/Lost_Edge/Source/Lost_Edge/Private/Widgets/WorldDilationResponsiveUserWidget.h +++ b/UnrealProject/Lost_Edge/Source/Lost_Edge/Private/Widgets/WorldDilationResponsiveWidget.h @@ -4,13 +4,13 @@ #include "Blueprint/UserWidget.h" -#include "WorldDilationResponsiveUserWidget.generated.h" +#include "WorldDilationResponsiveWidget.generated.h" /** * Automatically update animations speed to sync with world time dilation */ UCLASS() -class UWorldDilationResponsiveUserWidget : public UUserWidget +class UWorldDilationResponsiveWidget : public UUserWidget { GENERATED_BODY()