Skip to content
This repository was archived by the owner on Oct 11, 2024. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 10 additions & 8 deletions Config/DefaultEngine.ini
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,6 @@ MaxSubstepDeltaTime=0.033333

[/Script/WindowsTargetPlatform.WindowsTargetSettings]
DefaultGraphicsRHI=DefaultGraphicsRHI_Default
+D3D12TargetedShaderFormats=PCD3D_SM5
+D3D12TargetedShaderFormats=PCD3D_SM6
+D3D11TargetedShaderFormats=PCD3D_SM5
Compiler=Default
Expand All @@ -140,15 +139,15 @@ SourceDataOverridePlugin=None
ReverbPlugin=Built-in Reverb
OcclusionPlugin=Built-in Occlusion
CompressionOverrides=(bOverrideCompressionTimes=False,DurationThreshold=5.000000,MaxNumRandomBranches=0,SoundCueQualityIndex=0)
CacheSizeKB=0
CacheSizeKB=65536
MaxChunkSizeOverrideKB=0
bResampleForDevice=False
MaxSampleRate=0.000000
HighSampleRate=0.000000
MedSampleRate=0.000000
LowSampleRate=0.000000
MinSampleRate=0.000000
CompressionQualityModifier=0.000000
MaxSampleRate=48000.000000
HighSampleRate=32000.000000
MedSampleRate=24000.000000
LowSampleRate=12000.000000
MinSampleRate=8000.000000
CompressionQualityModifier=1.000000
AutoStreamingThreshold=0.000000
SoundCueCookQualityIndex=0

Expand Down Expand Up @@ -360,3 +359,6 @@ SoundCueCookQualityIndex=0
[/Script/UnrealEd.CookerSettings]
bCookOnTheFlyForLaunchOn=True

[/Script/Engine.AudioSettings]
DefaultAudioCompressionType=BinkAudio

8 changes: 4 additions & 4 deletions Config/DefaultGame.ini
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ ProjectDebugTitleInfo=NSLOCTEXT("[/Script/EngineSettings]", "BE87C6DA4FF84CEDD63
ProjectDisplayedTitle=NSLOCTEXT("[/Script/EngineSettings]", "63DFDD624C6C2FDA67C19598742EFFE9", "Project Elementus:")
SupportContact=contatolukevboas@gmail.com
CopyrightNotice=
ProjectVersion=0.6.3a
ProjectVersion=0.6.4a
CompanyName=Lucas Vilas-Boas
CompanyDistinguishedName=Lucoiso
Description=Project Elementus is a third person template that can be used to start projects that will use some new features that came with Unreal Engine 5 as well as powerful existing features like the Gameplay Ability System and others.
Expand All @@ -26,7 +26,7 @@ ExtraArgs=--http asio --gc-cache-duration-seconds 2937600 --gc-interval-seconds

[/Script/UnrealEd.ProjectPackagingSettings]
Build=IfProjectHasCode
BuildConfiguration=PPBC_DebugGame
BuildConfiguration=PPBC_Development
BuildTarget=
LaunchOnTarget=
StagingDirectory=(Path="")
Expand Down Expand Up @@ -58,7 +58,7 @@ PackageCompressionLevel_TestShipping=5
PackageCompressionLevel_Distribution=7
PackageCompressionMinBytesSaved=1024
PackageCompressionMinPercentSaved=5
bPackageCompressionEnableDDC=True
bPackageCompressionEnableDDC=False
PackageCompressionMinSizeToConsiderDDC=0
HttpChunkInstallDataVersion=
IncludePrerequisites=True
Expand All @@ -67,7 +67,7 @@ bShareMaterialShaderCode=True
bDeterministicShaderCodeOrder=False
bSharedMaterialNativeLibraries=True
ApplocalPrerequisitesDirectory=(Path="")
IncludeCrashReporter=True
IncludeCrashReporter=False
InternationalizationPreset=English
+CulturesToStage=en
LocalizationTargetCatchAllChunkId=0
Expand Down
8 changes: 0 additions & 8 deletions Config/DefaultInput.ini
Original file line number Diff line number Diff line change
@@ -1,11 +1,4 @@
[/Script/Engine.InputSettings]
-AxisConfig=(AxisKeyName="Gamepad_LeftX",AxisProperties=(DeadZone=0.25,Exponent=1.f,Sensitivity=1.f))
-AxisConfig=(AxisKeyName="Gamepad_LeftY",AxisProperties=(DeadZone=0.25,Exponent=1.f,Sensitivity=1.f))
-AxisConfig=(AxisKeyName="Gamepad_RightX",AxisProperties=(DeadZone=0.25,Exponent=1.f,Sensitivity=1.f))
-AxisConfig=(AxisKeyName="Gamepad_RightY",AxisProperties=(DeadZone=0.25,Exponent=1.f,Sensitivity=1.f))
-AxisConfig=(AxisKeyName="MouseX",AxisProperties=(DeadZone=0.f,Exponent=1.f,Sensitivity=0.07f))
-AxisConfig=(AxisKeyName="MouseY",AxisProperties=(DeadZone=0.f,Exponent=1.f,Sensitivity=0.07f))
-AxisConfig=(AxisKeyName="Mouse2D",AxisProperties=(DeadZone=0.f,Exponent=1.f,Sensitivity=0.07f))
+AxisConfig=(AxisKeyName="ValveIndex_Right_Trigger_Axis",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False))
+AxisConfig=(AxisKeyName="ValveIndex_Right_Thumbstick_X",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False))
+AxisConfig=(AxisKeyName="ValveIndex_Right_Thumbstick_Y",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False))
Expand Down Expand Up @@ -125,7 +118,6 @@ DoubleClickTime=0.200000
DefaultPlayerInputClass=/Script/EnhancedInput.EnhancedPlayerInput
DefaultInputComponentClass=/Script/EnhancedInput.EnhancedInputComponent
DefaultTouchInterface=/Engine/MobileResources/HUD/DefaultVirtualJoysticks.DefaultVirtualJoysticks
-ConsoleKeys=Tilde
+ConsoleKeys=Tilde

[/Script/InputEditor.EnhancedInputEditorProjectSettings]
Expand Down
10 changes: 10 additions & 0 deletions Config/DefaultMetaSound.ini
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
[/Script/MetasoundEngine.MetaSoundSettings]
bAutoUpdateEnabled=True
bAutoUpdateLogWarningOnDroppedConnection=True
+DirectoriesToRegister=(Path="/Game/Main/Sounds/Lyra/Ambience")
+DirectoriesToRegister=(Path="/Game/Main/Sounds/Lyra/Footsteps")
+DirectoriesToRegister=(Path="/Game/Main/Sounds/Lyra/Shared")
+DirectoriesToRegister=(Path="/DefaultAbilities/Sounds")
+DirectoriesToRegister=(Path="/Swinging/Sounds")
+DirectoriesToRegister=(Path="/Telekinesis/Sounds")

4 changes: 2 additions & 2 deletions Content/Main/Blueprints/Actors/World/Scene/BP_Elevator.uasset
Git LFS file not shown
4 changes: 2 additions & 2 deletions Content/Main/Blueprints/Widgets/WB_Settings.uasset
Git LFS file not shown
4 changes: 2 additions & 2 deletions Content/Main/Character/Animations/Blueprints/ABP_Manny.uasset
Git LFS file not shown
4 changes: 2 additions & 2 deletions Content/Main/Maps/Main/MP_Main_Persistent.umap
Git LFS file not shown
4 changes: 2 additions & 2 deletions Content/Main/Maps/Main/Sub-Levels/MP_Main_Blueprints.umap
Git LFS file not shown
2 changes: 1 addition & 1 deletion Content/Main/Maps/Main/Sub-Levels/MP_Main_Meshes.umap
Git LFS file not shown
2 changes: 1 addition & 1 deletion Content/Main/Maps/Main/Sub-Levels/MP_Main_RenderFX.umap
Git LFS file not shown
4 changes: 2 additions & 2 deletions Content/Main/Sounds/Lyra/Ambience/MS_Ambience.uasset
Git LFS file not shown
4 changes: 2 additions & 2 deletions Content/Main/Sounds/Lyra/Ambience/SFX_Ambience.uasset
Git LFS file not shown
4 changes: 2 additions & 2 deletions Content/Main/Sounds/Lyra/Footsteps/MS_Footsteps.uasset
Git LFS file not shown
4 changes: 2 additions & 2 deletions Content/Main/Sounds/Lyra/Footsteps/SFX_Footstep_01.uasset
Git LFS file not shown
4 changes: 2 additions & 2 deletions Content/Main/Sounds/Lyra/Footsteps/SFX_Footstep_02.uasset
Git LFS file not shown
4 changes: 2 additions & 2 deletions Content/Main/Sounds/Lyra/Footsteps/SFX_Footstep_03.uasset
Git LFS file not shown
4 changes: 2 additions & 2 deletions Content/Main/Sounds/Lyra/Footsteps/SFX_Footstep_04.uasset
Git LFS file not shown
4 changes: 2 additions & 2 deletions Content/Main/Sounds/Lyra/Footsteps/SFX_Footstep_05.uasset
Git LFS file not shown
4 changes: 2 additions & 2 deletions Content/Main/Sounds/Lyra/Footsteps/SFX_Footstep_06.uasset
Git LFS file not shown
4 changes: 2 additions & 2 deletions Content/Main/Sounds/Lyra/Footsteps/SFX_Footstep_07.uasset
Git LFS file not shown
4 changes: 2 additions & 2 deletions Content/Main/Sounds/Lyra/Footsteps/SFX_Footstep_08.uasset
Git LFS file not shown
4 changes: 2 additions & 2 deletions Content/Main/Sounds/Lyra/Footsteps/SFX_Footstep_09.uasset
Git LFS file not shown
4 changes: 2 additions & 2 deletions Content/Main/Sounds/Lyra/Footsteps/SFX_Footstep_10.uasset
Git LFS file not shown
4 changes: 2 additions & 2 deletions Content/Main/Sounds/Lyra/Footsteps/SFX_Footstep_11.uasset
Git LFS file not shown
4 changes: 2 additions & 2 deletions Content/Main/Sounds/Lyra/Shared/SFX_Coin.uasset
Git LFS file not shown
4 changes: 2 additions & 2 deletions Content/Main/Sounds/Lyra/Shared/SFX_Dash_01.uasset
Git LFS file not shown
4 changes: 2 additions & 2 deletions Content/Main/Sounds/Lyra/Shared/SFX_Dash_02.uasset
Git LFS file not shown
4 changes: 2 additions & 2 deletions Content/Main/Sounds/Lyra/Shared/SFX_Melee_01.uasset
Git LFS file not shown
4 changes: 2 additions & 2 deletions Content/Main/Sounds/Lyra/Shared/SFX_Melee_02.uasset
Git LFS file not shown
4 changes: 2 additions & 2 deletions Content/Main/Sounds/Lyra/Shared/SFX_Melee_03.uasset
Git LFS file not shown
4 changes: 2 additions & 2 deletions Content/Main/Sounds/Lyra/Shared/SFX_Potion.uasset
Git LFS file not shown
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
6 changes: 1 addition & 5 deletions ProjectElementus.uproject
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,7 @@
{
"Name": "ProjectElementus",
"Type": "Runtime",
"LoadingPhase": "Default",
"AdditionalDependencies": [
"Engine",
"DeveloperSettings"
]
"LoadingPhase": "Default"
}
],
"Plugins": [
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
#include "NiagaraFunctionLibrary.h"
#include "NiagaraSystem.h"

APEExplosiveActor::APEExplosiveActor(const FObjectInitializer& ObjectInitializer) : Super(ObjectInitializer), ExplosionRadius(150.f), ExplosionMagnitude(1000.f), bDestroyAfterExplosion(true), bDebug(false)
APEExplosiveActor::APEExplosiveActor(const FObjectInitializer& ObjectInitializer) : Super(ObjectInitializer), ExplosionRadius(150.f), ExplosionMagnitude(1000.f), bDestroyAfterExplosion(true)
{
bReplicates = false;
PrimaryActorTick.bCanEverTick = false;
Expand All @@ -32,12 +32,11 @@ void APEExplosiveActor::PerformExplosion()
QueryParams.AddIgnoredActor(this);
QueryParams.MobilityType = EQueryMobilityType::Dynamic;

if (bDebug)
{
const FName TraceTag("SphereTraceDebugTag");
GetWorld()->DebugDrawTraceTag = TraceTag;
QueryParams.TraceTag = TraceTag;
}
#if UE_ENABLE_DEBUG_DRAWING
const FName TraceTag("SphereTraceDebugTag");
GetWorld()->DebugDrawTraceTag = TraceTag;
QueryParams.TraceTag = TraceTag;
#endif

GetWorld()->SweepMultiByObjectType(HitOut, GetActorLocation(), GetActorLocation(), FQuat(FRotator(0.f)), FCollisionObjectQueryParams::AllDynamicObjects, FCollisionShape::MakeSphere(ExplosionRadius), QueryParams);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
#include "GameplayEffect.h"
#include "AbilitySystemGlobals.h"
#include "Kismet/GameplayStatics.h"
#include "AbilitySystemLog.h"

UPEGameplayAbility::UPEGameplayAbility(const FObjectInitializer& ObjectInitializer) : Super(ObjectInitializer), AbilityMaxRange(0), bIgnoreCost(false), bIgnoreCooldown(false), bWaitCancel(true), AbilityActiveTime(0), bEndAbilityAfterActiveTime(false)
{
Expand Down Expand Up @@ -485,7 +486,7 @@ void UPEGameplayAbility::PlayAbilitySoundAttached(USceneComponent* InComponent,
{
if (!IsValid(AbilitySoundFX))
{
ABILITY_VLOG(this, Error, TEXT("Tried to play ability %s sound with a null metasound object."), *GetName());
ABILITY_VLOG(this, Error, TEXT("Tried to play ability %s sound with a null sound object."), *GetName());
return;
}

Expand All @@ -502,7 +503,7 @@ void UPEGameplayAbility::PlayAbilitySoundAtLocation(const UObject* WorldContext,
{
if (!IsValid(AbilitySoundFX))
{
ABILITY_VLOG(this, Error, TEXT("Tried to play ability %s sound with a null metasound object."), *GetName());
ABILITY_VLOG(this, Error, TEXT("Tried to play ability %s sound with a null sound object."), *GetName());
return;
}

Expand Down
7 changes: 4 additions & 3 deletions Source/ProjectElementus/ProjectElementus.Build.cs
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ public ProjectElementus(ReadOnlyTargetRules Target) : base(Target)
"Core",
"ElementusInventory",
"GameplayTags"
});
});

PrivateDependencyModuleNames.AddRange(new[]
{
Expand All @@ -39,7 +39,8 @@ public ProjectElementus(ReadOnlyTargetRules Target) : base(Target)
"OnlineSubsystem",
"EOSVoiceChat",
"VoiceChat",
"JsonUtilities"
});
"JsonUtilities",
"DeveloperSettings"
});
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -35,9 +35,6 @@ class PROJECTELEMENTUS_API APEExplosiveActor : public AActor
UPROPERTY(EditDefaultsOnly, BlueprintReadOnly, Category = "Project Elementus | Properties")
bool bDestroyAfterExplosion;

UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = "Project Elementus | Properties")
bool bDebug;

/* Gameplay Effects and SetByCaller parameters that will be applied to target */
UPROPERTY(EditDefaultsOnly, BlueprintReadOnly, Category = "Project Elementus | Properties")
TArray<FGameplayEffectGroupedData> ExplosionEffects;
Expand Down