Merge von neuestem Stand, Konflikte zugunsten von RemoteRepository geloest

BuildingEscape.code-workspace

@@ -0,0 +1,13 @@
+{
+	"folders": [
+		{
+			"path": "."
+		},
+		{
+			"path": "D:\\Arbeit\\UE4\\UE_4.22"
+		}
+	],
+	"settings": {
+		"typescript.tsc.autoDetect": "off"
+	}
+}

Source/BuildingEscape/Grabber.cpp

@@ -89,6 +89,17 @@ void UGrabber::TickComponent(float DeltaTime, ELevelTick TickType, FActorCompone
 		//move object we are holding
 		PhysicsHandle->SetTargetLocation(GetLineTraceEnd());
 	}
+
+	// 	DrawDebugLine(
+	//  	GetWorld(),
+	// 	GetPlayerWorldPosition(),
+	//  	GetLineTraceEnd(),
+	//  	FColor(0, 255 , 0), //red, green, blue,
+	//  	false,
+	//  	0.f,
+	//  	0,
+	//  	5.f
+	//  );
 }
 
 FHitResult UGrabber::GetFirstPhysicsBodyInReach() const

Source/BuildingEscape/OpenDoor.cpp

@@ -58,11 +58,12 @@ void UOpenDoor::TickComponent(float DeltaTime, ELevelTick TickType, FActorCompon
 	// ...
 	//if(PressurePlate->IsOverlappingActor(ActorThatOpens)) // kann nullpointer + UE4 crash geben
 	//if(PressurePlate && PressurePlate->IsOverlappingActor(ActorThatOpens)) //prüft erst, ob es ein actor gibt
-	if(TotalMass() > MassToOpenDoor)
+	if(TotalMass() >= MassToOpenDoor)
 	{
+		UE_LOG(LogTemp, Warning, TEXT("TEST OPEN DOOR"));
 		OpenDoor(DeltaTime);
 		//DoorLastOpened When the door was opened
-		DoorLastOpened = GetWorld()->GetTimeSeconds();;
+		DoorLastOpened = GetWorld()->GetTimeSeconds();
 	}
 
 	else