Merge branch 'master' of https://git.alanocull.com/triple-aaa-games/hook-line-axe

2024-03-01 02:03:41 -05:00 · 2024-03-01 02:03:41 -05:00 · fa08c13921
commit fa08c13921
parent 4d35b73da9 110ed7f78f
33 changed files with 99 additions and 0 deletions
--- a/Content/Characters/Infantry/ABP_Infantry.uasset
+++ b/Content/Characters/Infantry/ABP_Infantry.uasset
--- a/Content/Characters/Infantry/Animations/anims_infantry_shelby_skeleton_infantry_anim_idle.uasset
+++ b/Content/Characters/Infantry/Animations/anims_infantry_shelby_skeleton_infantry_anim_idle.uasset
--- a/Content/Characters/Infantry/Materials/M_Baton.uasset
+++ b/Content/Characters/Infantry/Materials/M_Baton.uasset
--- a/Content/Characters/Infantry/Materials/M_Gun.uasset
+++ b/Content/Characters/Infantry/Materials/M_Gun.uasset
--- a/Content/Characters/Infantry/Materials/M_Infantry_Body.uasset
+++ b/Content/Characters/Infantry/Materials/M_Infantry_Body.uasset
--- a/Content/Characters/Infantry/Materials/M_Jetpack.uasset
+++ b/Content/Characters/Infantry/Materials/M_Jetpack.uasset
--- a/Content/Characters/Infantry/Materials/mat_baton_arm.uasset
+++ b/Content/Characters/Infantry/Materials/mat_baton_arm.uasset
--- a/Content/Characters/Infantry/Materials/mat_baton_basecolor.uasset
+++ b/Content/Characters/Infantry/Materials/mat_baton_basecolor.uasset
--- a/Content/Characters/Infantry/Materials/mat_baton_emissive.uasset
+++ b/Content/Characters/Infantry/Materials/mat_baton_emissive.uasset
--- a/Content/Characters/Infantry/Materials/mat_baton_normal.uasset
+++ b/Content/Characters/Infantry/Materials/mat_baton_normal.uasset
--- a/Content/Characters/Infantry/Materials/mat_gun_arm.uasset
+++ b/Content/Characters/Infantry/Materials/mat_gun_arm.uasset
--- a/Content/Characters/Infantry/Materials/mat_gun_basecolor.uasset
+++ b/Content/Characters/Infantry/Materials/mat_gun_basecolor.uasset
--- a/Content/Characters/Infantry/Materials/mat_gun_emissive.uasset
+++ b/Content/Characters/Infantry/Materials/mat_gun_emissive.uasset
--- a/Content/Characters/Infantry/Materials/mat_gun_normal.uasset
+++ b/Content/Characters/Infantry/Materials/mat_gun_normal.uasset
--- a/Content/Characters/Infantry/Materials/mat_infantry_arm.uasset
+++ b/Content/Characters/Infantry/Materials/mat_infantry_arm.uasset
--- a/Content/Characters/Infantry/Materials/mat_infantry_basecolor.uasset
+++ b/Content/Characters/Infantry/Materials/mat_infantry_basecolor.uasset
--- a/Content/Characters/Infantry/Materials/mat_infantry_normal.uasset
+++ b/Content/Characters/Infantry/Materials/mat_infantry_normal.uasset
--- a/Content/Characters/Infantry/Materials/mat_jetpack_arm.uasset
+++ b/Content/Characters/Infantry/Materials/mat_jetpack_arm.uasset
--- a/Content/Characters/Infantry/Materials/mat_jetpack_basecolor.uasset
+++ b/Content/Characters/Infantry/Materials/mat_jetpack_basecolor.uasset
--- a/Content/Characters/Infantry/Materials/mat_jetpack_emissive.uasset
+++ b/Content/Characters/Infantry/Materials/mat_jetpack_emissive.uasset
--- a/Content/Characters/Infantry/Materials/mat_jetpack_normal.uasset
+++ b/Content/Characters/Infantry/Materials/mat_jetpack_normal.uasset
--- a/Content/Characters/Infantry/Meshes/mesh_baton.uasset
+++ b/Content/Characters/Infantry/Meshes/mesh_baton.uasset
--- a/Content/Characters/Infantry/Meshes/mesh_gun_body.uasset
+++ b/Content/Characters/Infantry/Meshes/mesh_gun_body.uasset
--- a/Content/Characters/Infantry/Meshes/mesh_gun_mag.uasset
+++ b/Content/Characters/Infantry/Meshes/mesh_gun_mag.uasset
--- a/Content/Characters/Infantry/Meshes/mesh_gun_muzzlebrake.uasset
+++ b/Content/Characters/Infantry/Meshes/mesh_gun_muzzlebrake.uasset
--- a/Content/Characters/Infantry/Meshes/mesh_gun_trigger.uasset
+++ b/Content/Characters/Infantry/Meshes/mesh_gun_trigger.uasset
--- a/Content/Characters/Infantry/Meshes/mesh_infantry_camera_arm.uasset
+++ b/Content/Characters/Infantry/Meshes/mesh_infantry_camera_arm.uasset
--- a/Content/Characters/Infantry/Meshes/mesh_infantry_camera_head.uasset
+++ b/Content/Characters/Infantry/Meshes/mesh_infantry_camera_head.uasset
--- a/Content/Characters/Infantry/Meshes/mesh_infantry_helmet.uasset
+++ b/Content/Characters/Infantry/Meshes/mesh_infantry_helmet.uasset
--- a/Content/Characters/Infantry/Meshes/mesh_jetpack.uasset
+++ b/Content/Characters/Infantry/Meshes/mesh_jetpack.uasset
--- a/Content/Characters/Infantry/SK_Infantry.uasset
+++ b/Content/Characters/Infantry/SK_Infantry.uasset
--- a/Content/Characters/Infantry/SK_Infantry_PhysicsAsset.uasset
+++ b/Content/Characters/Infantry/SK_Infantry_PhysicsAsset.uasset
--- a/Content/Characters/Infantry/SK_Infantry_Skeleton.uasset
+++ b/Content/Characters/Infantry/SK_Infantry_Skeleton.uasset