Merge branch 'Tutorial-Checkpoints' into dev
# Conflicts: # EndlessVendetta/Content/StarterContent/HDRI/HDRI_Epic_Courtyard_Daylight.uasset
This commit is contained in:
commit
00612596d5
@ -107,6 +107,7 @@ bSkipMovies=False
|
||||
+MapsToCook=(FilePath="/Game/Levels/OpenWorldRework")
|
||||
+MapsToCook=(FilePath="/Game/BountySystem/ApartmentBounty/LevelInstances/MarketAreaEnemies")
|
||||
+MapsToCook=(FilePath="/Game/BountySystem/ApartmentBounty/LevelInstances/PachinkoEnemies")
|
||||
+MapsToCook=(FilePath="/Game/Levels/TempLevels/NewTutorialMap")
|
||||
+DirectoriesToAlwaysCook=(Path="/Interchange/Functions")
|
||||
+DirectoriesToAlwaysCook=(Path="/Interchange/gltf")
|
||||
+DirectoriesToAlwaysCook=(Path="/Interchange/Materials")
|
||||
|
BIN
EndlessVendetta/Content/BigStarStation/StaticMesh/Building/BP_SpaceShipDoor01.uasset
(Stored with Git LFS)
BIN
EndlessVendetta/Content/BigStarStation/StaticMesh/Building/BP_SpaceShipDoor01.uasset
(Stored with Git LFS)
Binary file not shown.
BIN
EndlessVendetta/Content/BigStarStation/StaticMesh/Props/BP_CorridorDoorLeft.uasset
(Stored with Git LFS)
BIN
EndlessVendetta/Content/BigStarStation/StaticMesh/Props/BP_CorridorDoorLeft.uasset
(Stored with Git LFS)
Binary file not shown.
BIN
EndlessVendetta/Content/BigStarStation/StaticMesh/Props/BP_CorridorDoorRight.uasset
(Stored with Git LFS)
BIN
EndlessVendetta/Content/BigStarStation/StaticMesh/Props/BP_CorridorDoorRight.uasset
(Stored with Git LFS)
Binary file not shown.
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:30830d810f065bccab3cdbe3b3209794a1ef77ca357ad9e34264ad4a40dc4a4b
|
||||
size 552716
|
BIN
EndlessVendetta/Content/BountySystem/Tutorial/BountySpecificActors/AI_Speach_Congrats.wav
(Stored with Git LFS)
Normal file
BIN
EndlessVendetta/Content/BountySystem/Tutorial/BountySpecificActors/AI_Speach_Congrats.wav
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
EndlessVendetta/Content/BountySystem/Tutorial/BountySpecificActors/BP_GunRangeDoor.uasset
(Stored with Git LFS)
Normal file
BIN
EndlessVendetta/Content/BountySystem/Tutorial/BountySpecificActors/BP_GunRangeDoor.uasset
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
EndlessVendetta/Content/BountySystem/Tutorial/BountySpecificActors/BP_GunRangeShutters_Maybe.uasset
(Stored with Git LFS)
Normal file
BIN
EndlessVendetta/Content/BountySystem/Tutorial/BountySpecificActors/BP_GunRangeShutters_Maybe.uasset
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
EndlessVendetta/Content/BountySystem/Tutorial/BountySpecificActors/BP_Ind_Elevator.uasset
(Stored with Git LFS)
BIN
EndlessVendetta/Content/BountySystem/Tutorial/BountySpecificActors/BP_Ind_Elevator.uasset
(Stored with Git LFS)
Binary file not shown.
BIN
EndlessVendetta/Content/BountySystem/Tutorial/BountySpecificActors/BP_Mars.uasset
(Stored with Git LFS)
Normal file
BIN
EndlessVendetta/Content/BountySystem/Tutorial/BountySpecificActors/BP_Mars.uasset
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
EndlessVendetta/Content/BountySystem/Tutorial/BountySpecificActors/Contract/ContractImage.jpg
(Stored with Git LFS)
Normal file
BIN
EndlessVendetta/Content/BountySystem/Tutorial/BountySpecificActors/Contract/ContractImage.jpg
(Stored with Git LFS)
Normal file
Binary file not shown.
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:ea24923f2482a47f97e8c3ec07b9ddf4272ced8852c0267afaeadc9967c2d7b5
|
||||
size 23897
|
BIN
EndlessVendetta/Content/BountySystem/Tutorial/BountySpecificActors/Contract/Item_Contract.uasset
(Stored with Git LFS)
Normal file
BIN
EndlessVendetta/Content/BountySystem/Tutorial/BountySpecificActors/Contract/Item_Contract.uasset
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
EndlessVendetta/Content/BountySystem/Tutorial/BountySpecificActors/Contract/M_ContractPic.uasset
(Stored with Git LFS)
Normal file
BIN
EndlessVendetta/Content/BountySystem/Tutorial/BountySpecificActors/Contract/M_ContractPic.uasset
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
EndlessVendetta/Content/BountySystem/Tutorial/BountySpecificActors/Contract/M_ContractPic_Rot.uasset
(Stored with Git LFS)
Normal file
BIN
EndlessVendetta/Content/BountySystem/Tutorial/BountySpecificActors/Contract/M_ContractPic_Rot.uasset
(Stored with Git LFS)
Normal file
Binary file not shown.
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:cbac2659af0d768ed49696b105864158d3574632f5e836d21b8490c7e3df48a1
|
||||
size 1677020
|
BIN
EndlessVendetta/Content/BountySystem/Tutorial/BountySpecificActors/Elevator/AI_Speach_Elevator.wav
(Stored with Git LFS)
Normal file
BIN
EndlessVendetta/Content/BountySystem/Tutorial/BountySpecificActors/Elevator/AI_Speach_Elevator.wav
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
EndlessVendetta/Content/BountySystem/Tutorial/BountySpecificActors/Elevator/BP_ElevatorDoor_Ind.uasset
(Stored with Git LFS)
Normal file
BIN
EndlessVendetta/Content/BountySystem/Tutorial/BountySpecificActors/Elevator/BP_ElevatorDoor_Ind.uasset
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
EndlessVendetta/Content/BountySystem/Tutorial/BountySpecificActors/Elevator/BP_Ind_Elevator.uasset
(Stored with Git LFS)
Normal file
BIN
EndlessVendetta/Content/BountySystem/Tutorial/BountySpecificActors/Elevator/BP_Ind_Elevator.uasset
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
EndlessVendetta/Content/BountySystem/Tutorial/BountySpecificActors/Mayor/BP_Mayor.uasset
(Stored with Git LFS)
Normal file
BIN
EndlessVendetta/Content/BountySystem/Tutorial/BountySpecificActors/Mayor/BP_Mayor.uasset
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
EndlessVendetta/Content/BountySystem/Tutorial/BountySpecificActors/Mayor/MayorImage.png
(Stored with Git LFS)
Normal file
BIN
EndlessVendetta/Content/BountySystem/Tutorial/BountySpecificActors/Mayor/MayorImage.png
(Stored with Git LFS)
Normal file
Binary file not shown.
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:2d5bac9cdc478a00b470c02301065b8eaa6441820793305dc2a8fb058f1719aa
|
||||
size 1030259
|
BIN
EndlessVendetta/Content/BountySystem/Tutorial/BountySpecificActors/Mayor/WBP_MayorsFace.uasset
(Stored with Git LFS)
Normal file
BIN
EndlessVendetta/Content/BountySystem/Tutorial/BountySpecificActors/Mayor/WBP_MayorsFace.uasset
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
EndlessVendetta/Content/BountySystem/Tutorial/Checkpoints/CP_ContinueThroughFacility.uasset
(Stored with Git LFS)
Normal file
BIN
EndlessVendetta/Content/BountySystem/Tutorial/Checkpoints/CP_ContinueThroughFacility.uasset
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
EndlessVendetta/Content/BountySystem/Tutorial/Checkpoints/CP_DepositGun.uasset
(Stored with Git LFS)
Normal file
BIN
EndlessVendetta/Content/BountySystem/Tutorial/Checkpoints/CP_DepositGun.uasset
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
EndlessVendetta/Content/BountySystem/Tutorial/Checkpoints/CP_Empty.uasset
(Stored with Git LFS)
Normal file
BIN
EndlessVendetta/Content/BountySystem/Tutorial/Checkpoints/CP_Empty.uasset
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
EndlessVendetta/Content/BountySystem/Tutorial/Checkpoints/CP_EnterTheElevator.uasset
(Stored with Git LFS)
Normal file
BIN
EndlessVendetta/Content/BountySystem/Tutorial/Checkpoints/CP_EnterTheElevator.uasset
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
EndlessVendetta/Content/BountySystem/Tutorial/Checkpoints/CP_GadgetTrainingCinematic.uasset
(Stored with Git LFS)
Normal file
BIN
EndlessVendetta/Content/BountySystem/Tutorial/Checkpoints/CP_GadgetTrainingCinematic.uasset
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
EndlessVendetta/Content/BountySystem/Tutorial/Checkpoints/CP_GoThroughMaintenenceArea.uasset
(Stored with Git LFS)
Normal file
BIN
EndlessVendetta/Content/BountySystem/Tutorial/Checkpoints/CP_GoThroughMaintenenceArea.uasset
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
EndlessVendetta/Content/BountySystem/Tutorial/Checkpoints/CP_GrabPistol.uasset
(Stored with Git LFS)
Normal file
BIN
EndlessVendetta/Content/BountySystem/Tutorial/Checkpoints/CP_GrabPistol.uasset
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
EndlessVendetta/Content/BountySystem/Tutorial/Checkpoints/CP_HeadDownTheCorridor.uasset
(Stored with Git LFS)
Normal file
BIN
EndlessVendetta/Content/BountySystem/Tutorial/Checkpoints/CP_HeadDownTheCorridor.uasset
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
EndlessVendetta/Content/BountySystem/Tutorial/Checkpoints/CP_LeaveTheGadgetTrainingFacility.uasset
(Stored with Git LFS)
Normal file
BIN
EndlessVendetta/Content/BountySystem/Tutorial/Checkpoints/CP_LeaveTheGadgetTrainingFacility.uasset
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
EndlessVendetta/Content/BountySystem/Tutorial/Checkpoints/CP_LeaveTheOffice.uasset
(Stored with Git LFS)
Normal file
BIN
EndlessVendetta/Content/BountySystem/Tutorial/Checkpoints/CP_LeaveTheOffice.uasset
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
EndlessVendetta/Content/BountySystem/Tutorial/Checkpoints/CP_ProtectTheHoloSupplies.uasset
(Stored with Git LFS)
Normal file
BIN
EndlessVendetta/Content/BountySystem/Tutorial/Checkpoints/CP_ProtectTheHoloSupplies.uasset
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
EndlessVendetta/Content/BountySystem/Tutorial/Checkpoints/CP_SelectCombat.uasset
(Stored with Git LFS)
Normal file
BIN
EndlessVendetta/Content/BountySystem/Tutorial/Checkpoints/CP_SelectCombat.uasset
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
EndlessVendetta/Content/BountySystem/Tutorial/Checkpoints/CP_SelectRecon.uasset
(Stored with Git LFS)
Normal file
BIN
EndlessVendetta/Content/BountySystem/Tutorial/Checkpoints/CP_SelectRecon.uasset
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
EndlessVendetta/Content/BountySystem/Tutorial/Checkpoints/CP_ShootTheTargets.uasset
(Stored with Git LFS)
Normal file
BIN
EndlessVendetta/Content/BountySystem/Tutorial/Checkpoints/CP_ShootTheTargets.uasset
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
EndlessVendetta/Content/BountySystem/Tutorial/Checkpoints/CP_TalkWithTheMayor.uasset
(Stored with Git LFS)
Normal file
BIN
EndlessVendetta/Content/BountySystem/Tutorial/Checkpoints/CP_TalkWithTheMayor.uasset
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
EndlessVendetta/Content/BountySystem/Tutorial/Checkpoints/CP_TempEmpty.uasset
(Stored with Git LFS)
Normal file
BIN
EndlessVendetta/Content/BountySystem/Tutorial/Checkpoints/CP_TempEmpty.uasset
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
EndlessVendetta/Content/BountySystem/Tutorial/Checkpoints/CP_TutIntroLvlSequence.uasset
(Stored with Git LFS)
Normal file
BIN
EndlessVendetta/Content/BountySystem/Tutorial/Checkpoints/CP_TutIntroLvlSequence.uasset
(Stored with Git LFS)
Normal file
Binary file not shown.
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:da7436168cc76532fe907e829ef9ade4756dfe67377fad08fd9b8103820633a3
|
||||
size 2751136
|
BIN
EndlessVendetta/Content/BountySystem/Tutorial/CinematicSequences/GadgetTraining/AI_Speach_GadgetTraining.wav
(Stored with Git LFS)
Normal file
BIN
EndlessVendetta/Content/BountySystem/Tutorial/CinematicSequences/GadgetTraining/AI_Speach_GadgetTraining.wav
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
EndlessVendetta/Content/BountySystem/Tutorial/CinematicSequences/GadgetTraining/GadgetTrainingSequence.uasset
(Stored with Git LFS)
Normal file
BIN
EndlessVendetta/Content/BountySystem/Tutorial/CinematicSequences/GadgetTraining/GadgetTrainingSequence.uasset
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
EndlessVendetta/Content/BountySystem/Tutorial/CinematicSequences/Intro/MarsShake.uasset
(Stored with Git LFS)
Normal file
BIN
EndlessVendetta/Content/BountySystem/Tutorial/CinematicSequences/Intro/MarsShake.uasset
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
EndlessVendetta/Content/BountySystem/Tutorial/CinematicSequences/Intro/TutorialIntro.uasset
(Stored with Git LFS)
Normal file
BIN
EndlessVendetta/Content/BountySystem/Tutorial/CinematicSequences/Intro/TutorialIntro.uasset
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
EndlessVendetta/Content/BountySystem/Tutorial/CinematicSequences/Intro/WBP_TutIntro.uasset
(Stored with Git LFS)
Normal file
BIN
EndlessVendetta/Content/BountySystem/Tutorial/CinematicSequences/Intro/WBP_TutIntro.uasset
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
EndlessVendetta/Content/BountySystem/Tutorial/GadgetGamemode/BP_BrainSpawner.uasset
(Stored with Git LFS)
BIN
EndlessVendetta/Content/BountySystem/Tutorial/GadgetGamemode/BP_BrainSpawner.uasset
(Stored with Git LFS)
Binary file not shown.
BIN
EndlessVendetta/Content/BountySystem/Tutorial/GadgetGamemode/BP_WaveComputer.uasset
(Stored with Git LFS)
BIN
EndlessVendetta/Content/BountySystem/Tutorial/GadgetGamemode/BP_WaveComputer.uasset
(Stored with Git LFS)
Binary file not shown.
BIN
EndlessVendetta/Content/BountySystem/Tutorial/MB_Training.uasset
(Stored with Git LFS)
BIN
EndlessVendetta/Content/BountySystem/Tutorial/MB_Training.uasset
(Stored with Git LFS)
Binary file not shown.
BIN
EndlessVendetta/Content/Dialogue/D_Mayor_Tutorial.uasset
(Stored with Git LFS)
BIN
EndlessVendetta/Content/Dialogue/D_Mayor_Tutorial.uasset
(Stored with Git LFS)
Binary file not shown.
BIN
EndlessVendetta/Content/FirstPerson/Blueprints/BP_FirstPersonCharacter.uasset
(Stored with Git LFS)
BIN
EndlessVendetta/Content/FirstPerson/Blueprints/BP_FirstPersonCharacter.uasset
(Stored with Git LFS)
Binary file not shown.
@ -1,3 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:276d41edc23363c2297ee9adc12479902f7eeb41daba2bb6e530b53ccc3a50a7
|
||||
size 1938089
|
||||
oid sha256:9f66d5325e533e2512616a08ec970350af33783d40079e87a3fddcd7f9c1f8a1
|
||||
size 1936940
|
||||
|
BIN
EndlessVendetta/Content/MainMenu/Gameplay/MainMenuPlayerController.uasset
(Stored with Git LFS)
BIN
EndlessVendetta/Content/MainMenu/Gameplay/MainMenuPlayerController.uasset
(Stored with Git LFS)
Binary file not shown.
BIN
EndlessVendetta/Content/StarterContent/Blueprints/Blueprint_CeilingLight.uasset
(Stored with Git LFS)
BIN
EndlessVendetta/Content/StarterContent/Blueprints/Blueprint_CeilingLight.uasset
(Stored with Git LFS)
Binary file not shown.
2
EndlessVendetta/EndlessVendetta.sln.DotSettings.user
Normal file
2
EndlessVendetta/EndlessVendetta.sln.DotSettings.user
Normal file
@ -0,0 +1,2 @@
|
||||
<wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
|
||||
<s:String x:Key="/Default/Environment/Highlighting/HighlightingSourceSnapshotLocation/@EntryValue">C:\Users\Rafal\AppData\Local\JetBrains\Rider2023.3\resharper-host\temp\Rider\vAny\CoverageData\_EndlessVendetta.-1253833435\Snapshot\snapshot.utdcvr</s:String></wpf:ResourceDictionary>
|
@ -0,0 +1,18 @@
|
||||
// Fill out your copyright notice in the Description page of Project Settings.
|
||||
|
||||
|
||||
#include "WeaponDepositCheckpoint.h"
|
||||
|
||||
#include "EndlessVendetta/EndlessVendettaCharacter.h"
|
||||
|
||||
void AWeaponDepositCheckpoint::Interact()
|
||||
{
|
||||
if (!Active) return;
|
||||
|
||||
UE_LOG(LogTemp,Warning, TEXT("Sooooo ermmmmmm"));
|
||||
AEndlessVendettaCharacter* Player = Cast<AEndlessVendettaCharacter>(GetWorld()->GetFirstPlayerController()->GetPawn());
|
||||
if (Player->bHasRifle) Player->EquipSecondary();
|
||||
Player->bLockSecondary = true;
|
||||
OpenElevatorDoor();
|
||||
BroadcastCompletion();
|
||||
}
|
@ -0,0 +1,24 @@
|
||||
// Fill out your copyright notice in the Description page of Project Settings.
|
||||
|
||||
#pragma once
|
||||
|
||||
#include "CoreMinimal.h"
|
||||
#include "EndlessVendetta/InteractionInterface.h"
|
||||
#include "EndlessVendetta/BountySystem/CheckpointClass.h"
|
||||
#include "WeaponDepositCheckpoint.generated.h"
|
||||
|
||||
/**
|
||||
*
|
||||
*/
|
||||
UCLASS()
|
||||
class ENDLESSVENDETTA_API AWeaponDepositCheckpoint : public ACheckpointClass, public IInteractionInterface
|
||||
{
|
||||
GENERATED_BODY()
|
||||
|
||||
protected:
|
||||
void Interact() override;
|
||||
|
||||
UFUNCTION(BlueprintImplementableEvent)
|
||||
void OpenElevatorDoor();
|
||||
|
||||
};
|
@ -493,7 +493,7 @@ void AEndlessVendettaCharacter::EquipPrimary()
|
||||
|
||||
void AEndlessVendettaCharacter::EquipSecondary()
|
||||
{
|
||||
if (bIsReloading) return;
|
||||
if (bIsReloading || bLockSecondary) return;
|
||||
if (!IsValid(SecondaryWeaponClass)) return;
|
||||
if (PlayerOnShip || InPauseMenu) return;
|
||||
FActorSpawnParameters spawnParams;
|
||||
|
@ -219,6 +219,8 @@ public:
|
||||
AGadgetManager* GadgetManager;
|
||||
bool bIsReloading = false;
|
||||
|
||||
bool bLockSecondary = false;
|
||||
|
||||
bool bIsPlayerMoving = false;
|
||||
|
||||
UPROPERTY(VisibleAnywhere, BlueprintReadWrite)
|
||||
|
Loading…
Reference in New Issue
Block a user