diff --git a/Config/DefaultGameplayTags.ini b/Config/DefaultGameplayTags.ini index 8b86ea2..fd00fa6 100644 --- a/Config/DefaultGameplayTags.ini +++ b/Config/DefaultGameplayTags.ini @@ -11,6 +11,12 @@ InvalidTagCharacters="\"\'," NumBitsForContainerSize=6 NetIndexFirstBitSegment=16 +GameplayTagRedirects=(OldTagName="Weapon.Slot1",NewTagName="Weapon.PrimarySlot") ++GameplayTagList=(Tag="Aim",DevComment="") ++GameplayTagList=(Tag="Aim.CanAim",DevComment="") ++GameplayTagList=(Tag="Aim.IronSights",DevComment="") ++GameplayTagList=(Tag="Aim.IsADS",DevComment="") ++GameplayTagList=(Tag="Aim.Scope",DevComment="") ++GameplayTagList=(Tag="Aim.Sight",DevComment="") +GameplayTagList=(Tag="Weapon",DevComment="") +GameplayTagList=(Tag="Weapon.CanFire",DevComment="") +GameplayTagList=(Tag="Weapon.CanReload",DevComment="") diff --git a/Content/Characters/AnimationsInterface_BP.uasset b/Content/Characters/AnimationsInterface_BP.uasset new file mode 100644 index 0000000..e0e9431 Binary files /dev/null and b/Content/Characters/AnimationsInterface_BP.uasset differ diff --git a/Content/Characters/Mannequins/Anims/Unarmed/ABP_Unarmed.uasset b/Content/Characters/Mannequins/Anims/Unarmed/ABP_Unarmed.uasset index 3194f4e..05cfb06 100644 Binary files a/Content/Characters/Mannequins/Anims/Unarmed/ABP_Unarmed.uasset and b/Content/Characters/Mannequins/Anims/Unarmed/ABP_Unarmed.uasset differ diff --git a/Content/Characters/Mannequins/DDIAnimations/DDI_Anim_Pistol_01_Idle_1.uasset b/Content/Characters/Mannequins/DDIAnimations/DDI_Anim_Pistol_01_Idle_1.uasset new file mode 100644 index 0000000..d44a9ac Binary files /dev/null and b/Content/Characters/Mannequins/DDIAnimations/DDI_Anim_Pistol_01_Idle_1.uasset differ diff --git a/Content/Characters/Mannequins/Meshes/SKM_Manny_Simple.uasset b/Content/Characters/Mannequins/Meshes/SKM_Manny_Simple.uasset index efbcd46..6429ce8 100644 Binary files a/Content/Characters/Mannequins/Meshes/SKM_Manny_Simple.uasset and b/Content/Characters/Mannequins/Meshes/SKM_Manny_Simple.uasset differ diff --git a/Content/Characters/Mannequins/Meshes/SK_Mannequin.uasset b/Content/Characters/Mannequins/Meshes/SK_Mannequin.uasset index 28d5d5b..982f869 100644 Binary files a/Content/Characters/Mannequins/Meshes/SK_Mannequin.uasset and b/Content/Characters/Mannequins/Meshes/SK_Mannequin.uasset differ diff --git a/Content/Fab/Lowpoly_Pistol_Handgun_-_Animated_Gun/colt/SkeletalMeshes/colt.uasset b/Content/Fab/Lowpoly_Pistol_Handgun_-_Animated_Gun/colt/SkeletalMeshes/colt.uasset new file mode 100644 index 0000000..aed7328 Binary files /dev/null and b/Content/Fab/Lowpoly_Pistol_Handgun_-_Animated_Gun/colt/SkeletalMeshes/colt.uasset differ diff --git a/Content/Fab/Lowpoly_Pistol_Handgun_-_Animated_Gun/colt/SkeletalMeshes/colt_Skeleton.uasset b/Content/Fab/Lowpoly_Pistol_Handgun_-_Animated_Gun/colt/SkeletalMeshes/colt_Skeleton.uasset new file mode 100644 index 0000000..a1a9f89 Binary files /dev/null and b/Content/Fab/Lowpoly_Pistol_Handgun_-_Animated_Gun/colt/SkeletalMeshes/colt_Skeleton.uasset differ diff --git a/Content/Fab/M1911_Pistol/m1911_pistol/Materials/M1911.uasset b/Content/Fab/M1911_Pistol/m1911_pistol/Materials/M1911.uasset new file mode 100644 index 0000000..d9a7808 Binary files /dev/null and b/Content/Fab/M1911_Pistol/m1911_pistol/Materials/M1911.uasset differ diff --git a/Content/Fab/M1911_Pistol/m1911_pistol/StaticMeshes/m1911_pistol.uasset b/Content/Fab/M1911_Pistol/m1911_pistol/StaticMeshes/m1911_pistol.uasset new file mode 100644 index 0000000..a30f9c0 Binary files /dev/null and b/Content/Fab/M1911_Pistol/m1911_pistol/StaticMeshes/m1911_pistol.uasset differ diff --git a/Content/Fab/M1911_Pistol/m1911_pistol/Textures/m1911_pistol_texture_0.uasset b/Content/Fab/M1911_Pistol/m1911_pistol/Textures/m1911_pistol_texture_0.uasset new file mode 100644 index 0000000..4bf7840 Binary files /dev/null and b/Content/Fab/M1911_Pistol/m1911_pistol/Textures/m1911_pistol_texture_0.uasset differ diff --git a/Content/Fab/M1911_Pistol/m1911_pistol/Textures/m1911_pistol_texture_1.uasset b/Content/Fab/M1911_Pistol/m1911_pistol/Textures/m1911_pistol_texture_1.uasset new file mode 100644 index 0000000..ad627d8 Binary files /dev/null and b/Content/Fab/M1911_Pistol/m1911_pistol/Textures/m1911_pistol_texture_1.uasset differ diff --git a/Content/Fab/M1911_Pistol/m1911_pistol/Textures/m1911_pistol_texture_2.uasset b/Content/Fab/M1911_Pistol/m1911_pistol/Textures/m1911_pistol_texture_2.uasset new file mode 100644 index 0000000..7c3401b Binary files /dev/null and b/Content/Fab/M1911_Pistol/m1911_pistol/Textures/m1911_pistol_texture_2.uasset differ diff --git a/Content/Fab/Makarov_pistol/Handle_001.uasset b/Content/Fab/Makarov_pistol/Handle_001.uasset new file mode 100644 index 0000000..5cd761a Binary files /dev/null and b/Content/Fab/Makarov_pistol/Handle_001.uasset differ diff --git a/Content/Fab/Makarov_pistol/Makarov_LowPoly03.uasset b/Content/Fab/Makarov_pistol/Makarov_LowPoly03.uasset new file mode 100644 index 0000000..1f06312 Binary files /dev/null and b/Content/Fab/Makarov_pistol/Makarov_LowPoly03.uasset differ diff --git a/Content/Fab/Makarov_pistol/Makarov_LowPoly03_Handle_001_BaseColor.uasset b/Content/Fab/Makarov_pistol/Makarov_LowPoly03_Handle_001_BaseColor.uasset new file mode 100644 index 0000000..08570b0 Binary files /dev/null and b/Content/Fab/Makarov_pistol/Makarov_LowPoly03_Handle_001_BaseColor.uasset differ diff --git a/Content/Fab/Makarov_pistol/Makarov_LowPoly03_Handle_001_Height.uasset b/Content/Fab/Makarov_pistol/Makarov_LowPoly03_Handle_001_Height.uasset new file mode 100644 index 0000000..29fe53f Binary files /dev/null and b/Content/Fab/Makarov_pistol/Makarov_LowPoly03_Handle_001_Height.uasset differ diff --git a/Content/Fab/Makarov_pistol/Makarov_LowPoly03_Handle_001_Metallic.uasset b/Content/Fab/Makarov_pistol/Makarov_LowPoly03_Handle_001_Metallic.uasset new file mode 100644 index 0000000..b3aa8fc Binary files /dev/null and b/Content/Fab/Makarov_pistol/Makarov_LowPoly03_Handle_001_Metallic.uasset differ diff --git a/Content/Fab/Makarov_pistol/Makarov_LowPoly03_Handle_001_Normal.uasset b/Content/Fab/Makarov_pistol/Makarov_LowPoly03_Handle_001_Normal.uasset new file mode 100644 index 0000000..e7d4185 Binary files /dev/null and b/Content/Fab/Makarov_pistol/Makarov_LowPoly03_Handle_001_Normal.uasset differ diff --git a/Content/Fab/Makarov_pistol/Makarov_LowPoly03_Handle_001_Roughness.uasset b/Content/Fab/Makarov_pistol/Makarov_LowPoly03_Handle_001_Roughness.uasset new file mode 100644 index 0000000..a8a3b6b Binary files /dev/null and b/Content/Fab/Makarov_pistol/Makarov_LowPoly03_Handle_001_Roughness.uasset differ diff --git a/Content/Fab/Makarov_pistol/Makarov_LowPoly03_Trunk02_001_BaseColor.uasset b/Content/Fab/Makarov_pistol/Makarov_LowPoly03_Trunk02_001_BaseColor.uasset new file mode 100644 index 0000000..8c690f6 Binary files /dev/null and b/Content/Fab/Makarov_pistol/Makarov_LowPoly03_Trunk02_001_BaseColor.uasset differ diff --git a/Content/Fab/Makarov_pistol/Makarov_LowPoly03_Trunk02_001_Height.uasset b/Content/Fab/Makarov_pistol/Makarov_LowPoly03_Trunk02_001_Height.uasset new file mode 100644 index 0000000..126b181 Binary files /dev/null and b/Content/Fab/Makarov_pistol/Makarov_LowPoly03_Trunk02_001_Height.uasset differ diff --git a/Content/Fab/Makarov_pistol/Makarov_LowPoly03_Trunk02_001_Metallic.uasset b/Content/Fab/Makarov_pistol/Makarov_LowPoly03_Trunk02_001_Metallic.uasset new file mode 100644 index 0000000..7d46c5f Binary files /dev/null and b/Content/Fab/Makarov_pistol/Makarov_LowPoly03_Trunk02_001_Metallic.uasset differ diff --git a/Content/Fab/Makarov_pistol/Makarov_LowPoly03_Trunk02_001_Normal.uasset b/Content/Fab/Makarov_pistol/Makarov_LowPoly03_Trunk02_001_Normal.uasset new file mode 100644 index 0000000..53125ca Binary files /dev/null and b/Content/Fab/Makarov_pistol/Makarov_LowPoly03_Trunk02_001_Normal.uasset differ diff --git a/Content/Fab/Makarov_pistol/Makarov_LowPoly03_Trunk02_001_Roughness.uasset b/Content/Fab/Makarov_pistol/Makarov_LowPoly03_Trunk02_001_Roughness.uasset new file mode 100644 index 0000000..5af8a60 Binary files /dev/null and b/Content/Fab/Makarov_pistol/Makarov_LowPoly03_Trunk02_001_Roughness.uasset differ diff --git a/Content/Fab/Makarov_pistol/Makarov_LowPoly03_Trunk_001_BaseColor.uasset b/Content/Fab/Makarov_pistol/Makarov_LowPoly03_Trunk_001_BaseColor.uasset new file mode 100644 index 0000000..30cbc14 Binary files /dev/null and b/Content/Fab/Makarov_pistol/Makarov_LowPoly03_Trunk_001_BaseColor.uasset differ diff --git a/Content/Fab/Makarov_pistol/Makarov_LowPoly03_Trunk_001_Height.uasset b/Content/Fab/Makarov_pistol/Makarov_LowPoly03_Trunk_001_Height.uasset new file mode 100644 index 0000000..0b8f85b Binary files /dev/null and b/Content/Fab/Makarov_pistol/Makarov_LowPoly03_Trunk_001_Height.uasset differ diff --git a/Content/Fab/Makarov_pistol/Makarov_LowPoly03_Trunk_001_Metallic.uasset b/Content/Fab/Makarov_pistol/Makarov_LowPoly03_Trunk_001_Metallic.uasset new file mode 100644 index 0000000..8b13b0e Binary files /dev/null and b/Content/Fab/Makarov_pistol/Makarov_LowPoly03_Trunk_001_Metallic.uasset differ diff --git a/Content/Fab/Makarov_pistol/Makarov_LowPoly03_Trunk_001_Normal.uasset b/Content/Fab/Makarov_pistol/Makarov_LowPoly03_Trunk_001_Normal.uasset new file mode 100644 index 0000000..9dcd7bc Binary files /dev/null and b/Content/Fab/Makarov_pistol/Makarov_LowPoly03_Trunk_001_Normal.uasset differ diff --git a/Content/Fab/Makarov_pistol/Makarov_LowPoly03_Trunk_001_Roughness.uasset b/Content/Fab/Makarov_pistol/Makarov_LowPoly03_Trunk_001_Roughness.uasset new file mode 100644 index 0000000..95bb950 Binary files /dev/null and b/Content/Fab/Makarov_pistol/Makarov_LowPoly03_Trunk_001_Roughness.uasset differ diff --git a/Content/Fab/Makarov_pistol/Makarov_LowPoly03_Warp_001_BaseColor.uasset b/Content/Fab/Makarov_pistol/Makarov_LowPoly03_Warp_001_BaseColor.uasset new file mode 100644 index 0000000..3283c0f Binary files /dev/null and b/Content/Fab/Makarov_pistol/Makarov_LowPoly03_Warp_001_BaseColor.uasset differ diff --git a/Content/Fab/Makarov_pistol/Makarov_LowPoly03_Warp_001_Height.uasset b/Content/Fab/Makarov_pistol/Makarov_LowPoly03_Warp_001_Height.uasset new file mode 100644 index 0000000..8ac280a Binary files /dev/null and b/Content/Fab/Makarov_pistol/Makarov_LowPoly03_Warp_001_Height.uasset differ diff --git a/Content/Fab/Makarov_pistol/Makarov_LowPoly03_Warp_001_Metallic.uasset b/Content/Fab/Makarov_pistol/Makarov_LowPoly03_Warp_001_Metallic.uasset new file mode 100644 index 0000000..3043df9 Binary files /dev/null and b/Content/Fab/Makarov_pistol/Makarov_LowPoly03_Warp_001_Metallic.uasset differ diff --git a/Content/Fab/Makarov_pistol/Makarov_LowPoly03_Warp_001_Normal.uasset b/Content/Fab/Makarov_pistol/Makarov_LowPoly03_Warp_001_Normal.uasset new file mode 100644 index 0000000..17e0437 Binary files /dev/null and b/Content/Fab/Makarov_pistol/Makarov_LowPoly03_Warp_001_Normal.uasset differ diff --git a/Content/Fab/Makarov_pistol/Makarov_LowPoly03_Warp_001_Roughness.uasset b/Content/Fab/Makarov_pistol/Makarov_LowPoly03_Warp_001_Roughness.uasset new file mode 100644 index 0000000..4dce151 Binary files /dev/null and b/Content/Fab/Makarov_pistol/Makarov_LowPoly03_Warp_001_Roughness.uasset differ diff --git a/Content/Fab/Makarov_pistol/Trunk02_001.uasset b/Content/Fab/Makarov_pistol/Trunk02_001.uasset new file mode 100644 index 0000000..7e9a01f Binary files /dev/null and b/Content/Fab/Makarov_pistol/Trunk02_001.uasset differ diff --git a/Content/Fab/Makarov_pistol/Trunk_001.uasset b/Content/Fab/Makarov_pistol/Trunk_001.uasset new file mode 100644 index 0000000..10a16ba Binary files /dev/null and b/Content/Fab/Makarov_pistol/Trunk_001.uasset differ diff --git a/Content/Fab/Makarov_pistol/Warp_001.uasset b/Content/Fab/Makarov_pistol/Warp_001.uasset new file mode 100644 index 0000000..62f5388 Binary files /dev/null and b/Content/Fab/Makarov_pistol/Warp_001.uasset differ diff --git a/Content/ProofOfConcept/DDICharacter_BP.uasset b/Content/ProofOfConcept/DDICharacter_BP.uasset index fb6b0cc..d50e5d4 100644 Binary files a/Content/ProofOfConcept/DDICharacter_BP.uasset and b/Content/ProofOfConcept/DDICharacter_BP.uasset differ diff --git a/Content/ProofOfConcept/DDIGameInstance_BP.uasset b/Content/ProofOfConcept/DDIGameInstance_BP.uasset index 8295b03..ffbdd9d 100644 Binary files a/Content/ProofOfConcept/DDIGameInstance_BP.uasset and b/Content/ProofOfConcept/DDIGameInstance_BP.uasset differ diff --git a/Content/Weapons/CR_Mannequin_Body_Take1.uasset b/Content/Weapons/CR_Mannequin_Body_Take1.uasset new file mode 100644 index 0000000..3314c3a Binary files /dev/null and b/Content/Weapons/CR_Mannequin_Body_Take1.uasset differ diff --git a/Content/Weapons/E_WeaponNames.uasset b/Content/Weapons/E_WeaponNames.uasset new file mode 100644 index 0000000..c9f4d02 Binary files /dev/null and b/Content/Weapons/E_WeaponNames.uasset differ diff --git a/Content/Weapons/Pistol_01/SK_Wep_Pistol_01.uasset b/Content/Weapons/Pistol_01/SK_Wep_Pistol_01.uasset index 8a6f8eb..ba9d93e 100644 Binary files a/Content/Weapons/Pistol_01/SK_Wep_Pistol_01.uasset and b/Content/Weapons/Pistol_01/SK_Wep_Pistol_01.uasset differ diff --git a/Content/Weapons/Pistol_01/SK_Wep_Pistol_01_Skeleton.uasset b/Content/Weapons/Pistol_01/SK_Wep_Pistol_01_Skeleton.uasset index 3f00c05..2b6fee1 100644 Binary files a/Content/Weapons/Pistol_01/SK_Wep_Pistol_01_Skeleton.uasset and b/Content/Weapons/Pistol_01/SK_Wep_Pistol_01_Skeleton.uasset differ diff --git a/Content/Weapons/Pistol_01/Weapon_BP_Pistol_01.uasset b/Content/Weapons/Pistol_01/Weapon_BP_Pistol_01.uasset index 55df250..d0e0673 100644 Binary files a/Content/Weapons/Pistol_01/Weapon_BP_Pistol_01.uasset and b/Content/Weapons/Pistol_01/Weapon_BP_Pistol_01.uasset differ diff --git a/Content/Weapons/WeaponInterface_BP.uasset b/Content/Weapons/WeaponInterface_BP.uasset new file mode 100644 index 0000000..262e5b5 Binary files /dev/null and b/Content/Weapons/WeaponInterface_BP.uasset differ diff --git a/Content/Weapons/Weapon_BP.uasset b/Content/Weapons/Weapon_BP.uasset index a51f02d..2547e7a 100644 Binary files a/Content/Weapons/Weapon_BP.uasset and b/Content/Weapons/Weapon_BP.uasset differ diff --git a/Content/Weapons/colt/Materials/Base_Material.uasset b/Content/Weapons/colt/Materials/Base_Material.uasset new file mode 100644 index 0000000..5d3ce19 Binary files /dev/null and b/Content/Weapons/colt/Materials/Base_Material.uasset differ diff --git a/Content/Weapons/colt/SkeletalMeshes/colt.uasset b/Content/Weapons/colt/SkeletalMeshes/colt.uasset new file mode 100644 index 0000000..01edf2a Binary files /dev/null and b/Content/Weapons/colt/SkeletalMeshes/colt.uasset differ diff --git a/Content/Weapons/colt/SkeletalMeshes/coltColt_Reload.uasset b/Content/Weapons/colt/SkeletalMeshes/coltColt_Reload.uasset new file mode 100644 index 0000000..c0ccd63 Binary files /dev/null and b/Content/Weapons/colt/SkeletalMeshes/coltColt_Reload.uasset differ diff --git a/Content/Weapons/colt/SkeletalMeshes/coltColt_Shoot.uasset b/Content/Weapons/colt/SkeletalMeshes/coltColt_Shoot.uasset new file mode 100644 index 0000000..f4e56db Binary files /dev/null and b/Content/Weapons/colt/SkeletalMeshes/coltColt_Shoot.uasset differ diff --git a/Content/Weapons/colt/SkeletalMeshes/colt_PhysicsAsset.uasset b/Content/Weapons/colt/SkeletalMeshes/colt_PhysicsAsset.uasset new file mode 100644 index 0000000..16ba4ad Binary files /dev/null and b/Content/Weapons/colt/SkeletalMeshes/colt_PhysicsAsset.uasset differ diff --git a/Content/Weapons/colt/SkeletalMeshes/colt_Skeleton.uasset b/Content/Weapons/colt/SkeletalMeshes/colt_Skeleton.uasset new file mode 100644 index 0000000..db5f9a2 Binary files /dev/null and b/Content/Weapons/colt/SkeletalMeshes/colt_Skeleton.uasset differ diff --git a/Content/Worlds/Playground1.umap b/Content/Worlds/Playground1.umap index 53c827f..3a7a169 100644 Binary files a/Content/Worlds/Playground1.umap and b/Content/Worlds/Playground1.umap differ diff --git a/OpenConflict.sln.DotSettings.user b/OpenConflict.sln.DotSettings.user index 164bd7c..fc00778 100644 --- a/OpenConflict.sln.DotSettings.user +++ b/OpenConflict.sln.DotSettings.user @@ -1,3 +1,4 @@  + ForceIncluded ForceIncluded ForceIncluded \ No newline at end of file