diff --git a/EndlessVendetta/Content/AdvancedLocomotionV4/Blueprints/CharacterLogic/ALS_AnimMan_CharacterBP.uasset b/EndlessVendetta/Content/AdvancedLocomotionV4/Blueprints/CharacterLogic/ALS_AnimMan_CharacterBP.uasset index 90a3081f..c6977195 100644 --- a/EndlessVendetta/Content/AdvancedLocomotionV4/Blueprints/CharacterLogic/ALS_AnimMan_CharacterBP.uasset +++ b/EndlessVendetta/Content/AdvancedLocomotionV4/Blueprints/CharacterLogic/ALS_AnimMan_CharacterBP.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:da1ec11d3041caad8c1cd4d0fa10b22718e6d4b17f3ed6b2b7c945c5c80ad457 -size 1131769 +oid sha256:df32038819ea055e9d8726f84ec0cc578e7f1520c96049911bf1b633cd229597 +size 1133560 diff --git a/EndlessVendetta/Content/AdvancedLocomotionV4/Blueprints/CharacterLogic/ALS_Base_CharacterBP.uasset b/EndlessVendetta/Content/AdvancedLocomotionV4/Blueprints/CharacterLogic/ALS_Base_CharacterBP.uasset index 8a8004f8..86aae28f 100644 --- a/EndlessVendetta/Content/AdvancedLocomotionV4/Blueprints/CharacterLogic/ALS_Base_CharacterBP.uasset +++ b/EndlessVendetta/Content/AdvancedLocomotionV4/Blueprints/CharacterLogic/ALS_Base_CharacterBP.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1bcde4e635aacde8667eb4f30208059476f047aa6d0c9c677532663e801d7755 -size 3724887 +oid sha256:0c691836e3344f64e7dc015e66fbc2fc79064e1aa157482e55b81a301e4d699c +size 3712791 diff --git a/EndlessVendetta/Content/AdvancedLocomotionV4/Blueprints/CharacterLogic/BP_MainCharacter.uasset b/EndlessVendetta/Content/AdvancedLocomotionV4/Blueprints/CharacterLogic/BP_MainCharacter.uasset deleted file mode 100644 index fa8a757b..00000000 --- a/EndlessVendetta/Content/AdvancedLocomotionV4/Blueprints/CharacterLogic/BP_MainCharacter.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e751937b6a52e11732c4ebe5777707b7db730f6c6b8cd4a27971f91ccfac6308 -size 1156611 diff --git a/EndlessVendetta/Content/AdvancedLocomotionV4/Blueprints/GameModes/ALS_GameMode_SP.uasset b/EndlessVendetta/Content/AdvancedLocomotionV4/Blueprints/GameModes/ALS_GameMode_SP.uasset index 9f32e80e..641d153c 100644 --- a/EndlessVendetta/Content/AdvancedLocomotionV4/Blueprints/GameModes/ALS_GameMode_SP.uasset +++ b/EndlessVendetta/Content/AdvancedLocomotionV4/Blueprints/GameModes/ALS_GameMode_SP.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c8d947cf0d121f197b0fed37e15b22e4a6b1c8c52dbd8c9e48386848292316e2 -size 53742 +oid sha256:9308ba8aa156bc576d582f3320b810c0edd5a1b8d3dfd1dd016c9bbcc655e78e +size 51714 diff --git a/EndlessVendetta/Content/AdvancedLocomotionV4/Blueprints/UI/ALS_HUD.uasset b/EndlessVendetta/Content/AdvancedLocomotionV4/Blueprints/UI/ALS_HUD.uasset index 443df623..615f9a3a 100644 --- a/EndlessVendetta/Content/AdvancedLocomotionV4/Blueprints/UI/ALS_HUD.uasset +++ b/EndlessVendetta/Content/AdvancedLocomotionV4/Blueprints/UI/ALS_HUD.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:12fb13b5c10bf4ccc266ff43e547f4b06931b46c6bd6dc79106316f8f85c0af8 -size 559075 +oid sha256:dd5a7ca874502f44a7b1958b0485622b24965499028cd2e1603a397d62c0c3ec +size 679028 diff --git a/EndlessVendetta/Content/AdvancedLocomotionV4/Blueprints/UI/OverlayStateButtonParams.uasset b/EndlessVendetta/Content/AdvancedLocomotionV4/Blueprints/UI/OverlayStateButtonParams.uasset index 031704ce..5a47d2c8 100644 --- a/EndlessVendetta/Content/AdvancedLocomotionV4/Blueprints/UI/OverlayStateButtonParams.uasset +++ b/EndlessVendetta/Content/AdvancedLocomotionV4/Blueprints/UI/OverlayStateButtonParams.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:24fabb1d9605fbd046452ab2f1f07ba6378d21dfb4a83a677f8c231be8f50ed9 -size 5304 +oid sha256:f3b018c5135ce96547991ae4310be79289da7e9a277e0cffc06a411fd8a3a02f +size 5379 diff --git a/EndlessVendetta/Content/AdvancedLocomotionV4/Blueprints/UI/OverlayStateSwitcher.uasset b/EndlessVendetta/Content/AdvancedLocomotionV4/Blueprints/UI/OverlayStateSwitcher.uasset index 6e592f03..8980415b 100644 --- a/EndlessVendetta/Content/AdvancedLocomotionV4/Blueprints/UI/OverlayStateSwitcher.uasset +++ b/EndlessVendetta/Content/AdvancedLocomotionV4/Blueprints/UI/OverlayStateSwitcher.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8cf9b862ce9768a39d8489474fd2e1ae4d421545c935828f794e6b802e925a90 -size 205966 +oid sha256:7479282be86610c346acc6f937214045de04482f79f2be53a6f8fb7134977caf +size 213124 diff --git a/EndlessVendetta/Content/AdvancedLocomotionV4/CharacterAssets/MannequinSkeleton/ALS_AnimBP.uasset b/EndlessVendetta/Content/AdvancedLocomotionV4/CharacterAssets/MannequinSkeleton/ALS_AnimBP.uasset index 74f46f4c..f5c2d370 100644 --- a/EndlessVendetta/Content/AdvancedLocomotionV4/CharacterAssets/MannequinSkeleton/ALS_AnimBP.uasset +++ b/EndlessVendetta/Content/AdvancedLocomotionV4/CharacterAssets/MannequinSkeleton/ALS_AnimBP.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ec8478fde6556b73c8678ec188da848ab91ba34443a8f48b9cab1e66d07f9332 -size 12671474 +oid sha256:7368697713f363b73171c34c534094637699e291c8b34c65bc90493941085850 +size 13167575 diff --git a/EndlessVendetta/Content/AdvancedLocomotionV4/Data/Enums/ALS_OverlayState.uasset b/EndlessVendetta/Content/AdvancedLocomotionV4/Data/Enums/ALS_OverlayState.uasset index 2ef86884..4377e4c7 100644 --- a/EndlessVendetta/Content/AdvancedLocomotionV4/Data/Enums/ALS_OverlayState.uasset +++ b/EndlessVendetta/Content/AdvancedLocomotionV4/Data/Enums/ALS_OverlayState.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7d12b2e64e6317dd262c040d78231971afe0570fa2e41d5cb623bbbbbf34ad3a -size 6404 +oid sha256:788747a02440a822d1578270fd27b571e113962afa85447bf1b59cccf1b93186 +size 6952 diff --git a/EndlessVendetta/Content/FirstPerson/Blueprints/BP_FirstPersonCharacter.uasset b/EndlessVendetta/Content/FirstPerson/Blueprints/BP_FirstPersonCharacter.uasset index dfe2cf7c..21be34d4 100644 --- a/EndlessVendetta/Content/FirstPerson/Blueprints/BP_FirstPersonCharacter.uasset +++ b/EndlessVendetta/Content/FirstPerson/Blueprints/BP_FirstPersonCharacter.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d03e3103b636230f0d59e161c029d7f6754fc4c6a52fd267f929437c88e14ffa -size 797236 +oid sha256:62a28e06b92c52f57d30fbdf93de41334c90117c9abe2b1067041d262241d2de +size 789010 diff --git a/EndlessVendetta/Content/FirstPerson/Blueprints/BP_MainCharacter.uasset b/EndlessVendetta/Content/FirstPerson/Blueprints/BP_MainCharacter.uasset new file mode 100644 index 00000000..48f0e7b8 --- /dev/null +++ b/EndlessVendetta/Content/FirstPerson/Blueprints/BP_MainCharacter.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9c68901cf04795dbcf7820adeeaed060d41ba10d4dd855e73baa31e809bfaef8 +size 1234594 diff --git a/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/BP_BaseWeapon.uasset b/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/BP_BaseWeapon.uasset index 9dd44d8a..763e278c 100644 --- a/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/BP_BaseWeapon.uasset +++ b/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/BP_BaseWeapon.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:774c3cb58ea15a8ee9240605b58c8ca17e3a894053fc8c3d45a60b0c01c59c7c -size 144559 +oid sha256:f8712bd2f07c9a93251099eb8948b20aeb0ca12e4885ce1ff2b382a9e9c1ec03 +size 151956 diff --git a/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/Pistols/AnimatedPistol/ArmsAnimations/ABP_Arms.uasset b/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/Pistols/AnimatedPistol/ArmsAnimations/ABP_Arms.uasset new file mode 100644 index 00000000..bcd061b2 --- /dev/null +++ b/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/Pistols/AnimatedPistol/ArmsAnimations/ABP_Arms.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:48b6e71ed96e3a1718683d4c1a1c86cb197f1d4885c8634b2268baebb9843792 +size 315707 diff --git a/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/Pistols/AnimatedPistol/ArmsAnimations/AIMTEST.uasset b/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/Pistols/AnimatedPistol/ArmsAnimations/AIMTEST.uasset new file mode 100644 index 00000000..926d1346 --- /dev/null +++ b/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/Pistols/AnimatedPistol/ArmsAnimations/AIMTEST.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:936ba25a07f301de5ed585e4440299f28456cb167e42f6b66aa0cfc0e92f4b37 +size 24260 diff --git a/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/Pistols/AnimatedPistol/ArmsAnimations/NewFirstPerson_AnimBP.uasset b/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/Pistols/AnimatedPistol/ArmsAnimations/NewFirstPerson_AnimBP.uasset deleted file mode 100644 index 28720b15..00000000 --- a/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/Pistols/AnimatedPistol/ArmsAnimations/NewFirstPerson_AnimBP.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:a5a1b5885a08097d043628c48bce8a7c4f5d7ae1bdbf5e32256a1429e6a1adee -size 930725 diff --git a/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/Pistols/AnimatedPistol/BP_BasePistolWeapon_Animated.uasset b/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/Pistols/AnimatedPistol/BP_BasePistolWeapon_Animated.uasset new file mode 100644 index 00000000..032383d8 --- /dev/null +++ b/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/Pistols/AnimatedPistol/BP_BasePistolWeapon_Animated.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:402b4ae75d96fdd7d5e679701d6acf915a2535f6af23417ea495ab42c2f87f8b +size 238945 diff --git a/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/Pistols/AnimatedPistol/Pistol_Skeleton.uasset b/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/Pistols/AnimatedPistol/Pistol_Skeleton.uasset index f0743760..fb268fc5 100644 --- a/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/Pistols/AnimatedPistol/Pistol_Skeleton.uasset +++ b/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/Pistols/AnimatedPistol/Pistol_Skeleton.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:65de75f75767ce97020af7526017bbcb7219c7f335a5ebe35b180648481d6323 -size 6745 +oid sha256:a71f3065094e88d3743a534b1f5fbc262e0be95be3a2bc8ffb9760a64e5cd266 +size 7310 diff --git a/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/Pistols/BP_BasePistolWeapon.uasset b/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/Pistols/BP_BasePistolWeapon.uasset index 1a047483..fb466ec8 100644 --- a/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/Pistols/BP_BasePistolWeapon.uasset +++ b/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/Pistols/BP_BasePistolWeapon.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f123a6be394692bcf1008c3ca474412b1dea16cf5162e4403e5bfeffecf7aaca -size 232957 +oid sha256:8839928e188a2412e44964686f7f3ad2fe822ad334dc187d304798978829b518 +size 235121 diff --git a/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/Pistols/BP_BasePistolWeapon_Animated.uasset b/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/Pistols/BP_BasePistolWeapon_Animated.uasset deleted file mode 100644 index 3c9191c0..00000000 --- a/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/Pistols/BP_BasePistolWeapon_Animated.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:5588d6fae22548c63b5da5224e72dc3b129e41e5e856f3085fe80272f7e1ff3c -size 237353 diff --git a/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/Shotguns/BP_BaseShotgun.uasset b/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/Shotguns/BP_BaseShotgun.uasset index f5dd6321..73a3de34 100644 --- a/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/Shotguns/BP_BaseShotgun.uasset +++ b/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/Shotguns/BP_BaseShotgun.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:de73d2ac1fc0b7edb6bf31f180d0911728cdbb24a2742ee49cc13777440d8c09 -size 148132 +oid sha256:060578227d4bfa814eff22e5ed88c101bcfaf8f9907d3f72843b555f69cc7cc2 +size 150024 diff --git a/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/Snipers/BaseSniper.uasset b/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/Snipers/BaseSniper.uasset index fd7daa19..e562169e 100644 --- a/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/Snipers/BaseSniper.uasset +++ b/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/Snipers/BaseSniper.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:cc356221897155c9e0f82d2db27f690518db622136cf73b10b36a1aa58aa0a45 -size 150577 +oid sha256:5d6686907130b5db1edf8d350062149a52e4aeae760d78761c62a2ef403331ab +size 151965 diff --git a/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/WBP_AmmoCount.uasset b/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/WBP_AmmoCount.uasset index dc2d1d9f..b1adb9c0 100644 --- a/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/WBP_AmmoCount.uasset +++ b/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/WBP_AmmoCount.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:817e36e818816a869811ea3a307a403179be485f691df20a29c1f82051e0db3d -size 66379 +oid sha256:1757539c519d9efd3d6ec9eace993fbe4364ba21a23b3b1d18f057be43e3e649 +size 66367 diff --git a/EndlessVendetta/Content/FirstPerson/Blueprints/Data/WeaponSight_Enum.uasset b/EndlessVendetta/Content/FirstPerson/Blueprints/Data/WeaponSight_Enum.uasset new file mode 100644 index 00000000..554a34f1 --- /dev/null +++ b/EndlessVendetta/Content/FirstPerson/Blueprints/Data/WeaponSight_Enum.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0765c80f8bbbf2cd9e3aa3548286a4f33e33fe030f1d9f4bd4776977f72ec45e +size 2052 diff --git a/EndlessVendetta/Content/FirstPersonArms/Character/Mesh/SK_Mannequin_Arms_Skeleton.uasset b/EndlessVendetta/Content/FirstPersonArms/Character/Mesh/SK_Mannequin_Arms_Skeleton.uasset index 67ec29f4..d260b726 100644 --- a/EndlessVendetta/Content/FirstPersonArms/Character/Mesh/SK_Mannequin_Arms_Skeleton.uasset +++ b/EndlessVendetta/Content/FirstPersonArms/Character/Mesh/SK_Mannequin_Arms_Skeleton.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:77fa0269c748f88a673813f8caaa6e80bf90a5318550e6cedf9c286aab4b7578 -size 23515 +oid sha256:0fc5ca2693f166d0b2d6bf7bf5ddb143d0bfbfb05b50ba5cae12a09d46736871 +size 23513 diff --git a/EndlessVendetta/Source/EndlessVendetta/EndlessVendettaCharacter.cpp b/EndlessVendetta/Source/EndlessVendetta/EndlessVendettaCharacter.cpp index 556634fb..12239c0a 100644 --- a/EndlessVendetta/Source/EndlessVendetta/EndlessVendettaCharacter.cpp +++ b/EndlessVendetta/Source/EndlessVendetta/EndlessVendettaCharacter.cpp @@ -31,20 +31,20 @@ AEndlessVendettaCharacter::AEndlessVendettaCharacter() // Set size for collision capsule GetCapsuleComponent()->InitCapsuleSize(55.f, 96.0f); - // Create a CameraComponent - FirstPersonCameraComponent = CreateDefaultSubobject(TEXT("FirstPersonCamera")); - FirstPersonCameraComponent->SetupAttachment(GetCapsuleComponent()); - FirstPersonCameraComponent->SetRelativeLocation(FVector(-10.f, 0.f, 60.f)); // Position the camera - FirstPersonCameraComponent->bUsePawnControlRotation = true; - - // Create a mesh component that will be used when being viewed from a '1st person' view (when controlling this pawn) - Mesh1P = CreateDefaultSubobject(TEXT("CharacterMesh1P")); - Mesh1P->SetOnlyOwnerSee(true); - Mesh1P->SetupAttachment(FirstPersonCameraComponent); - Mesh1P->bCastDynamicShadow = false; - Mesh1P->CastShadow = false; - //Mesh1P->SetRelativeRotation(FRotator(0.9f, -19.19f, 5.2f)); - Mesh1P->SetRelativeLocation(FVector(-30.f, 0.f, -150.f)); + // // Create a CameraComponent + // FirstPersonCameraComponent = CreateDefaultSubobject(TEXT("FirstPersonCamera")); + // FirstPersonCameraComponent->SetupAttachment(GetCapsuleComponent()); + // FirstPersonCameraComponent->SetRelativeLocation(FVector(-10.f, 0.f, 60.f)); // Position the camera + // FirstPersonCameraComponent->bUsePawnControlRotation = true; + // + // // Create a mesh component that will be used when being viewed from a '1st person' view (when controlling this pawn) + // Mesh1P = CreateDefaultSubobject(TEXT("CharacterMesh1P")); + // Mesh1P->SetOnlyOwnerSee(true); + // Mesh1P->SetupAttachment(FirstPersonCameraComponent); + // Mesh1P->bCastDynamicShadow = false; + // Mesh1P->CastShadow = false; + // //Mesh1P->SetRelativeRotation(FRotator(0.9f, -19.19f, 5.2f)); + // Mesh1P->SetRelativeLocation(FVector(-30.f, 0.f, -150.f)); } void AEndlessVendettaCharacter::IncrementRestrictedBoundsCount() @@ -105,6 +105,7 @@ void AEndlessVendettaCharacter::BeginPlay() GadgetManagerActor->AttachToComponent(GetRootComponent(), AttachmentRules); for (UActorComponent* PlayersCamera : GetComponentsByTag(UCameraComponent::StaticClass(), FName("PlayersCamera"))) { + FirstPersonCameraComponent = Cast(PlayersCamera); GadgetManager->SpawnGadgetsOnBeginPlay(Cast(PlayersCamera)); break; } @@ -210,16 +211,16 @@ void AEndlessVendettaCharacter::SetupPlayerInputComponent(class UInputComponent* if (UEnhancedInputComponent* EnhancedInputComponent = CastChecked(PlayerInputComponent)) { //Jumping - EnhancedInputComponent->BindAction(JumpAction, ETriggerEvent::Started, this, &ACharacter::Jump); - EnhancedInputComponent->BindAction(JumpAction, ETriggerEvent::Completed, this, &ACharacter::StopJumping); + // EnhancedInputComponent->BindAction(JumpAction, ETriggerEvent::Started, this, &ACharacter::Jump); + // EnhancedInputComponent->BindAction(JumpAction, ETriggerEvent::Completed, this, &ACharacter::StopJumping); //Moving - EnhancedInputComponent->BindAction(MoveAction, ETriggerEvent::Triggered, this, &AEndlessVendettaCharacter::Move); - EnhancedInputComponent->BindAction(SprintAction, ETriggerEvent::Started, this, &AEndlessVendettaCharacter::Sprint); - EnhancedInputComponent->BindAction(SprintAction, ETriggerEvent::Completed, this, &AEndlessVendettaCharacter::StopSprint); + // EnhancedInputComponent->BindAction(MoveAction, ETriggerEvent::Triggered, this, &AEndlessVendettaCharacter::Move); + // EnhancedInputComponent->BindAction(SprintAction, ETriggerEvent::Started, this, &AEndlessVendettaCharacter::Sprint); + // EnhancedInputComponent->BindAction(SprintAction, ETriggerEvent::Completed, this, &AEndlessVendettaCharacter::StopSprint); //Looking - EnhancedInputComponent->BindAction(LookAction, ETriggerEvent::Triggered, this, &AEndlessVendettaCharacter::Look); + // EnhancedInputComponent->BindAction(LookAction, ETriggerEvent::Triggered, this, &AEndlessVendettaCharacter::Look); // Gadget Toggling EnhancedInputComponent->BindAction(ReconAction, ETriggerEvent::Started, this, &AEndlessVendettaCharacter::ToggleRecon); @@ -793,7 +794,7 @@ void AEndlessVendettaCharacter::HoldInteract() if (GadgetManager->IsValidReconGadget() && GadgetManager->IsReconEquipped() && !GadgetManager->TryToUnequipRecon()) return; if (GadgetManager->IsValidCombatGadget() && GadgetManager->IsCombatEquipped() && !GadgetManager->TryToUnequipCombat()) return; - + FTransform TakeOffTransform = GetActorTransform(); FVector NewLoc = TakeOffTransform.GetLocation(); NewLoc.Z += BikeRideHeight; diff --git a/EndlessVendetta/Source/EndlessVendetta/EndlessVendettaCharacter.h b/EndlessVendetta/Source/EndlessVendetta/EndlessVendettaCharacter.h index 1527e099..ce9d73b8 100644 --- a/EndlessVendetta/Source/EndlessVendetta/EndlessVendettaCharacter.h +++ b/EndlessVendetta/Source/EndlessVendetta/EndlessVendettaCharacter.h @@ -46,12 +46,12 @@ private: UInputMappingContext* DefaultMappingContext; /** Jump Input Action */ - UPROPERTY(EditAnywhere, BlueprintReadOnly, Category=Input, meta=(AllowPrivateAccess = "true")) - UInputAction* JumpAction; + // UPROPERTY(EditAnywhere, BlueprintReadOnly, Category=Input, meta=(AllowPrivateAccess = "true")) + // UInputAction* JumpAction; /** Move Input Action */ - UPROPERTY(EditAnywhere, BlueprintReadOnly, Category=Input, meta=(AllowPrivateAccess = "true")) - UInputAction* MoveAction; + // UPROPERTY(EditAnywhere, BlueprintReadOnly, Category=Input, meta=(AllowPrivateAccess = "true")) + // UInputAction* MoveAction; // Gadget Actions UPROPERTY(EditAnywhere, BlueprintReadOnly, Category=Input, meta=(AllowPrivateAccess = "true")) @@ -176,8 +176,8 @@ public: double MoveGroundSpeed; /** Look Input Action */ - UPROPERTY(EditAnywhere, BlueprintReadOnly, Category = Input, meta = (AllowPrivateAccess = "true")) - class UInputAction* LookAction; + // UPROPERTY(EditAnywhere, BlueprintReadOnly, Category = Input, meta = (AllowPrivateAccess = "true")) + // class UInputAction* LookAction; /** Bool for AnimBP to switch to another animation set */ UPROPERTY(VisibleAnywhere, BlueprintReadOnly, Category = Weapon)