testing stuff - ads

2025-12-08 23:27:25 -05:00
parent 39e416295b
commit 0c657b9228
55 changed files with 7 additions and 0 deletions
--- 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="")
--- a/Content/Characters/AnimationsInterface_BP.uasset
+++ b/Content/Characters/AnimationsInterface_BP.uasset
--- a/Content/Characters/Mannequins/Anims/Unarmed/ABP_Unarmed.uasset
+++ b/Content/Characters/Mannequins/Anims/Unarmed/ABP_Unarmed.uasset
--- a/Content/Characters/Mannequins/DDIAnimations/DDI_Anim_Pistol_01_Idle_1.uasset
+++ b/Content/Characters/Mannequins/DDIAnimations/DDI_Anim_Pistol_01_Idle_1.uasset
--- a/Content/Characters/Mannequins/Meshes/SKM_Manny_Simple.uasset
+++ b/Content/Characters/Mannequins/Meshes/SKM_Manny_Simple.uasset
--- a/Content/Characters/Mannequins/Meshes/SK_Mannequin.uasset
+++ b/Content/Characters/Mannequins/Meshes/SK_Mannequin.uasset
--- a/Content/Fab/Lowpoly_Pistol_Handgun_-_Animated_Gun/colt/SkeletalMeshes/colt.uasset
+++ b/Content/Fab/Lowpoly_Pistol_Handgun_-_Animated_Gun/colt/SkeletalMeshes/colt.uasset
--- 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
--- a/Content/Fab/M1911_Pistol/m1911_pistol/Materials/M1911.uasset
+++ b/Content/Fab/M1911_Pistol/m1911_pistol/Materials/M1911.uasset
--- a/Content/Fab/M1911_Pistol/m1911_pistol/StaticMeshes/m1911_pistol.uasset
+++ b/Content/Fab/M1911_Pistol/m1911_pistol/StaticMeshes/m1911_pistol.uasset
--- 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
--- 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
--- 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
--- a/Content/Fab/Makarov_pistol/Handle_001.uasset
+++ b/Content/Fab/Makarov_pistol/Handle_001.uasset
--- a/Content/Fab/Makarov_pistol/Makarov_LowPoly03.uasset
+++ b/Content/Fab/Makarov_pistol/Makarov_LowPoly03.uasset
--- a/Content/Fab/Makarov_pistol/Makarov_LowPoly03_Handle_001_BaseColor.uasset
+++ b/Content/Fab/Makarov_pistol/Makarov_LowPoly03_Handle_001_BaseColor.uasset
--- a/Content/Fab/Makarov_pistol/Makarov_LowPoly03_Handle_001_Height.uasset
+++ b/Content/Fab/Makarov_pistol/Makarov_LowPoly03_Handle_001_Height.uasset
--- a/Content/Fab/Makarov_pistol/Makarov_LowPoly03_Handle_001_Metallic.uasset
+++ b/Content/Fab/Makarov_pistol/Makarov_LowPoly03_Handle_001_Metallic.uasset
--- a/Content/Fab/Makarov_pistol/Makarov_LowPoly03_Handle_001_Normal.uasset
+++ b/Content/Fab/Makarov_pistol/Makarov_LowPoly03_Handle_001_Normal.uasset
--- a/Content/Fab/Makarov_pistol/Makarov_LowPoly03_Handle_001_Roughness.uasset
+++ b/Content/Fab/Makarov_pistol/Makarov_LowPoly03_Handle_001_Roughness.uasset
--- a/Content/Fab/Makarov_pistol/Makarov_LowPoly03_Trunk02_001_BaseColor.uasset
+++ b/Content/Fab/Makarov_pistol/Makarov_LowPoly03_Trunk02_001_BaseColor.uasset
--- a/Content/Fab/Makarov_pistol/Makarov_LowPoly03_Trunk02_001_Height.uasset
+++ b/Content/Fab/Makarov_pistol/Makarov_LowPoly03_Trunk02_001_Height.uasset
--- a/Content/Fab/Makarov_pistol/Makarov_LowPoly03_Trunk02_001_Metallic.uasset
+++ b/Content/Fab/Makarov_pistol/Makarov_LowPoly03_Trunk02_001_Metallic.uasset
--- a/Content/Fab/Makarov_pistol/Makarov_LowPoly03_Trunk02_001_Normal.uasset
+++ b/Content/Fab/Makarov_pistol/Makarov_LowPoly03_Trunk02_001_Normal.uasset
--- a/Content/Fab/Makarov_pistol/Makarov_LowPoly03_Trunk02_001_Roughness.uasset
+++ b/Content/Fab/Makarov_pistol/Makarov_LowPoly03_Trunk02_001_Roughness.uasset
--- a/Content/Fab/Makarov_pistol/Makarov_LowPoly03_Trunk_001_BaseColor.uasset
+++ b/Content/Fab/Makarov_pistol/Makarov_LowPoly03_Trunk_001_BaseColor.uasset
--- a/Content/Fab/Makarov_pistol/Makarov_LowPoly03_Trunk_001_Height.uasset
+++ b/Content/Fab/Makarov_pistol/Makarov_LowPoly03_Trunk_001_Height.uasset
--- a/Content/Fab/Makarov_pistol/Makarov_LowPoly03_Trunk_001_Metallic.uasset
+++ b/Content/Fab/Makarov_pistol/Makarov_LowPoly03_Trunk_001_Metallic.uasset
--- a/Content/Fab/Makarov_pistol/Makarov_LowPoly03_Trunk_001_Normal.uasset
+++ b/Content/Fab/Makarov_pistol/Makarov_LowPoly03_Trunk_001_Normal.uasset
--- a/Content/Fab/Makarov_pistol/Makarov_LowPoly03_Trunk_001_Roughness.uasset
+++ b/Content/Fab/Makarov_pistol/Makarov_LowPoly03_Trunk_001_Roughness.uasset
--- a/Content/Fab/Makarov_pistol/Makarov_LowPoly03_Warp_001_BaseColor.uasset
+++ b/Content/Fab/Makarov_pistol/Makarov_LowPoly03_Warp_001_BaseColor.uasset
--- a/Content/Fab/Makarov_pistol/Makarov_LowPoly03_Warp_001_Height.uasset
+++ b/Content/Fab/Makarov_pistol/Makarov_LowPoly03_Warp_001_Height.uasset
--- a/Content/Fab/Makarov_pistol/Makarov_LowPoly03_Warp_001_Metallic.uasset
+++ b/Content/Fab/Makarov_pistol/Makarov_LowPoly03_Warp_001_Metallic.uasset
--- a/Content/Fab/Makarov_pistol/Makarov_LowPoly03_Warp_001_Normal.uasset
+++ b/Content/Fab/Makarov_pistol/Makarov_LowPoly03_Warp_001_Normal.uasset
--- a/Content/Fab/Makarov_pistol/Makarov_LowPoly03_Warp_001_Roughness.uasset
+++ b/Content/Fab/Makarov_pistol/Makarov_LowPoly03_Warp_001_Roughness.uasset
--- a/Content/Fab/Makarov_pistol/Trunk02_001.uasset
+++ b/Content/Fab/Makarov_pistol/Trunk02_001.uasset
--- a/Content/Fab/Makarov_pistol/Trunk_001.uasset
+++ b/Content/Fab/Makarov_pistol/Trunk_001.uasset
--- a/Content/Fab/Makarov_pistol/Warp_001.uasset
+++ b/Content/Fab/Makarov_pistol/Warp_001.uasset
--- a/Content/ProofOfConcept/DDICharacter_BP.uasset
+++ b/Content/ProofOfConcept/DDICharacter_BP.uasset
--- a/Content/ProofOfConcept/DDIGameInstance_BP.uasset
+++ b/Content/ProofOfConcept/DDIGameInstance_BP.uasset
--- a/Content/Weapons/CR_Mannequin_Body_Take1.uasset
+++ b/Content/Weapons/CR_Mannequin_Body_Take1.uasset
--- a/Content/Weapons/E_WeaponNames.uasset
+++ b/Content/Weapons/E_WeaponNames.uasset
--- a/Content/Weapons/Pistol_01/SK_Wep_Pistol_01.uasset
+++ b/Content/Weapons/Pistol_01/SK_Wep_Pistol_01.uasset
--- a/Content/Weapons/Pistol_01/SK_Wep_Pistol_01_Skeleton.uasset
+++ b/Content/Weapons/Pistol_01/SK_Wep_Pistol_01_Skeleton.uasset
--- a/Content/Weapons/Pistol_01/Weapon_BP_Pistol_01.uasset
+++ b/Content/Weapons/Pistol_01/Weapon_BP_Pistol_01.uasset
--- a/Content/Weapons/WeaponInterface_BP.uasset
+++ b/Content/Weapons/WeaponInterface_BP.uasset
--- a/Content/Weapons/Weapon_BP.uasset
+++ b/Content/Weapons/Weapon_BP.uasset
--- a/Content/Weapons/colt/Materials/Base_Material.uasset
+++ b/Content/Weapons/colt/Materials/Base_Material.uasset
--- a/Content/Weapons/colt/SkeletalMeshes/colt.uasset
+++ b/Content/Weapons/colt/SkeletalMeshes/colt.uasset
--- a/Content/Weapons/colt/SkeletalMeshes/coltColt_Reload.uasset
+++ b/Content/Weapons/colt/SkeletalMeshes/coltColt_Reload.uasset
--- a/Content/Weapons/colt/SkeletalMeshes/coltColt_Shoot.uasset
+++ b/Content/Weapons/colt/SkeletalMeshes/coltColt_Shoot.uasset
--- a/Content/Weapons/colt/SkeletalMeshes/colt_PhysicsAsset.uasset
+++ b/Content/Weapons/colt/SkeletalMeshes/colt_PhysicsAsset.uasset
--- a/Content/Weapons/colt/SkeletalMeshes/colt_Skeleton.uasset
+++ b/Content/Weapons/colt/SkeletalMeshes/colt_Skeleton.uasset
--- a/Content/Worlds/Playground1.umap
+++ b/Content/Worlds/Playground1.umap
--- a/OpenConflict.sln.DotSettings.user
+++ b/OpenConflict.sln.DotSettings.user
@@ -1,3 +1,4 @@
 <wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
+	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=83F7D316_002D1724_002D38F0_002D85D9_002D704D5DF137A0_002Fdl_003ASource_003A_002E_002E_003F_002E_002E_003F_002E_002E_003F_002E_002E_003F_002E_002E_003F_002E_002E_003F_002E_002E_003FProgram_0020Files_003FEpic_0020Games_003FUE_005F5_002E7_003FEngine_003FSource_002Fd_003ARuntime_002Fd_003AEngine_002Fd_003AClasses_002Fd_003AGameFramework_002Ff_003AActor_002Eh/@EntryIndexedValue">ForceIncluded</s:String>
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=83F7D316_002D1724_002D38F0_002D85D9_002D704D5DF137A0_002Fdl_003ASource_003A_002E_002E_003F_002E_002E_003F_002E_002E_003F_002E_002E_003F_002E_002E_003F_002E_002E_003F_002E_002E_003FProgram_0020Files_003FEpic_0020Games_003FUE_005F5_002E7_003FEngine_003FSource_002Fd_003ARuntime_002Fd_003AEngine_002Fd_003AClasses_002Fd_003APhysicsEngine_002Ff_003APhysicsSpringComponent_002Eh/@EntryIndexedValue">ForceIncluded</s:String>
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=83F7D316_002D1724_002D38F0_002D85D9_002D704D5DF137A0_002Fdl_003ASource_003A_002E_002E_003F_002E_002E_003F_002E_002E_003F_002E_002E_003F_002E_002E_003F_002E_002E_003F_002E_002E_003FProgram_0020Files_003FEpic_0020Games_003FUE_005F5_002E7_003FEngine_003FSource_002Fd_003ARuntime_002Fd_003AUMG_002Fd_003APublic_002Fd_003AComponents_002Ff_003AWidgetSwitcher_002Eh/@EntryIndexedValue">ForceIncluded</s:String></wpf:ResourceDictionary>