diff --git a/SwordNGun/Content/Maps/Test.umap b/SwordNGun/Content/Maps/Test.umap index 9be9cde..25dcb1e 100644 --- a/SwordNGun/Content/Maps/Test.umap +++ b/SwordNGun/Content/Maps/Test.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:018df65c93d4933b55ca460620bf3b8b8897e5510f6ac627c6e6eedab19af4a5 -size 685776 +oid sha256:ed1ffca215c50d2843ad8f50a1e89d962e952ca467ebaf479abbe79bf133e36e +size 686331 diff --git a/SwordNGun/Source/SwordNGun/Private/Characters/SNGCharacterBase.cpp b/SwordNGun/Source/SwordNGun/Private/Characters/SNGCharacterBase.cpp index d658134..503c1e3 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 6e75099..05d9ff4 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 2704dc7..0a928ae 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/SNGMeleeWeaponBase.cpp b/SwordNGun/Source/SwordNGun/Private/Weapons/SNGMeleeWeaponBase.cpp index 58a4bb9..81b0067 100644 Binary files a/SwordNGun/Source/SwordNGun/Private/Weapons/SNGMeleeWeaponBase.cpp and b/SwordNGun/Source/SwordNGun/Private/Weapons/SNGMeleeWeaponBase.cpp differ diff --git a/SwordNGun/Source/SwordNGun/SwordNGun.h b/SwordNGun/Source/SwordNGun/SwordNGun.h index b3d87cb..876c258 100644 --- a/SwordNGun/Source/SwordNGun/SwordNGun.h +++ b/SwordNGun/Source/SwordNGun/SwordNGun.h @@ -4,4 +4,5 @@ #include "CoreMinimal.h" -#define COLLISION_WEAPON ECC_GameTraceChannel1 \ No newline at end of file +#define COLLISION_RANGED_WEAPON ECC_GameTraceChannel1 +#define COLLISION_MELEE_WEAPON ECC_GameTraceChannel2 \ No newline at end of file