From b02344f25698b1e0476c5a45162ef446576950da Mon Sep 17 00:00:00 2001 From: Kevin Poretti Date: Mon, 16 Jan 2023 15:15:25 -0500 Subject: [PATCH] Start of pause menu --- GravityStomp/Content/Characters/BP_GSCharacter.uasset | 4 ++-- GravityStomp/Content/Core/BP_GSDefaultGameMode.uasset | 4 ++-- GravityStomp/Content/Core/BP_GSPlayerController.uasset | 3 +++ GravityStomp/Content/Input/Actions/IA_Canel.uasset | 3 +++ GravityStomp/Content/Input/Actions/IA_Confirm.uasset | 3 +++ GravityStomp/Content/Input/Actions/IA_Pause.uasset | 3 +++ GravityStomp/Content/Input/IMC_Default.uasset | 4 ++-- GravityStomp/Content/Maps/Debug/Test.umap | 4 ++-- GravityStomp/Content/UI/InGame/WBP_PauseMenu.uasset | 3 +++ .../Source/GravityStompGame/Character/GSCharacter.cpp | 8 +++++++- 10 files changed, 30 insertions(+), 9 deletions(-) create mode 100644 GravityStomp/Content/Core/BP_GSPlayerController.uasset create mode 100644 GravityStomp/Content/Input/Actions/IA_Canel.uasset create mode 100644 GravityStomp/Content/Input/Actions/IA_Confirm.uasset create mode 100644 GravityStomp/Content/Input/Actions/IA_Pause.uasset create mode 100644 GravityStomp/Content/UI/InGame/WBP_PauseMenu.uasset diff --git a/GravityStomp/Content/Characters/BP_GSCharacter.uasset b/GravityStomp/Content/Characters/BP_GSCharacter.uasset index 17d507b..d06debc 100644 --- a/GravityStomp/Content/Characters/BP_GSCharacter.uasset +++ b/GravityStomp/Content/Characters/BP_GSCharacter.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3ac93d44483e90705c8918a2fccdcfee87d2aa9e2eab6b590111a495f7415d46 -size 269438 +oid sha256:42116c51f8207e548b8546fa87ad3848cd8a23ea5d754875443bf5e8c88daf87 +size 280698 diff --git a/GravityStomp/Content/Core/BP_GSDefaultGameMode.uasset b/GravityStomp/Content/Core/BP_GSDefaultGameMode.uasset index a3471cf..0c808fa 100644 --- a/GravityStomp/Content/Core/BP_GSDefaultGameMode.uasset +++ b/GravityStomp/Content/Core/BP_GSDefaultGameMode.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6b335fa1dc56a0cae495e5340c5e4b751437b7370cfbb165c405444a86d2bebd -size 55782 +oid sha256:d839738bc1cfa5f17ffb11a722d985fc43528f0855174f76d6023a891ffe8148 +size 55458 diff --git a/GravityStomp/Content/Core/BP_GSPlayerController.uasset b/GravityStomp/Content/Core/BP_GSPlayerController.uasset new file mode 100644 index 0000000..d0eb6c0 --- /dev/null +++ b/GravityStomp/Content/Core/BP_GSPlayerController.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e7f06796e2e6efea4c62476097d961e1be96d26fc3cfa48310560f35e2a1ec23 +size 108597 diff --git a/GravityStomp/Content/Input/Actions/IA_Canel.uasset b/GravityStomp/Content/Input/Actions/IA_Canel.uasset new file mode 100644 index 0000000..e031be4 --- /dev/null +++ b/GravityStomp/Content/Input/Actions/IA_Canel.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:acd49dac80eb3ba21ceea40301d327b8e76c6d5954006cf2820c6524b4b27047 +size 1331 diff --git a/GravityStomp/Content/Input/Actions/IA_Confirm.uasset b/GravityStomp/Content/Input/Actions/IA_Confirm.uasset new file mode 100644 index 0000000..bb47e1b --- /dev/null +++ b/GravityStomp/Content/Input/Actions/IA_Confirm.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f0cb2b1467e84b452a817344d747022db6a0be6871da931287e141ba3791e8c8 +size 1341 diff --git a/GravityStomp/Content/Input/Actions/IA_Pause.uasset b/GravityStomp/Content/Input/Actions/IA_Pause.uasset new file mode 100644 index 0000000..b247e83 --- /dev/null +++ b/GravityStomp/Content/Input/Actions/IA_Pause.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1bd04f0ccb1914998783260e5b2290f1456e9815ecfaff0ffd985e4eef393656 +size 1331 diff --git a/GravityStomp/Content/Input/IMC_Default.uasset b/GravityStomp/Content/Input/IMC_Default.uasset index cf35db9..40f8fb0 100644 --- a/GravityStomp/Content/Input/IMC_Default.uasset +++ b/GravityStomp/Content/Input/IMC_Default.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:556c1f1e4c428a8eaf8bdd0173e1abcdaa21305a47ea1007d31a34bfbd5571ea -size 17174 +oid sha256:7d0c4ad9d9829436d6c55417bdf783fabde828afe63a36c99bf1f5fabc85d71a +size 21552 diff --git a/GravityStomp/Content/Maps/Debug/Test.umap b/GravityStomp/Content/Maps/Debug/Test.umap index a7f7ffd..3770bfd 100644 --- a/GravityStomp/Content/Maps/Debug/Test.umap +++ b/GravityStomp/Content/Maps/Debug/Test.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:18e0a97b5772a4053933e58c1c1d3548182f97d77ca26886970de7153c7dd803 -size 52403 +oid sha256:d2ec801ff291f8f3afc303088714ffd667f5b20dc365b9d2cf11cba3226e384a +size 52147 diff --git a/GravityStomp/Content/UI/InGame/WBP_PauseMenu.uasset b/GravityStomp/Content/UI/InGame/WBP_PauseMenu.uasset new file mode 100644 index 0000000..4a77868 --- /dev/null +++ b/GravityStomp/Content/UI/InGame/WBP_PauseMenu.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4e94405909ce1a312a619db39f56844beee4a17e67a21c987d0d03a455c721c0 +size 139072 diff --git a/GravityStomp/Source/GravityStompGame/Character/GSCharacter.cpp b/GravityStomp/Source/GravityStompGame/Character/GSCharacter.cpp index d7ad05b..0a12d5e 100644 --- a/GravityStomp/Source/GravityStompGame/Character/GSCharacter.cpp +++ b/GravityStomp/Source/GravityStompGame/Character/GSCharacter.cpp @@ -11,6 +11,7 @@ #include "EnhancedInputSubsystems.h" #include "GSCharacterMovementComponent.h" #include "GameFramework/PlayerState.h" +#include "Kismet/GameplayStatics.h" #include "Kismet/KismetMathLibrary.h" #include "Player/GSPlayerState.h" @@ -96,6 +97,11 @@ void AGSCharacter::SetupPlayerInputComponent(class UInputComponent* PlayerInputC void AGSCharacter::Move(const FInputActionValue& Value) { + if(UGameplayStatics::GetGlobalTimeDilation(this) < 1.0f) + { + return; + } + // input is a Vector2D FVector2D MovementVector = Value.Get(); @@ -107,7 +113,7 @@ void AGSCharacter::Move(const FInputActionValue& Value) void AGSCharacter::ChangeGravityDirection(const FInputActionValue& Value) { - if(!bCanChangeGravity) + if(!bCanChangeGravity || UGameplayStatics::GetGlobalTimeDilation(this) < 1.0f) { return; }