diff --git a/SwordNGun/Content/Characters/Protagonist/States/BP_ProtagGroundedState.uasset b/SwordNGun/Content/Characters/Protagonist/States/BP_ProtagGroundedState.uasset index 8954a0e..7ac1612 100644 --- a/SwordNGun/Content/Characters/Protagonist/States/BP_ProtagGroundedState.uasset +++ b/SwordNGun/Content/Characters/Protagonist/States/BP_ProtagGroundedState.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2779af18fafadee39d4bd4a5fcf068122dd3340f1d8955a758ef2eb8ae4320cc -size 174254 +oid sha256:7aaed864a84944c4540e30db7e7bedcdec0377c4bc1f40aa7270d19198656d61 +size 186477 diff --git a/SwordNGun/Content/Characters/Protagonist/States/BP_ProtagReloadState.uasset b/SwordNGun/Content/Characters/Protagonist/States/BP_ProtagReloadState.uasset index 95e9518..16679af 100644 --- a/SwordNGun/Content/Characters/Protagonist/States/BP_ProtagReloadState.uasset +++ b/SwordNGun/Content/Characters/Protagonist/States/BP_ProtagReloadState.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4b60a8b533e4f866fbda11a3ef736c33e2bceb2b2970c6b7a3657bb66e6658df -size 139209 +oid sha256:0bcf6fc62840c0eab05dd9e39d0e60b672d26d1f9c56793e51d635f798fefafd +size 122050 diff --git a/SwordNGun/Source/SwordNGun/Private/Characters/SNGCharacterBase.cpp b/SwordNGun/Source/SwordNGun/Private/Characters/SNGCharacterBase.cpp index 92ce9b3..debd3a8 100644 Binary files a/SwordNGun/Source/SwordNGun/Private/Characters/SNGCharacterBase.cpp and b/SwordNGun/Source/SwordNGun/Private/Characters/SNGCharacterBase.cpp differ diff --git a/SwordNGun/Source/SwordNGun/Private/Characters/SNGProtagonist.cpp b/SwordNGun/Source/SwordNGun/Private/Characters/SNGProtagonist.cpp index 596fc3f..b1940ea 100644 Binary files a/SwordNGun/Source/SwordNGun/Private/Characters/SNGProtagonist.cpp and b/SwordNGun/Source/SwordNGun/Private/Characters/SNGProtagonist.cpp differ diff --git a/SwordNGun/Source/SwordNGun/Private/Weapons/SNGHitscanWeapon.cpp b/SwordNGun/Source/SwordNGun/Private/Weapons/SNGHitscanWeapon.cpp index 6c77e92..9985f64 100644 Binary files a/SwordNGun/Source/SwordNGun/Private/Weapons/SNGHitscanWeapon.cpp and b/SwordNGun/Source/SwordNGun/Private/Weapons/SNGHitscanWeapon.cpp differ diff --git a/SwordNGun/Source/SwordNGun/Private/Weapons/SNGRangedWeaponBase.cpp b/SwordNGun/Source/SwordNGun/Private/Weapons/SNGRangedWeaponBase.cpp index 8599efd..076963c 100644 Binary files a/SwordNGun/Source/SwordNGun/Private/Weapons/SNGRangedWeaponBase.cpp and b/SwordNGun/Source/SwordNGun/Private/Weapons/SNGRangedWeaponBase.cpp differ diff --git a/SwordNGun/Source/SwordNGun/Public/Characters/SNGProtagonist.h b/SwordNGun/Source/SwordNGun/Public/Characters/SNGProtagonist.h index 5eb757a..cd4eec9 100644 Binary files a/SwordNGun/Source/SwordNGun/Public/Characters/SNGProtagonist.h and b/SwordNGun/Source/SwordNGun/Public/Characters/SNGProtagonist.h differ diff --git a/SwordNGun/Source/SwordNGun/Public/Weapons/SNGHitscanWeapon.h b/SwordNGun/Source/SwordNGun/Public/Weapons/SNGHitscanWeapon.h index fd04f79..0962429 100644 Binary files a/SwordNGun/Source/SwordNGun/Public/Weapons/SNGHitscanWeapon.h and b/SwordNGun/Source/SwordNGun/Public/Weapons/SNGHitscanWeapon.h differ diff --git a/SwordNGun/Source/SwordNGun/Public/Weapons/SNGRangedWeaponBase.h b/SwordNGun/Source/SwordNGun/Public/Weapons/SNGRangedWeaponBase.h index df35f57..7a8f28f 100644 Binary files a/SwordNGun/Source/SwordNGun/Public/Weapons/SNGRangedWeaponBase.h and b/SwordNGun/Source/SwordNGun/Public/Weapons/SNGRangedWeaponBase.h differ diff --git a/SwordNGun/Source/SwordNGun/Public/Weapons/SNGWeaponBase.h b/SwordNGun/Source/SwordNGun/Public/Weapons/SNGWeaponBase.h index a2708e8..2331e88 100644 Binary files a/SwordNGun/Source/SwordNGun/Public/Weapons/SNGWeaponBase.h and b/SwordNGun/Source/SwordNGun/Public/Weapons/SNGWeaponBase.h differ diff --git a/SwordNGun/Source/SwordNGun/SwordNGun.Build.cs b/SwordNGun/Source/SwordNGun/SwordNGun.Build.cs index 9456a44..1632fc9 100644 --- a/SwordNGun/Source/SwordNGun/SwordNGun.Build.cs +++ b/SwordNGun/Source/SwordNGun/SwordNGun.Build.cs @@ -8,7 +8,7 @@ public class SwordNGun : ModuleRules { PCHUsage = PCHUsageMode.UseExplicitOrSharedPCHs; - PublicDependencyModuleNames.AddRange(new string[] { "Core", "CoreUObject", "Engine", "InputCore" }); + PublicDependencyModuleNames.AddRange(new string[] { "Core", "CoreUObject", "Engine", "InputCore", "PhysicsCore" }); PrivateDependencyModuleNames.AddRange(new string[] { }); diff --git a/SwordNGun/Source/SwordNGun/SwordNGun.h b/SwordNGun/Source/SwordNGun/SwordNGun.h index c4e9827..b3d87cb 100644 --- a/SwordNGun/Source/SwordNGun/SwordNGun.h +++ b/SwordNGun/Source/SwordNGun/SwordNGun.h @@ -4,3 +4,4 @@ #include "CoreMinimal.h" +#define COLLISION_WEAPON ECC_GameTraceChannel1 \ No newline at end of file