Merge branch 'AI-Attack-Animation' into dev

Browse Source

# Conflicts:
#	EndlessVendetta/Content/AI/Enemy/Basic/BP_BasicEnemyCharacter.uasset
#	EndlessVendetta/Content/StarterContent/Architecture/Floor_400x400.uasset

...

This commit is contained in:

Philip W 2023-10-19 12:03:01 +01:00

parent 370cff50c9 9a94719541

commit f4dad6675f

131 changed files with 580 additions and 18 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN

EndlessVendetta/Content/AI/Animation/ABP_EnemyAI.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

EndlessVendetta/Content/AI/Animation/Manny_Equip_Pistol_Standing.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

EndlessVendetta/Content/AI/Animation/Manny_Idle_Pistol.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

EndlessVendetta/Content/AI/Animation/Manny_Idle_Rifle_Hip.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

EndlessVendetta/Content/AI/Animation/Manny_Reload_Pistol.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

EndlessVendetta/Content/AI/Animation/PistolLocomotion/Beta_HighLimbsGeoSG3.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

EndlessVendetta/Content/AI/Animation/PistolLocomotion/Beta_Joints_MAT1.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

EndlessVendetta/Content/AI/Animation/PistolLocomotion/Pistol_Idle.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

EndlessVendetta/Content/AI/Animation/PistolLocomotion/Pistol_Run.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

EndlessVendetta/Content/AI/Animation/PistolLocomotion/Pistol_Run_Aimed.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

EndlessVendetta/Content/AI/Animation/PistolLocomotion/Pistol_Walk.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

EndlessVendetta/Content/AI/Animation/PistolLocomotion/XBot_IK.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

EndlessVendetta/Content/AI/Animation/PistolLocomotion/X_Bot.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

EndlessVendetta/Content/AI/Animation/PistolLocomotion/X_Bot_Anim_Take_001.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

EndlessVendetta/Content/AI/Animation/PistolLocomotion/X_Bot_Anim_mixamo_com.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

EndlessVendetta/Content/AI/Animation/PistolLocomotion/X_Bot_PhysicsAsset.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

EndlessVendetta/Content/AI/Animation/PistolLocomotion/X_Bot_Skeleton.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

EndlessVendetta/Content/AI/Animation/RifleLocomotion/Manny_DeEquip_Rifle_Standing.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

EndlessVendetta/Content/AI/Animation/RifleLocomotion/Manny_DeEquip_Rifle_Standing/Driving_Manny_DeEquip_Rifle_Standing.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

EndlessVendetta/Content/AI/Animation/RifleLocomotion/Manny_Equip_Rifle_Standing.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

EndlessVendetta/Content/AI/Animation/RifleLocomotion/Manny_Fire_Rifle_Hip.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

EndlessVendetta/Content/AI/Animation/RifleLocomotion/Manny_Idle_Rifle_Hip.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

EndlessVendetta/Content/AI/Animation/RifleLocomotion/Manny_Jog_Fwd_Rifle.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

EndlessVendetta/Content/AI/Animation/RifleLocomotion/Manny_Reload_Rifle_Hip.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

EndlessVendetta/Content/AI/Animation/RifleLocomotion/Manny_Sprint_Fwd_Rifle.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

EndlessVendetta/Content/AI/Animation/RifleLocomotion/RifleWalkRun.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

EndlessVendetta/Content/AI/Enemy/Basic/BP_BasicEnemyCharacter.uasset (Stored with Git LFS)

Binary file not shown.

BIN

EndlessVendetta/Content/AI/Enemy/Basic/BT_BasicEnemy.uasset (Stored with Git LFS)

Binary file not shown.

BIN

EndlessVendetta/Content/AnimStarterPack/Aim_Space_Hip.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

EndlessVendetta/Content/AnimStarterPack/Aim_Space_Ironsights.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

EndlessVendetta/Content/AnimStarterPack/BS_CrouchWalk.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

EndlessVendetta/Content/AnimStarterPack/BS_Jog.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

EndlessVendetta/Content/AnimStarterPack/Crouch_Idle_Rifle_Hip.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

EndlessVendetta/Content/AnimStarterPack/Crouch_Idle_Rifle_Ironsights.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

EndlessVendetta/Content/AnimStarterPack/Crouch_Walk_Bwd_Rifle_Hip.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

EndlessVendetta/Content/AnimStarterPack/Crouch_Walk_Bwd_Rifle_Ironsights.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

EndlessVendetta/Content/AnimStarterPack/Crouch_Walk_Fwd_Rifle_Hip.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

EndlessVendetta/Content/AnimStarterPack/Crouch_Walk_Fwd_Rifle_Ironsights.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

EndlessVendetta/Content/AnimStarterPack/Crouch_Walk_Lt_Rifle_Hip.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

EndlessVendetta/Content/AnimStarterPack/Crouch_Walk_Lt_Rifle_Ironsights.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

EndlessVendetta/Content/AnimStarterPack/Crouch_Walk_Rt_Rifle_Hip.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

EndlessVendetta/Content/AnimStarterPack/Crouch_Walk_Rt_Rifle_Ironsights.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

EndlessVendetta/Content/AnimStarterPack/Crouch_to_Stand_Rifle_Hip.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

EndlessVendetta/Content/AnimStarterPack/Crouch_to_Stand_Rifle_Ironsights.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

EndlessVendetta/Content/AnimStarterPack/Death_1.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

EndlessVendetta/Content/AnimStarterPack/Death_2.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

EndlessVendetta/Content/AnimStarterPack/Death_3.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

EndlessVendetta/Content/AnimStarterPack/Death_Ironsights_1.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

EndlessVendetta/Content/AnimStarterPack/Death_Ironsights_2.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

EndlessVendetta/Content/AnimStarterPack/Equip_Pistol_Standing.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

EndlessVendetta/Content/AnimStarterPack/Equip_Rifle_Standing.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

EndlessVendetta/Content/AnimStarterPack/Fire_Rifle_Hip.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

EndlessVendetta/Content/AnimStarterPack/Fire_Rifle_Ironsights.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

EndlessVendetta/Content/AnimStarterPack/Fire_Shotgun_Hip.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

EndlessVendetta/Content/AnimStarterPack/Fire_Shotgun_Ironsights.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

EndlessVendetta/Content/AnimStarterPack/Hit_React_1.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

EndlessVendetta/Content/AnimStarterPack/Hit_React_2.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

EndlessVendetta/Content/AnimStarterPack/Hit_React_3.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

EndlessVendetta/Content/AnimStarterPack/Hit_React_4.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

EndlessVendetta/Content/AnimStarterPack/Idle_Pistol.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

EndlessVendetta/Content/AnimStarterPack/Idle_Rifle_Hip.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

EndlessVendetta/Content/AnimStarterPack/Idle_Rifle_Hip_Break1.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

EndlessVendetta/Content/AnimStarterPack/Idle_Rifle_Hip_Break2.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

EndlessVendetta/Content/AnimStarterPack/Idle_Rifle_Ironsights.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

EndlessVendetta/Content/AnimStarterPack/Jog_Bwd_Rifle.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

EndlessVendetta/Content/AnimStarterPack/Jog_Fwd_Rifle.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

EndlessVendetta/Content/AnimStarterPack/Jog_Lt_Rifle.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

EndlessVendetta/Content/AnimStarterPack/Jog_Rt_Rifle.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

EndlessVendetta/Content/AnimStarterPack/Jump_From_Jog.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

EndlessVendetta/Content/AnimStarterPack/Jump_From_Stand.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

EndlessVendetta/Content/AnimStarterPack/Jump_From_Stand_Ironsights.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

EndlessVendetta/Content/AnimStarterPack/Prone_Death_1.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

EndlessVendetta/Content/AnimStarterPack/Prone_Death_2.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

EndlessVendetta/Content/AnimStarterPack/Prone_Fire_1.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

EndlessVendetta/Content/AnimStarterPack/Prone_Fire_2.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

EndlessVendetta/Content/AnimStarterPack/Prone_Idle.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

EndlessVendetta/Content/AnimStarterPack/Prone_Reload_Rifle.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

EndlessVendetta/Content/AnimStarterPack/Prone_Reload_Shotgun.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

EndlessVendetta/Content/AnimStarterPack/Prone_To_Stand.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

EndlessVendetta/Content/AnimStarterPack/Reload_Pistol.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

EndlessVendetta/Content/AnimStarterPack/Reload_Rifle_Hip.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

EndlessVendetta/Content/AnimStarterPack/Reload_Rifle_Ironsights.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

EndlessVendetta/Content/AnimStarterPack/Reload_Shotgun_Hip.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

EndlessVendetta/Content/AnimStarterPack/Reload_Shotgun_Ironsights.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

EndlessVendetta/Content/AnimStarterPack/Showcase.umap (Stored with Git LFS) Normal file

Binary file not shown.

BIN

EndlessVendetta/Content/AnimStarterPack/Sprint_Fwd_Rifle.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

EndlessVendetta/Content/AnimStarterPack/Stand_To_Prone.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

EndlessVendetta/Content/AnimStarterPack/Stand_to_Crouch_Rifle_Hip.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

EndlessVendetta/Content/AnimStarterPack/Stand_to_Crouch_Rifle_Ironsights.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

EndlessVendetta/Content/AnimStarterPack/UE4ASP_HeroTPP_AnimBlueprint.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

EndlessVendetta/Content/AnimStarterPack/UE4_Mannequin/Materials/M_UE4Man_Body.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

EndlessVendetta/Content/AnimStarterPack/UE4_Mannequin/Materials/M_UE4Man_ChestLogo.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

EndlessVendetta/Content/AnimStarterPack/UE4_Mannequin/Materials/MaterialLayers/ML_GlossyBlack_Latex_UE4.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

EndlessVendetta/Content/AnimStarterPack/UE4_Mannequin/Materials/MaterialLayers/ML_Plastic_Shiny_Beige.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

EndlessVendetta/Content/AnimStarterPack/UE4_Mannequin/Materials/MaterialLayers/ML_Plastic_Shiny_Beige_LOGO.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

EndlessVendetta/Content/AnimStarterPack/UE4_Mannequin/Materials/MaterialLayers/ML_SoftMetal_UE4.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

EndlessVendetta/Content/AnimStarterPack/UE4_Mannequin/Materials/MaterialLayers/T_ML_Aluminum01.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

EndlessVendetta/Content/AnimStarterPack/UE4_Mannequin/Materials/MaterialLayers/T_ML_Aluminum01_N.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

EndlessVendetta/Content/AnimStarterPack/UE4_Mannequin/Materials/MaterialLayers/T_ML_Rubber_Blue_01_D.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

EndlessVendetta/Content/AnimStarterPack/UE4_Mannequin/Materials/MaterialLayers/T_ML_Rubber_Blue_01_N.uasset (Stored with Git LFS) Normal file

Binary file not shown.

Some files were not shown because too many files have changed in this diff Show More