diff --git a/.vsconfig b/.vsconfig new file mode 100644 index 0000000..b9be525 --- /dev/null +++ b/.vsconfig @@ -0,0 +1,17 @@ +{ + "version": "1.0", + "components": [ + "Microsoft.Net.Component.4.6.2.TargetingPack", + "Microsoft.VisualStudio.Component.VC.14.33.17.3.ARM64", + "Microsoft.VisualStudio.Component.VC.14.33.17.3.x86.x64", + "Microsoft.VisualStudio.Component.VC.Tools.ARM64", + "Microsoft.VisualStudio.Component.VC.Tools.x86.x64", + "Microsoft.VisualStudio.Component.Windows10SDK", + "Microsoft.VisualStudio.Workload.CoreEditor", + "Microsoft.VisualStudio.Workload.ManagedDesktop", + "Microsoft.VisualStudio.Workload.NativeCrossPlat", + "Microsoft.VisualStudio.Workload.NativeDesktop", + "Microsoft.VisualStudio.Workload.NativeGame", + "Microsoft.VisualStudio.Workload.Universal" + ] +} diff --git a/Config/DefaultInput.ini b/Config/DefaultInput.ini index 4071fe7..a87dbd8 100644 --- a/Config/DefaultInput.ini +++ b/Config/DefaultInput.ini @@ -66,6 +66,10 @@ bEnableMouseSmoothing=True bEnableFOVScaling=True bCaptureMouseOnLaunch=True bEnableLegacyInputScales=True +bEnableMotionControls=True +bFilterInputByPlatformUser=False +bShouldFlushPressedKeysOnViewportFocusLost=True +bEnableDynamicComponentInputBinding=True bAlwaysShowTouchInterface=False bShowConsoleOnFourFingerTap=True bEnableGestureRecognizer=False @@ -88,8 +92,8 @@ DoubleClickTime=0.200000 +AxisMappings=(AxisName="Move Right / Left",Scale=1.000000,Key=Gamepad_LeftX) +AxisMappings=(AxisName="Turn Right / Left Gamepad",Scale=1.000000,Key=Gamepad_RightX) +AxisMappings=(AxisName="Turn Right / Left Mouse",Scale=1.000000,Key=MouseX) -DefaultPlayerInputClass=/Script/Engine.PlayerInput -DefaultInputComponentClass=/Script/Engine.InputComponent +DefaultPlayerInputClass=/Script/EnhancedInput.EnhancedPlayerInput +DefaultInputComponentClass=/Script/EnhancedInput.EnhancedInputComponent DefaultTouchInterface=/Engine/MobileResources/HUD/DefaultVirtualJoysticks.DefaultVirtualJoysticks -ConsoleKeys=Tilde +ConsoleKeys=Tilde diff --git a/Content/BlueprintAI/AI/AIBruh.uasset b/Content/BlueprintAI/AI/AIBruh.uasset deleted file mode 100644 index 7f66a5d..0000000 --- a/Content/BlueprintAI/AI/AIBruh.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:00355cc4cc35ae2c9f89e2d354d85bc03e381be905d58e97cf94ab45a4461e7a -size 41496 diff --git a/Content/BlueprintAI/AI/AIC_Enemy.uasset b/Content/BlueprintAI/AI/AIC_Enemy.uasset new file mode 100644 index 0000000..e1b26b6 --- /dev/null +++ b/Content/BlueprintAI/AI/AIC_Enemy.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a24190ad860f80d21530b4f7e63ae0a00a13eb36dac10158dd76ef0d9efa4a42 +size 99767 diff --git a/Content/BlueprintAI/AI/AIControllerBruh.uasset b/Content/BlueprintAI/AI/AIControllerBruh.uasset deleted file mode 100644 index 80d88e1..0000000 --- a/Content/BlueprintAI/AI/AIControllerBruh.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:b3bf037902c2aa1ed7ada853c5c16a27b948ee58bab4fec7dfc395a7003cd94c -size 97758 diff --git a/Content/BlueprintAI/AI/AI_Enemy.uasset b/Content/BlueprintAI/AI/AI_Enemy.uasset new file mode 100644 index 0000000..42513ee --- /dev/null +++ b/Content/BlueprintAI/AI/AI_Enemy.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:dcbb0b9a3b977cbc0b118d39d46872a58ea7a0a3aac47d54d8f71f360290b20d +size 41778 diff --git a/Content/BlueprintAI/AI/BB_Bruh.uasset b/Content/BlueprintAI/AI/BB_Bruh.uasset deleted file mode 100644 index eb2a9c4..0000000 --- a/Content/BlueprintAI/AI/BB_Bruh.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:ce06c83d3fb6de31969bb35560261ff6484b73769fa4ed0034a288412f2b5043 -size 3186 diff --git a/Content/BlueprintAI/AI/BB_Enemy.uasset b/Content/BlueprintAI/AI/BB_Enemy.uasset new file mode 100644 index 0000000..270d21a --- /dev/null +++ b/Content/BlueprintAI/AI/BB_Enemy.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0aff3acf09665251d4d555665e670ee95f5da821709d12007e0b2199719219f7 +size 3242 diff --git a/Content/BlueprintAI/AI/BTT_Chase.uasset b/Content/BlueprintAI/AI/BTT_Chase.uasset new file mode 100644 index 0000000..b65222e --- /dev/null +++ b/Content/BlueprintAI/AI/BTT_Chase.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c19d2751b220ef82aaf4595d814cd9914c2a12374d75cb37738340d420d06cb3 +size 31269 diff --git a/Content/BlueprintAI/AI/BTT_ChaseBruh.uasset b/Content/BlueprintAI/AI/BTT_ChaseBruh.uasset deleted file mode 100644 index cacd89d..0000000 --- a/Content/BlueprintAI/AI/BTT_ChaseBruh.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:da96ad8696b48b09139d79173aea8aea87bfb325c8f817e7ccf413d95f3f034f -size 39894 diff --git a/Content/BlueprintAI/AI/BTT_FindRandomPatrol.uasset b/Content/BlueprintAI/AI/BTT_FindRandomPatrol.uasset index 807d1e7..e7f789a 100644 --- a/Content/BlueprintAI/AI/BTT_FindRandomPatrol.uasset +++ b/Content/BlueprintAI/AI/BTT_FindRandomPatrol.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9e43806e218b2a418ac31effd7f2176abb4139bada4f1c1926ef88c8631f1e61 -size 54912 +oid sha256:c3e85a3027ee35a4063605141ed394bbdf8394836c922f7e39e94b38fce6dab7 +size 54851 diff --git a/Content/BlueprintAI/AI/BT_Bruh.uasset b/Content/BlueprintAI/AI/BT_Bruh.uasset deleted file mode 100644 index 86eea54..0000000 --- a/Content/BlueprintAI/AI/BT_Bruh.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:763fab31bd68e18db0b672704d345ec04c68b7083e63faec3cb414151c783efc -size 17930 diff --git a/Content/BlueprintAI/AI/BT_Enemy.uasset b/Content/BlueprintAI/AI/BT_Enemy.uasset new file mode 100644 index 0000000..192d2fd --- /dev/null +++ b/Content/BlueprintAI/AI/BT_Enemy.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f74c2c2cbc65c9b6c9d2ea27596e0c9ba4254cb8b6aff27c370d69cf78fc8ec9 +size 20809 diff --git a/Content/BlueprintAI/BruhAI/AIBruh.uasset b/Content/BlueprintAI/BruhAI/AIBruh.uasset new file mode 100644 index 0000000..6ddf5c2 --- /dev/null +++ b/Content/BlueprintAI/BruhAI/AIBruh.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d81fc1ff6729a5b19e530bec898db45bb0b5616be5188ed02885b7b4010024d3 +size 41728 diff --git a/Content/BlueprintAI/BruhAI/AIControllerBruh.uasset b/Content/BlueprintAI/BruhAI/AIControllerBruh.uasset new file mode 100644 index 0000000..e0fd909 --- /dev/null +++ b/Content/BlueprintAI/BruhAI/AIControllerBruh.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:110b66fd217b202f18c088b27d870c0e91db229301853c5df6112b82a11d306e +size 97304 diff --git a/Content/BlueprintAI/BruhAI/BB_Bruh.uasset b/Content/BlueprintAI/BruhAI/BB_Bruh.uasset new file mode 100644 index 0000000..ea162ad --- /dev/null +++ b/Content/BlueprintAI/BruhAI/BB_Bruh.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5797940eaca9802f1dacf99e3f1a7ba0300206ad6f398f19dbf7999d893cd9f0 +size 3239 diff --git a/Content/BlueprintAI/BruhAI/BTT_ChaseBruh.uasset b/Content/BlueprintAI/BruhAI/BTT_ChaseBruh.uasset new file mode 100644 index 0000000..9379138 --- /dev/null +++ b/Content/BlueprintAI/BruhAI/BTT_ChaseBruh.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:25b365f89983007bd73c5e07125e6953d4271ee6e10045cf7da5bcbe6edef40a +size 38927 diff --git a/Content/BlueprintAI/BruhAI/BTT_FindRandomPatrol.uasset b/Content/BlueprintAI/BruhAI/BTT_FindRandomPatrol.uasset new file mode 100644 index 0000000..152bcf6 --- /dev/null +++ b/Content/BlueprintAI/BruhAI/BTT_FindRandomPatrol.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:cfa592f9f7b842cc11f9a9963cfd6345bba9ef837c32e4cf3282981ce5a0e074 +size 54887 diff --git a/Content/BlueprintAI/BruhAI/BT_Bruh.uasset b/Content/BlueprintAI/BruhAI/BT_Bruh.uasset new file mode 100644 index 0000000..2f6610f --- /dev/null +++ b/Content/BlueprintAI/BruhAI/BT_Bruh.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1e3ccf2bfc00b7c389d880be5b815b892af869d7aa39b700dd9c11192d1de994 +size 17739 diff --git a/Source/the_twilight_abyss/InteractableEnvironment/InteractableEnvironmentObject.h b/Source/the_twilight_abyss/InteractableEnvironment/InteractableEnvironmentObject.h index c650652..fc376ff 100644 --- a/Source/the_twilight_abyss/InteractableEnvironment/InteractableEnvironmentObject.h +++ b/Source/the_twilight_abyss/InteractableEnvironment/InteractableEnvironmentObject.h @@ -24,7 +24,7 @@ public: // Called every frame virtual void TickComponent(float DeltaTime, ELevelTick TickType, FActorComponentTickFunction* ThisTickFunction) override; - UPROPERTY(EditDefaults) + UPROPERTY(EditDefaultsOnly) bool bInteractable = false; UFUNCTION(Blueprintcallable) diff --git a/Source/the_twilight_abyss/TurnBasedCombatV2/TurnBaseCombatV2.cpp b/Source/the_twilight_abyss/TurnBasedCombatV2/TurnBaseCombatV2.cpp index 12fd087..7a73bb1 100644 --- a/Source/the_twilight_abyss/TurnBasedCombatV2/TurnBaseCombatV2.cpp +++ b/Source/the_twilight_abyss/TurnBasedCombatV2/TurnBaseCombatV2.cpp @@ -327,10 +327,10 @@ void ATurnBaseCombatV2::UpdateResourceBars() const void ATurnBaseCombatV2::ToggleButtons() const { - FButton->SetIsEnabled(!FButton->bIsEnabled); - WButton->SetIsEnabled(!WButton->bIsEnabled); - BackspaceButton->SetIsEnabled(!BackspaceButton->bIsEnabled); - CastButton->SetIsEnabled(!CastButton->bIsEnabled); + FButton->SetIsEnabled(!FButton->GetIsEnabled()); + WButton->SetIsEnabled(!WButton->GetIsEnabled()); + BackspaceButton->SetIsEnabled(!BackspaceButton->GetIsEnabled()); + CastButton->SetIsEnabled(!CastButton->GetIsEnabled()); } void ATurnBaseCombatV2::EnemyTurn() diff --git a/the_twilight_abyss.uproject b/the_twilight_abyss.uproject index 4f33989..73e857f 100644 --- a/the_twilight_abyss.uproject +++ b/the_twilight_abyss.uproject @@ -1,6 +1,6 @@ { "FileVersion": 3, - "EngineAssociation": "5.0", + "EngineAssociation": "5.1", "Category": "", "Description": "", "Modules": [