diff --git a/ParkourGame/Config/DefaultGame.ini b/ParkourGame/Config/DefaultGame.ini index 193509b..96dbdee 100644 --- a/ParkourGame/Config/DefaultGame.ini +++ b/ParkourGame/Config/DefaultGame.ini @@ -39,4 +39,6 @@ bSkipEditorContent=False bNativizeBlueprintAssets=False bNativizeOnlySelectedBlueprints=False - +[/Script/Engine.GameSession] +MaxPlayers=64 +MaxSpectators=64 \ No newline at end of file diff --git a/ParkourGame/Content/ThirdPersonCPP/Blueprints/ThirdPersonCharacter.uasset b/ParkourGame/Content/ThirdPersonCPP/Blueprints/ThirdPersonCharacter.uasset index efe71f1..237ca55 100644 --- a/ParkourGame/Content/ThirdPersonCPP/Blueprints/ThirdPersonCharacter.uasset +++ b/ParkourGame/Content/ThirdPersonCPP/Blueprints/ThirdPersonCharacter.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:70c84f14381b8d653be2268ea56f82bd28ec370036b4db04ccaba23fe0f66e04 -size 1376252 +oid sha256:7a5c6ff639e74d10cc1c2e91149e0574ce435b9739d69d4684745dc954a0bc84 +size 1370961 diff --git a/ParkourGame/Content/ThirdPersonCPP/Maps/arena_ballgame.umap b/ParkourGame/Content/ThirdPersonCPP/Maps/arena_ballgame.umap index 8e932b4..6854dfd 100644 --- a/ParkourGame/Content/ThirdPersonCPP/Maps/arena_ballgame.umap +++ b/ParkourGame/Content/ThirdPersonCPP/Maps/arena_ballgame.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:60ed427da050679ebe1d72621aa502d3a48c26ff4d92cda2b7123ebfbb05837e -size 106949 +oid sha256:180b45330c09e21558470959b56522b3f27a1c28786048e389dba2ac6534e596 +size 110368 diff --git a/ParkourGame/Content/ThirdPersonCPP/Maps/arena_base.umap b/ParkourGame/Content/ThirdPersonCPP/Maps/arena_base.umap index 391abf0..c345a16 100644 --- a/ParkourGame/Content/ThirdPersonCPP/Maps/arena_base.umap +++ b/ParkourGame/Content/ThirdPersonCPP/Maps/arena_base.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d5f89598c035bdad6df9760fef63e7b0af2fb7e1fd6aaf4a84f084b9cb936cfc -size 1650278 +oid sha256:3c0988b3f9ba6e38156f193ec3397c72a32599c0080cdc9ecedc7c516dbd9b6d +size 1695592 diff --git a/ParkourGame/Content/ThirdPersonCPP/Maps/arena_base_BuiltData.uasset b/ParkourGame/Content/ThirdPersonCPP/Maps/arena_base_BuiltData.uasset index 52a7397..0669a55 100644 --- a/ParkourGame/Content/ThirdPersonCPP/Maps/arena_base_BuiltData.uasset +++ b/ParkourGame/Content/ThirdPersonCPP/Maps/arena_base_BuiltData.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:38b8245f0e77e70f3d0b2848359e64ca198861fa1219f34f705dd166007eeccd -size 4795241 +oid sha256:957e0c5bcb2ad254eab92021f5682d627617ef713017c2e2b6f80fc5cc6dab90 +size 4795203 diff --git a/ParkourGame/Source/ParkourGame/Private/ParkourGameCharacter.cpp b/ParkourGame/Source/ParkourGame/Private/ParkourGameCharacter.cpp index 61d4f8b..da296a6 100644 --- a/ParkourGame/Source/ParkourGame/Private/ParkourGameCharacter.cpp +++ b/ParkourGame/Source/ParkourGame/Private/ParkourGameCharacter.cpp @@ -934,6 +934,11 @@ void AParkourGameCharacter::EndVaultAnim() { isVaulting = false; } +bool AParkourGameCharacter::IsAutonomousProxy() const +{ + return Role == ROLE_AutonomousProxy; +} + void AParkourGameCharacter::UpdateVault(EHandSideEnum Hand) { FGripData& Data = m_GripData[(int32)Hand]; @@ -1552,10 +1557,10 @@ void AParkourGameCharacter::CapsuleToRagdoll() UCapsuleComponent* Capsule = GetCapsuleComponent(); FHitResult OutHit; - FVector Start = (SocketLocation); //(Capsule->GetComponentLocation()); + FVector Start = SocketLocation; //(Capsule->GetComponentLocation()); FVector DownVector = (Capsule->GetUpVector()) * -1; - FVector End = ((DownVector * 1000.f) + Start); + FVector End = ((DownVector * 100.f) + Start); FCollisionQueryParams CollisionParams; bool bFoundFloor; diff --git a/ParkourGame/Source/ParkourGame/Private/ParkourGameCharacter.h b/ParkourGame/Source/ParkourGame/Private/ParkourGameCharacter.h index 3906646..5b3e5ff 100644 --- a/ParkourGame/Source/ParkourGame/Private/ParkourGameCharacter.h +++ b/ParkourGame/Source/ParkourGame/Private/ParkourGameCharacter.h @@ -244,6 +244,9 @@ class AParkourGameCharacter : public ACharacter UFUNCTION(BlueprintCallable, Category = "Physics") void EndVaultAnim(); + UFUNCTION(BlueprintPure, Category = "Role") + bool IsAutonomousProxy() const; + UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = "Physics") float BodyMass = 75.0f; diff --git a/ParkourGame/Source/ParkourGame/Private/Spectator/SpectatorCameraActor.cpp b/ParkourGame/Source/ParkourGame/Private/Spectator/SpectatorCameraActor.cpp index d351904..bdbd89e 100644 --- a/ParkourGame/Source/ParkourGame/Private/Spectator/SpectatorCameraActor.cpp +++ b/ParkourGame/Source/ParkourGame/Private/Spectator/SpectatorCameraActor.cpp @@ -22,6 +22,12 @@ void ASpectatorCameraActor::Tick(float DeltaSeconds) const FVector TargetLoc = TargetPtr->GetActorLocation(); const FVector CameraLoc = GetActorLocation(); + if (const AParkourGameCharacter* Char = Cast(TargetPtr)) + { + // dont follow glitchy ragdoll capsule + if (Char->IsFullRagdoll()) return; + } + SetActorRotation(UKismetMathLibrary::FindLookAtRotation(CameraLoc, TargetLoc)); const float Dist = (CameraLoc - TargetLoc).Size(); diff --git a/ParkourGame/Source/ParkourGame/Private/Utils/GameVersion.h b/ParkourGame/Source/ParkourGame/Private/Utils/GameVersion.h index f0d6b3c..856f325 100644 --- a/ParkourGame/Source/ParkourGame/Private/Utils/GameVersion.h +++ b/ParkourGame/Source/ParkourGame/Private/Utils/GameVersion.h @@ -6,7 +6,7 @@ #define GAME_VERSION_MAJOR 0 #define GAME_VERSION_MINOR 11 -#define GAME_VERSION_PATCH 0 +#define GAME_VERSION_PATCH 1 USTRUCT(BlueprintType) struct FGameVersion