diff --git a/EndlessVendetta/.idea/.idea.EndlessVendetta/.idea/workspace.xml b/EndlessVendetta/.idea/.idea.EndlessVendetta/.idea/workspace.xml index 69cf729c..d61b2827 100644 --- a/EndlessVendetta/.idea/.idea.EndlessVendetta/.idea/workspace.xml +++ b/EndlessVendetta/.idea/.idea.EndlessVendetta/.idea/workspace.xml @@ -8,10 +8,8 @@ - - - + diff --git a/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/ModularPieces/BP_TempRailingRange.uasset b/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/ModularPieces/BP_TempRailingRange.uasset new file mode 100644 index 00000000..72361ecc --- /dev/null +++ b/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/ModularPieces/BP_TempRailingRange.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a82b20c35d0666ab043f00fae23406f2dff8e82df14b4fe8d1baf239b5c744cb +size 31656 diff --git a/EndlessVendetta/Content/BountySystem/ControlsTutorial/GunRangeMechanics/BP_DroppableWall.uasset b/EndlessVendetta/Content/BountySystem/ControlsTutorial/GunRangeMechanics/BP_DroppableWall.uasset index bab23348..801e58a7 100644 --- a/EndlessVendetta/Content/BountySystem/ControlsTutorial/GunRangeMechanics/BP_DroppableWall.uasset +++ b/EndlessVendetta/Content/BountySystem/ControlsTutorial/GunRangeMechanics/BP_DroppableWall.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d503f14cd7a769493cf5f4740e84910e4c3caafafd8f6406ba1701879b5603f6 -size 78176 +oid sha256:1c7cc4d2e0cbe25fbe535bfada1d5d6c581a3fe5754855fb6b94c0c1254ddcd4 +size 128878 diff --git a/EndlessVendetta/Content/Levels/ControlTutorialLevel.umap b/EndlessVendetta/Content/Levels/ControlTutorialLevel.umap index cabd5c22..5847615b 100644 --- a/EndlessVendetta/Content/Levels/ControlTutorialLevel.umap +++ b/EndlessVendetta/Content/Levels/ControlTutorialLevel.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6537a51bef8d8a9f5cfe87d0e8648f7e72c995544b8bec1208cbf7c4e59bfa40 -size 2149246 +oid sha256:77b880dc860a7b8ee310b414c6b55ad3646bc544e3dc13cbc7bf52eaf31241bf +size 3168699 diff --git a/EndlessVendetta/Source/EndlessVendetta/DroppableWall.h b/EndlessVendetta/Source/EndlessVendetta/DroppableWall.h index 015bd01f..7716ad6d 100644 --- a/EndlessVendetta/Source/EndlessVendetta/DroppableWall.h +++ b/EndlessVendetta/Source/EndlessVendetta/DroppableWall.h @@ -23,6 +23,9 @@ public: virtual void Tick(float DeltaTime) override; UFUNCTION(BlueprintImplementableEvent) - void ActivateWall(); + void WallToCounterTimeline(); + + UFUNCTION(BlueprintImplementableEvent) + void DropWallFullyTimeline(); };