Rafal/EndlessVendetta
Rafal/EndlessVendetta
1
0
Fork 0
Code Issues Pull Requests Releases 1 Activity

Merge branch 'GadgetTutorialRevamp' into dev

Browse Source
This commit is contained in:
MH261677 2024-04-22 16:12:41 +01:00
commit 1c70bba094
48 changed files with 120 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
EndlessVendetta/Config/DefaultEngine.ini
View File

@ -62,7 +62,7 @@
+CollisionChannelRedirects=(OldName="PawnMovement",NewName="Pawn")
[/Script/EngineSettings.GameMapsSettings]
EditorStartupMap=/Game/Levels/MovementTest.MovementTest
EditorStartupMap=/Game/Levels/TempLevels/NewTutorialMap.NewTutorialMap
LocalMapOptions=
TransitionMap=None
bUseSplitscreen=True

BIN
EndlessVendetta/Content/Assets/OpenWorld/Props/MetalBarrier01.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
EndlessVendetta/Content/Assets/OpenWorld/Props/Textures_parts/MetalBarrier/M_MetalBarrier01.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
EndlessVendetta/Content/Assets/OpenWorld/Props/Textures_parts/MetalBarrier/MetalBarrier_low_Barrier_BaseColor.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
EndlessVendetta/Content/Assets/OpenWorld/Props/Textures_parts/MetalBarrier/MetalBarrier_low_Barrier_Normal.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
EndlessVendetta/Content/Assets/OpenWorld/Props/Textures_parts/MetalBarrier/MetalBarrier_low_Barrier_OcclusionRoughnessMetallic.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
EndlessVendetta/Content/BigStarStation/Materials/MI_LightEmissiveRed.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
EndlessVendetta/Content/BigStarStation/StaticMesh/Building/SM_CorridorRedLight.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
EndlessVendetta/Content/BountySystem/CP_FinalCheckpoint.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
EndlessVendetta/Content/BountySystem/ControlsTutorial/BD_ControlsTutorial.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
EndlessVendetta/Content/BountySystem/ControlsTutorial/Bounty/MB_Training.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
EndlessVendetta/Content/BountySystem/ControlsTutorial/Bounty/OWCP_Training.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
EndlessVendetta/Content/BountySystem/ControlsTutorial/GunRangeMechanics/GadgetRoom/BP_CombatWorkbench.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
EndlessVendetta/Content/BountySystem/ControlsTutorial/GunRangeMechanics/GadgetRoom/BP_ReconWorkbench.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
EndlessVendetta/Content/BountySystem/Tutorial/BountySpecificActors/BP_GunDeposit.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

3
EndlessVendetta/Content/BountySystem/Tutorial/BountySpecificActors/BP_Ind_Elevator.uasset Normal file
View File

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

BIN
EndlessVendetta/Content/BountySystem/Tutorial/BountySpecificActors/BP_IndustrialElevator.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
EndlessVendetta/Content/BountySystem/Tutorial/BountySpecificActors/CS_IndustrialElevator.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
EndlessVendetta/Content/BountySystem/Tutorial/BountySpecificActors/CS_IndustrialElevator_End.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
EndlessVendetta/Content/BountySystem/Tutorial/GadgetGamemode/BP_BrainSpawner.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
EndlessVendetta/Content/BountySystem/Tutorial/GadgetGamemode/BP_BrainVirus.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
EndlessVendetta/Content/BountySystem/Tutorial/GadgetGamemode/BP_CombatWorkbench.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
EndlessVendetta/Content/BountySystem/Tutorial/GadgetGamemode/BP_HoloSupply.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
EndlessVendetta/Content/BountySystem/Tutorial/GadgetGamemode/BP_HoloSupplyStation.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
EndlessVendetta/Content/BountySystem/Tutorial/GadgetGamemode/BP_ReconWorkbench.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

3
EndlessVendetta/Content/BountySystem/Tutorial/GadgetGamemode/BP_WaveComputer.uasset Normal file
View File

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

BIN
EndlessVendetta/Content/BountySystem/Tutorial/GadgetGamemode/Character/AI_BrainVirus.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
EndlessVendetta/Content/BountySystem/Tutorial/GadgetGamemode/Character/BB_BrainVirus.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
EndlessVendetta/Content/BountySystem/Tutorial/GadgetGamemode/Character/BP_BrainVirus.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
EndlessVendetta/Content/BountySystem/Tutorial/GadgetGamemode/Character/BT_BrainVirus.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
EndlessVendetta/Content/BountySystem/Tutorial/GadgetGamemode/Widgets/PixelBrainImage.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
EndlessVendetta/Content/BountySystem/Tutorial/GadgetGamemode/Widgets/WBP_WaveComputer_Congrats.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
EndlessVendetta/Content/BountySystem/Tutorial/GadgetGamemode/Widgets/WBP_WaveComputer_Prepare.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
EndlessVendetta/Content/BountySystem/Tutorial/GadgetGamemode/Widgets/WBP_WaveComputer_Wave.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
EndlessVendetta/Content/BountySystem/Tutorial/MB_Training.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
EndlessVendetta/Content/BountySystem/Tutorial/OWCP_Training.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
EndlessVendetta/Content/Cyberpunk_Gigapack/Materials/Material_Instance/MI_Screen03.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
EndlessVendetta/Content/FirstPerson/Blueprints/BP_FirstPersonCharacter.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
EndlessVendetta/Content/FirstPerson/Blueprints/BP_MainCharacter.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
EndlessVendetta/Content/Gadgets/CombatGadgets/HeatBlast/CG_HeatBlast.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
EndlessVendetta/Content/Gadgets/ReconGadgets/VisionPulse/RG_VisionPulse.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
EndlessVendetta/Content/Levels/OpenWorldRework.umap (Stored with Git LFS)
View File

Binary file not shown.

BIN
EndlessVendetta/Content/Levels/TempLevels/NewTutorialMap.umap (Stored with Git LFS)
View File

Binary file not shown.

BIN
EndlessVendetta/Content/Levels/TempLevels/StealthAreaTut.umap (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
EndlessVendetta/Content/StarterContent/Blueprints/Blueprint_CeilingLight.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
EndlessVendetta/Content/StarterContent/HDRI/HDRI_Epic_Courtyard_Daylight.uasset (Stored with Git LFS)
View File

Binary file not shown.

4
EndlessVendetta/Source/EndlessVendetta/GadgetSystem/GadgetBase.cpp
View File

@ -51,8 +51,8 @@ bool AGadgetBase::Unequip()
UEnhancedInputLocalPlayerSubsystem* Subsystem = ULocalPlayer::GetSubsystem<UEnhancedInputLocalPlayerSubsystem>(PlayerController->GetLocalPlayer());
Subsystem->RemoveMappingContext(GadgetMappingContext);
UEnhancedInputComponent* EnhancedInputComponent = Cast<UEnhancedInputComponent>(PlayerController->InputComponent);
EnhancedInputComponent->ClearActionBindings();
// UEnhancedInputComponent* EnhancedInputComponent = Cast<UEnhancedInputComponent>(PlayerController->InputComponent);
// EnhancedInputComponent->ClearActionBindings();
return true;
}

2
EndlessVendetta/Source/EndlessVendetta/GadgetSystem/GadgetBase.h
View File

@ -72,7 +72,7 @@ protected:
bool GadgetCantBeUsed()
{
return GadgetOnCooldown|| GadgetInUse;
return GadgetOnCooldown || GadgetInUse || !Equipped;
}
// Called when the game starts or when spawned