Bugfixes for spectator, reset and tutorial

Nick-Pearson · May 8, 2018 · 89a22cc · 89a22cc
1 parent 2e9d35b
commit 89a22cc
Show file tree

Hide file tree

Showing 9 changed files with 28 additions and 12 deletions.
diff --git 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
diff --git a/ParkourGame/Content/ThirdPersonCPP/Blueprints/ThirdPersonCharacter.uasset b/ParkourGame/Content/ThirdPersonCPP/Blueprints/ThirdPersonCharacter.uasset
diff --git a/ParkourGame/Content/ThirdPersonCPP/Maps/arena_ballgame.umap b/ParkourGame/Content/ThirdPersonCPP/Maps/arena_ballgame.umap
diff --git a/ParkourGame/Content/ThirdPersonCPP/Maps/arena_base.umap b/ParkourGame/Content/ThirdPersonCPP/Maps/arena_base.umap
diff --git a/ParkourGame/Content/ThirdPersonCPP/Maps/arena_base_BuiltData.uasset b/ParkourGame/Content/ThirdPersonCPP/Maps/arena_base_BuiltData.uasset
diff --git 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
@@ -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
@@ -22,6 +22,12 @@ void ASpectatorCameraActor::Tick(float DeltaSeconds)
 	const FVector TargetLoc = TargetPtr->GetActorLocation();
 	const FVector CameraLoc = GetActorLocation();
 
+  if (const AParkourGameCharacter* Char = Cast<AParkourGameCharacter>(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
@@ -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