Implemented Shotgun Checkpoints

This commit is contained in:
Rafal Swierczek 2024-01-14 06:39:12 +00:00
parent 5146327b2c
commit 8b96a67028
17 changed files with 47 additions and 16 deletions

View File

@ -8,8 +8,15 @@
</component> </component>
<component name="ChangeListManager"> <component name="ChangeListManager">
<list default="true" id="42162083-13f4-4956-90b7-146c4a08f785" name="Changes" comment=""> <list default="true" id="42162083-13f4-4956-90b7-146c4a08f785" name="Changes" comment="">
<change beforePath="$PROJECT_DIR$/Content/BountySystem/ControlsTutorial/BD_ControlsTutorial.uasset" beforeDir="false" afterPath="$PROJECT_DIR$/Content/BountySystem/ControlsTutorial/BD_ControlsTutorial.uasset" afterDir="false" /> <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/ControlsTutorial/Bounty/MB_Training.uasset" beforeDir="false" afterPath="$PROJECT_DIR$/Content/BountySystem/ControlsTutorial/Bounty/MB_Training.uasset" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Content/BountySystem/ControlsTutorial/GunRangeMechanics/BP_DroppableWall.uasset" beforeDir="false" afterPath="$PROJECT_DIR$/Content/BountySystem/ControlsTutorial/GunRangeMechanics/BP_DroppableWall.uasset" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Content/BountySystem/ControlsTutorial/GunRangeMechanics/Target/BP_Target.uasset" beforeDir="false" afterPath="$PROJECT_DIR$/Content/BountySystem/ControlsTutorial/GunRangeMechanics/Target/BP_Target.uasset" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Content/Levels/ControlTutorialLevel.umap" beforeDir="false" afterPath="$PROJECT_DIR$/Content/Levels/ControlTutorialLevel.umap" afterDir="false" /> <change beforePath="$PROJECT_DIR$/Content/Levels/ControlTutorialLevel.umap" beforeDir="false" afterPath="$PROJECT_DIR$/Content/Levels/ControlTutorialLevel.umap" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Content/StarterContent/Audio/Collapse01.uasset" beforeDir="false" afterPath="$PROJECT_DIR$/Content/StarterContent/Audio/Collapse01.uasset" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Content/StarterContent/HDRI/HDRI_Epic_Courtyard_Daylight.uasset" beforeDir="false" afterPath="$PROJECT_DIR$/Content/StarterContent/HDRI/HDRI_Epic_Courtyard_Daylight.uasset" 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" />
</list> </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" />
@ -124,7 +131,7 @@
<option name="number" value="Default" /> <option name="number" value="Default" />
<option name="presentableId" value="Default" /> <option name="presentableId" value="Default" />
<updated>1705182847910</updated> <updated>1705182847910</updated>
<workItem from="1705182850227" duration="1968000" /> <workItem from="1705182850227" duration="3992000" />
</task> </task>
<servers /> <servers />
</component> </component>

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:7de40abb954725c469a7fcb11456a11922dce9ce061d1540cab05467116aae29
size 65818

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:21364379b0705a11a56116ea8b2fc9d8fd43079f8147a2ef84314b9cda8d97f9
size 18316

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:b82203fe93ab0db2ec9fce1a765d76d8eef064de5035836ec8964abe3dadb376
size 140176

View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1 version https://git-lfs.github.com/spec/v1
oid sha256:afa39ee6051cf8de083ac7531226891b50663f9121180792c783a1164a7d2e38 oid sha256:e78faeaf50f50707879bcd856dbba79d38a8bfc7606fd3dd7c79f3cd7f4c36be
size 22782 size 24203

View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1 version https://git-lfs.github.com/spec/v1
oid sha256:5c125e80e167538b873773fa5c90ed7f6e37b6efc8fe4e5dfe4c90078a0782b3 oid sha256:92bcdc4257fb418b5d58b8d291fead0d206ea59774856556af22e6e182299e07
size 64051 size 101690

View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1 version https://git-lfs.github.com/spec/v1
oid sha256:81b4af129dd64a974daf8ea63b3e8635b024f3725e64d3c6033c49baefd8ab82 oid sha256:e5359d34f51cb7298d6e3c64aa6ff60e6a610066339af826e5e53b95436f12be
size 3173962 size 3184727

Binary file not shown.

View File

@ -29,7 +29,7 @@ void ACheckpointClass::SpawnWaypoint(const FString& CurrentBountyTitle)
WaypointActor->SetupWaypoint(WaypointIcon, BountyTitle); WaypointActor->SetupWaypoint(WaypointIcon, BountyTitle);
} }
void ACheckpointClass::UpdateChecpointWaypoint(FVector WaypointNewLoc) void ACheckpointClass::UpdateCheckpointWaypoint(FVector WaypointNewLoc)
{ {
FActorSpawnParameters SpawnParams; FActorSpawnParameters SpawnParams;
SpawnParams.SpawnCollisionHandlingOverride = ESpawnActorCollisionHandlingMethod::AlwaysSpawn; SpawnParams.SpawnCollisionHandlingOverride = ESpawnActorCollisionHandlingMethod::AlwaysSpawn;

View File

@ -41,7 +41,7 @@ protected:
} }
UFUNCTION(BlueprintCallable) UFUNCTION(BlueprintCallable)
void UpdateChecpointWaypoint(FVector WaypointNewLoc); void UpdateCheckpointWaypoint(FVector WaypointNewLoc);
// Called when the game starts or when spawned // Called when the game starts or when spawned
virtual void BeginPlay() override; virtual void BeginPlay() override;