Bugfix Accidently Landing at LZ when Pressing F on Other Objects
This commit is contained in:
parent
971ed07da9
commit
da57792207
@ -7,7 +7,17 @@
|
|||||||
<option name="autoReloadType" value="SELECTIVE" />
|
<option name="autoReloadType" value="SELECTIVE" />
|
||||||
</component>
|
</component>
|
||||||
<component name="ChangeListManager">
|
<component name="ChangeListManager">
|
||||||
<list default="true" id="8acc2658-cb31-4c49-857f-282cfee74640" name="Changes" comment="" />
|
<list default="true" id="8acc2658-cb31-4c49-857f-282cfee74640" name="Changes" comment="">
|
||||||
|
<change beforePath="$PROJECT_DIR$/.idea/.idea.EndlessVendetta/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/.idea.EndlessVendetta/.idea/workspace.xml" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/Content/BountySystem/ApartmentBounty/MB_Apartment.uasset" beforeDir="false" afterPath="$PROJECT_DIR$/Content/BountySystem/ApartmentBounty/MB_Apartment.uasset" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/Content/BountySystem/ApartmentBounty/OWCP_Apartment.uasset" beforeDir="false" afterPath="$PROJECT_DIR$/Content/BountySystem/ApartmentBounty/OWCP_Apartment.uasset" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/Content/BountySystem/ControlsTutorial/Bounty/OWCP_Training.uasset" beforeDir="false" afterPath="$PROJECT_DIR$/Content/BountySystem/ControlsTutorial/Bounty/OWCP_Training.uasset" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/Content/BountySystem/Legacy/TutorialFacility/Checkpoints/BountySimulation/CP_ElimTutorialTarget.uasset" beforeDir="false" afterPath="$PROJECT_DIR$/Content/BountySystem/Legacy/TutorialFacility/Checkpoints/BountySimulation/CP_ElimTutorialTarget.uasset" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/Content/Levels/Apartment_hit.umap" beforeDir="false" afterPath="$PROJECT_DIR$/Content/Levels/Apartment_hit.umap" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/Source/EndlessVendetta/BountySystem/CheckpointClass.cpp" beforeDir="false" afterPath="$PROJECT_DIR$/Source/EndlessVendetta/BountySystem/CheckpointClass.cpp" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/Source/EndlessVendetta/BountySystem/CheckpointClass.h" beforeDir="false" afterPath="$PROJECT_DIR$/Source/EndlessVendetta/BountySystem/CheckpointClass.h" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/Source/EndlessVendetta/SpaceShip/SpaceShip.cpp" beforeDir="false" afterPath="$PROJECT_DIR$/Source/EndlessVendetta/SpaceShip/SpaceShip.cpp" afterDir="false" />
|
||||||
|
</list>
|
||||||
<option name="SHOW_DIALOG" value="false" />
|
<option name="SHOW_DIALOG" value="false" />
|
||||||
<option name="HIGHLIGHT_CONFLICTS" value="true" />
|
<option name="HIGHLIGHT_CONFLICTS" value="true" />
|
||||||
<option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
|
<option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
|
||||||
@ -129,7 +139,7 @@
|
|||||||
<workItem from="1706203836052" duration="7461000" />
|
<workItem from="1706203836052" duration="7461000" />
|
||||||
<workItem from="1706626387819" duration="5432000" />
|
<workItem from="1706626387819" duration="5432000" />
|
||||||
<workItem from="1706711852868" duration="19944000" />
|
<workItem from="1706711852868" duration="19944000" />
|
||||||
<workItem from="1706799696925" duration="1378000" />
|
<workItem from="1706799696925" duration="3439000" />
|
||||||
</task>
|
</task>
|
||||||
<servers />
|
<servers />
|
||||||
</component>
|
</component>
|
||||||
|
@ -0,0 +1,3 @@
|
|||||||
|
version https://git-lfs.github.com/spec/v1
|
||||||
|
oid sha256:f56fcbf6bb0f0a1241275e1a3338f698f588e40b787abc4ccf7607de32e911df
|
||||||
|
size 57693
|
@ -1,3 +1,3 @@
|
|||||||
version https://git-lfs.github.com/spec/v1
|
version https://git-lfs.github.com/spec/v1
|
||||||
oid sha256:b3961e22842e8bb12c11a7a3e55793f49209fbdecbcb861ef0296af14b5c36b0
|
oid sha256:b660e3da651b47390d53bd8d9007ec3d7b82bceaf97d1a266239be3c2f50c593
|
||||||
size 23374
|
size 23693
|
||||||
|
BIN
EndlessVendetta/Content/BountySystem/ApartmentBounty/OWCP_Apartment.uasset
(Stored with Git LFS)
BIN
EndlessVendetta/Content/BountySystem/ApartmentBounty/OWCP_Apartment.uasset
(Stored with Git LFS)
Binary file not shown.
BIN
EndlessVendetta/Content/BountySystem/ControlsTutorial/Bounty/OWCP_Training.uasset
(Stored with Git LFS)
BIN
EndlessVendetta/Content/BountySystem/ControlsTutorial/Bounty/OWCP_Training.uasset
(Stored with Git LFS)
Binary file not shown.
Binary file not shown.
BIN
EndlessVendetta/Content/Levels/Apartment_hit.umap
(Stored with Git LFS)
BIN
EndlessVendetta/Content/Levels/Apartment_hit.umap
(Stored with Git LFS)
Binary file not shown.
@ -20,7 +20,7 @@ void ACheckpointClass::BeginPlay()
|
|||||||
|
|
||||||
void ACheckpointClass::SpawnWaypoint(const FString& CurrentBountyTitle)
|
void ACheckpointClass::SpawnWaypoint(const FString& CurrentBountyTitle)
|
||||||
{
|
{
|
||||||
if (!IsValid(WaypointActorClass)) return;
|
if (!IsValid(WaypointActorClass) || HideWaypoint) return;
|
||||||
|
|
||||||
BountyTitle = CurrentBountyTitle;
|
BountyTitle = CurrentBountyTitle;
|
||||||
FActorSpawnParameters SpawnParams;
|
FActorSpawnParameters SpawnParams;
|
||||||
@ -31,6 +31,8 @@ void ACheckpointClass::SpawnWaypoint(const FString& CurrentBountyTitle)
|
|||||||
|
|
||||||
void ACheckpointClass::UpdateCheckpointWaypoint(FVector WaypointNewLoc)
|
void ACheckpointClass::UpdateCheckpointWaypoint(FVector WaypointNewLoc)
|
||||||
{
|
{
|
||||||
|
if (HideWaypoint) return;
|
||||||
|
|
||||||
FActorSpawnParameters SpawnParams;
|
FActorSpawnParameters SpawnParams;
|
||||||
SpawnParams.SpawnCollisionHandlingOverride = ESpawnActorCollisionHandlingMethod::AlwaysSpawn;
|
SpawnParams.SpawnCollisionHandlingOverride = ESpawnActorCollisionHandlingMethod::AlwaysSpawn;
|
||||||
if (WaypointActor) WaypointActor->Destroy();
|
if (WaypointActor) WaypointActor->Destroy();
|
||||||
|
@ -29,6 +29,8 @@ class ENDLESSVENDETTA_API ACheckpointClass : public AActor
|
|||||||
FTransform CheckpointSpawnTransform;
|
FTransform CheckpointSpawnTransform;
|
||||||
UPROPERTY(EditDefaultsOnly, Category = "Checkpoint")
|
UPROPERTY(EditDefaultsOnly, Category = "Checkpoint")
|
||||||
TSubclassOf<AWaypointActor> WaypointActorClass;
|
TSubclassOf<AWaypointActor> WaypointActorClass;
|
||||||
|
UPROPERTY(EditDefaultsOnly, Category = "Checkpoint")
|
||||||
|
bool HideWaypoint = false;
|
||||||
|
|
||||||
AWaypointActor* WaypointActor;
|
AWaypointActor* WaypointActor;
|
||||||
// ----------------------------------------
|
// ----------------------------------------
|
||||||
|
@ -24,7 +24,11 @@ void ASpaceShip::SightCheck()
|
|||||||
FVector LT_End = LT_Start + (SeatComponent->GetForwardVector() * 500000);
|
FVector LT_End = LT_Start + (SeatComponent->GetForwardVector() * 500000);
|
||||||
GetWorld()->LineTraceSingleByObjectType(OutHit, LT_Start, LT_End, ObjectQueryParams);
|
GetWorld()->LineTraceSingleByObjectType(OutHit, LT_Start, LT_End, ObjectQueryParams);
|
||||||
ALandingZone* LZ = Cast<ALandingZone>(OutHit.GetActor());
|
ALandingZone* LZ = Cast<ALandingZone>(OutHit.GetActor());
|
||||||
if (!IsValid(LZ)) return;
|
if (!IsValid(LZ))
|
||||||
|
{
|
||||||
|
Potential_LZ = nullptr;
|
||||||
|
return;
|
||||||
|
}
|
||||||
Potential_LZ = LZ;
|
Potential_LZ = LZ;
|
||||||
LZ->SuggestLandingWidget();
|
LZ->SuggestLandingWidget();
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user