Merge von neuestem Stand, Konflikte zugunsten von RemoteRepository geloest
This commit is contained in:
commit
23f8f33fa6
|
@ -0,0 +1,13 @@
|
||||||
|
{
|
||||||
|
"folders": [
|
||||||
|
{
|
||||||
|
"path": "."
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"path": "D:\\Arbeit\\UE4\\UE_4.22"
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"settings": {
|
||||||
|
"typescript.tsc.autoDetect": "off"
|
||||||
|
}
|
||||||
|
}
|
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
|
@ -89,6 +89,17 @@ void UGrabber::TickComponent(float DeltaTime, ELevelTick TickType, FActorCompone
|
||||||
//move object we are holding
|
//move object we are holding
|
||||||
PhysicsHandle->SetTargetLocation(GetLineTraceEnd());
|
PhysicsHandle->SetTargetLocation(GetLineTraceEnd());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// DrawDebugLine(
|
||||||
|
// GetWorld(),
|
||||||
|
// GetPlayerWorldPosition(),
|
||||||
|
// GetLineTraceEnd(),
|
||||||
|
// FColor(0, 255 , 0), //red, green, blue,
|
||||||
|
// false,
|
||||||
|
// 0.f,
|
||||||
|
// 0,
|
||||||
|
// 5.f
|
||||||
|
// );
|
||||||
}
|
}
|
||||||
|
|
||||||
FHitResult UGrabber::GetFirstPhysicsBodyInReach() const
|
FHitResult UGrabber::GetFirstPhysicsBodyInReach() const
|
||||||
|
|
|
@ -58,11 +58,12 @@ void UOpenDoor::TickComponent(float DeltaTime, ELevelTick TickType, FActorCompon
|
||||||
// ...
|
// ...
|
||||||
//if(PressurePlate->IsOverlappingActor(ActorThatOpens)) // kann nullpointer + UE4 crash geben
|
//if(PressurePlate->IsOverlappingActor(ActorThatOpens)) // kann nullpointer + UE4 crash geben
|
||||||
//if(PressurePlate && PressurePlate->IsOverlappingActor(ActorThatOpens)) //prüft erst, ob es ein actor gibt
|
//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);
|
OpenDoor(DeltaTime);
|
||||||
//DoorLastOpened When the door was opened
|
//DoorLastOpened When the door was opened
|
||||||
DoorLastOpened = GetWorld()->GetTimeSeconds();;
|
DoorLastOpened = GetWorld()->GetTimeSeconds();
|
||||||
}
|
}
|
||||||
|
|
||||||
else
|
else
|
||||||
|
|
Loading…
Reference in New Issue