other git stuff

.gitlab-ci.yml

@@ -53,7 +53,7 @@ Build_Windows:
     extends: .Build_Windows_
     tags:
         - windows
-        - unreal-4.26
+        - unreal-5.0
     variables:
         GIT_STRATEGY: none   
         GIT_CHECKOUT: "false"
@@ -68,7 +68,7 @@ Build_CentOS:
     extends: .Build_CentOS_
     tags:
         - centos
-        - unreal-4.26
+        - unreal-5.0
     variables:
         GIT_STRATEGY: none   
         GIT_CHECKOUT: "false"

Source/Calibratio/Public/CalibratioActor.h

@@ -25,7 +25,7 @@ public:
 	UPROPERTY(VisibleAnywhere) UStaticMeshComponent* Mesh;
 	UPROPERTY(EditAnywhere) UMaterialInterface* BaseMaterial;
 	UPROPERTY(BlueprintReadWrite) float Threshold = FMath::DegreesToRadians(1.7f);
-	UPROPERTY(BlueprintReadWrite) float ResetTime = 0.5f;
+	UPROPERTY(BlueprintReadWrite) float ResetTime = 1.5f;
 	UFUNCTION(Blueprintcallable) void ClusterDespawn();
 
 private:

Source/RWTHVRToolkit/Private/Pawn/VRPawnMovement.cpp

@@ -119,7 +119,7 @@ void UVRPawnMovement::MoveByGravityOrStepUp(float DeltaSeconds)
 		ShiftVertically(DistanceDifference, UpSteppingAcceleration, DeltaSeconds, 1);
 	}
 	//Gravity (only in Walk Mode)
-	else if (NavigationMode==EVRNavigationModes::NAV_WALK && ((HitDetailsMultiLineTrace.bBlockingHit && HitDetailsMultiLineTrace.Distance > MaxStepHeight) || (HitDetailsMultiLineTrace.Actor == nullptr && HitDetailsMultiLineTrace.Distance != -1.0f)))
+	else if (NavigationMode==EVRNavigationModes::NAV_WALK && ((HitDetailsMultiLineTrace.bBlockingHit && HitDetailsMultiLineTrace.Distance > MaxStepHeight) || (HitDetailsMultiLineTrace.GetActor() == nullptr && HitDetailsMultiLineTrace.Distance != -1.0f)))
 	{
 		ShiftVertically(DistanceDifference, GravityAcceleration, DeltaSeconds, -1);
 	}
@@ -182,8 +182,8 @@ FHitResult UVRPawnMovement::CreateMultiLineTrace(FVector Direction, const FVecto
 	{
 		FHitResult OutHit = CreateLineTrace(Direction, Vector, Visibility);
 		OutHits.Add(OutHit);
-		IsBlockingHitAndSameActor &= (OutHit.Actor == OutHits[0].Actor); //If all Hiting the same Object, then you are (going up/down) or (walking)
-		IsAllNothingHiting &= (OutHit.Actor == nullptr); //If all Hiting nothing, then you are falling
+		IsBlockingHitAndSameActor &= (OutHit.GetActor() == OutHits[0].GetActor()); //If all Hiting the same Object, then you are (going up/down) or (walking)
+		IsAllNothingHiting &= (OutHit.GetActor() == nullptr); //If all Hiting nothing, then you are falling
 	}
 
 	if (IsBlockingHitAndSameActor || IsAllNothingHiting)

Source/RWTHVRToolkit/Private/UI/ExternalImage.cpp

@@ -65,9 +65,9 @@ bool UExternalImage::LoadCompressedDataIntoTexture2D(const TArray<uint8>& InComp
     OutTexture = UTexture2D::CreateTransient(ImageWrapper->GetWidth(), ImageWrapper->GetHeight(), PF_B8G8R8A8);
     if (OutTexture)
     {
-        void* TextureData = OutTexture->PlatformData->Mips[0].BulkData.Lock(LOCK_READ_WRITE);
+        void* TextureData = OutTexture->GetPlatformData()->Mips[0].BulkData.Lock(LOCK_READ_WRITE);
         FMemory::Memcpy(TextureData, UncompressedRGBA.GetData(), UncompressedRGBA.Num());
-        OutTexture->PlatformData->Mips[0].BulkData.Unlock();
+        OutTexture->GetPlatformData()->Mips[0].BulkData.Unlock();
         OutTexture->UpdateResource();
     }
     return true;

Source/RWTHVRToolkit/Private/Utility/VirtualRealityUtilities.cpp

@@ -85,7 +85,7 @@ bool UVirtualRealityUtilities::IsMaster()
 	{
 		return true; // if we are not in cluster mode, we are always the master
 	}
-	return Manager->IsMaster() || !Manager->IsSlave();
+	return Manager->IsPrimary() || !Manager->IsSecondary();
 #else
     return true;
 #endif

Source/RWTHVRToolkit/RWTHVRToolkit.Build.cs

@@ -26,7 +26,7 @@ public class RWTHVRToolkit : ModuleRules
 			"Slate",
 			"SlateCore",
 			"DeveloperSettings",
-			"Http",
+			"HTTP",
 			"LiveLink",
 			"LiveLinkInterface"
 			}