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

2024-04-05 21:50:53 -04:00 · 2024-04-05 21:50:53 -04:00 · e4c65940fb
commit e4c65940fb
parent 7519de6e59 b63cbfbc25
66 changed files with 127 additions and 97 deletions
--- a/CapstoneTest.uproject
+++ b/CapstoneTest.uproject
@ -1,6 +1,6 @@
 {
 	"FileVersion": 3,
-	"EngineAssociation": "5.1",
+	"EngineAssociation": "{8DD3F189-468A-C131-1845-B893D72A159C}",
 	"Category": "",
 	"Description": "",
 	"Plugins": [
--- a/Content/Blueprints/BP_GameController.uasset
+++ b/Content/Blueprints/BP_GameController.uasset
--- a/Content/Blueprints/Enemys/BP_BossEnemy.uasset
+++ b/Content/Blueprints/Enemys/BP_BossEnemy.uasset
--- a/Content/Blueprints/Enemys/BP_DroneTurret.uasset
+++ b/Content/Blueprints/Enemys/BP_DroneTurret.uasset
--- a/Content/Blueprints/Enemys/BP_IntermediateEnemy_Energy.uasset
+++ b/Content/Blueprints/Enemys/BP_IntermediateEnemy_Energy.uasset
--- a/Content/Blueprints/Enemys/BP_IntermediateEnemy_Missile.uasset
+++ b/Content/Blueprints/Enemys/BP_IntermediateEnemy_Missile.uasset
--- a/Content/Blueprints/Enemys/Basics/BP_Enemy_Base.uasset
+++ b/Content/Blueprints/Enemys/Basics/BP_Enemy_Base.uasset
--- a/Content/Blueprints/Enemys/CharacterEnemies/BP_Enemy_Character.uasset
+++ b/Content/Blueprints/Enemys/CharacterEnemies/BP_Enemy_Character.uasset
--- a/Content/Blueprints/LevelDesign/BP_Ligh.uasset
+++ b/Content/Blueprints/LevelDesign/BP_Ligh.uasset
--- a/Content/Blueprints/LevelDesign/Msc/AC_EnemySpawning.uasset
+++ b/Content/Blueprints/LevelDesign/Msc/AC_EnemySpawning.uasset
--- a/Content/Blueprints/LevelDesign/World/BP_EnemySpawningHut.uasset
+++ b/Content/Blueprints/LevelDesign/World/BP_EnemySpawningHut.uasset
--- a/Content/Blueprints/LevelDesign/World/BP_VoidVolume.uasset
+++ b/Content/Blueprints/LevelDesign/World/BP_VoidVolume.uasset
--- a/Content/Blueprints/Player/BP_ThirdPersonCharacter.uasset
+++ b/Content/Blueprints/Player/BP_ThirdPersonCharacter.uasset
--- a/Content/Characters/Infantry/ABP_Infantry_Base.uasset
+++ b/Content/Characters/Infantry/ABP_Infantry_Base.uasset
--- a/Content/Characters/Infantry/Montages/MONT_InfantryElite_Stratagem.uasset
+++ b/Content/Characters/Infantry/Montages/MONT_InfantryElite_Stratagem.uasset
--- a/Content/Characters/Infantry/SK_Infantry_Skeleton.uasset
+++ b/Content/Characters/Infantry/SK_Infantry_Skeleton.uasset
--- a/Content/Characters/Insurrectionist/ABP_Insurrectionist.uasset
+++ b/Content/Characters/Insurrectionist/ABP_Insurrectionist.uasset
--- a/Content/Characters/Insurrectionist/Animations/anims_insurrectionist_tommy_skeleton_insurrectionist_Flinch_L_Hip.uasset
+++ b/Content/Characters/Insurrectionist/Animations/anims_insurrectionist_tommy_skeleton_insurrectionist_Flinch_L_Hip.uasset
--- a/Content/Characters/Insurrectionist/Animations/anims_insurrectionist_tommy_skeleton_insurrectionist_Flinch_L_Shoulder.uasset
+++ b/Content/Characters/Insurrectionist/Animations/anims_insurrectionist_tommy_skeleton_insurrectionist_Flinch_L_Shoulder.uasset
--- a/Content/Characters/Insurrectionist/Animations/anims_insurrectionist_tommy_skeleton_insurrectionist_Flinch_L_behind.uasset
+++ b/Content/Characters/Insurrectionist/Animations/anims_insurrectionist_tommy_skeleton_insurrectionist_Flinch_L_behind.uasset
--- a/Content/Characters/Insurrectionist/Animations/anims_insurrectionist_tommy_skeleton_insurrectionist_Flinch_R_Hip.uasset
+++ b/Content/Characters/Insurrectionist/Animations/anims_insurrectionist_tommy_skeleton_insurrectionist_Flinch_R_Hip.uasset
--- a/Content/Characters/Insurrectionist/Animations/anims_insurrectionist_tommy_skeleton_insurrectionist_Flinch_R_Shoulder.uasset
+++ b/Content/Characters/Insurrectionist/Animations/anims_insurrectionist_tommy_skeleton_insurrectionist_Flinch_R_Shoulder.uasset
--- a/Content/Characters/Insurrectionist/Animations/anims_insurrectionist_tommy_skeleton_insurrectionist_Flinch_R_behind.uasset
+++ b/Content/Characters/Insurrectionist/Animations/anims_insurrectionist_tommy_skeleton_insurrectionist_Flinch_R_behind.uasset
--- a/Content/Characters/Insurrectionist/Animations/anims_insurrectionist_tommy_skeleton_insurrectionist_anim_idle.uasset
+++ b/Content/Characters/Insurrectionist/Animations/anims_insurrectionist_tommy_skeleton_insurrectionist_anim_idle.uasset
--- a/Content/Characters/Insurrectionist/Animations/anims_insurrectionist_tommy_skeleton_insurrectionist_critical_hit.uasset
+++ b/Content/Characters/Insurrectionist/Animations/anims_insurrectionist_tommy_skeleton_insurrectionist_critical_hit.uasset
--- a/Content/Characters/Insurrectionist/Animations/anims_insurrectionist_tommy_skeleton_insurrectionist_dash_forward.uasset
+++ b/Content/Characters/Insurrectionist/Animations/anims_insurrectionist_tommy_skeleton_insurrectionist_dash_forward.uasset
--- a/Content/Characters/Insurrectionist/Animations/anims_insurrectionist_tommy_skeleton_insurrectionist_fall.uasset
+++ b/Content/Characters/Insurrectionist/Animations/anims_insurrectionist_tommy_skeleton_insurrectionist_fall.uasset
--- a/Content/Characters/Insurrectionist/Animations/anims_insurrectionist_tommy_skeleton_insurrectionist_grapple_reel.uasset
+++ b/Content/Characters/Insurrectionist/Animations/anims_insurrectionist_tommy_skeleton_insurrectionist_grapple_reel.uasset
--- a/Content/Characters/Insurrectionist/Animations/anims_insurrectionist_tommy_skeleton_insurrectionist_jump.uasset
+++ b/Content/Characters/Insurrectionist/Animations/anims_insurrectionist_tommy_skeleton_insurrectionist_jump.uasset
--- a/Content/Characters/Insurrectionist/Animations/anims_insurrectionist_tommy_skeleton_insurrectionist_land.uasset
+++ b/Content/Characters/Insurrectionist/Animations/anims_insurrectionist_tommy_skeleton_insurrectionist_land.uasset
--- a/Content/Characters/Insurrectionist/Animations/anims_insurrectionist_tommy_skeleton_insurrectionist_run_forward.uasset
+++ b/Content/Characters/Insurrectionist/Animations/anims_insurrectionist_tommy_skeleton_insurrectionist_run_forward.uasset
--- a/Content/Characters/Insurrectionist/Animations/anims_insurrectionist_tommy_skeleton_insurrectionist_strafe_left.uasset
+++ b/Content/Characters/Insurrectionist/Animations/anims_insurrectionist_tommy_skeleton_insurrectionist_strafe_left.uasset
--- a/Content/Characters/Insurrectionist/Animations/anims_insurrectionist_tommy_skeleton_insurrectionist_strafe_right.uasset
+++ b/Content/Characters/Insurrectionist/Animations/anims_insurrectionist_tommy_skeleton_insurrectionist_strafe_right.uasset
--- a/Content/Characters/Insurrectionist/Meshes/SK_Insurrectionist.uasset
+++ b/Content/Characters/Insurrectionist/Meshes/SK_Insurrectionist.uasset
--- a/Content/Characters/Insurrectionist/Montages/MONST_Insurrectionist_Land.uasset
+++ b/Content/Characters/Insurrectionist/Montages/MONST_Insurrectionist_Land.uasset
--- a/Content/Characters/Insurrectionist/Montages/MONT_Insurrectionist_Death.uasset
+++ b/Content/Characters/Insurrectionist/Montages/MONT_Insurrectionist_Death.uasset
--- a/Content/Characters/Insurrectionist/Montages/MONT_Insurrectionist_FlinchLBackward.uasset
+++ b/Content/Characters/Insurrectionist/Montages/MONT_Insurrectionist_FlinchLBackward.uasset
--- a/Content/Characters/Insurrectionist/Montages/MONT_Insurrectionist_FlinchRBackward.uasset
+++ b/Content/Characters/Insurrectionist/Montages/MONT_Insurrectionist_FlinchRBackward.uasset
--- a/Content/Characters/Insurrectionist/Montages/MONT_Insurrectionist_IdleFlourish1.uasset
+++ b/Content/Characters/Insurrectionist/Montages/MONT_Insurrectionist_IdleFlourish1.uasset
--- a/Content/Characters/Insurrectionist/Montages/MONT_Insurrectionist_Land.uasset
+++ b/Content/Characters/Insurrectionist/Montages/MONT_Insurrectionist_Land.uasset
--- a/Content/Data/DT_Levels.uasset
+++ b/Content/Data/DT_Levels.uasset
--- a/Content/Data/PM_Blood.uasset
+++ b/Content/Data/PM_Blood.uasset
--- a/Content/Maps/Connecting_Area.umap
+++ b/Content/Maps/Connecting_Area.umap
--- a/Content/Maps/L_Bunker/L_Bunker.umap
+++ b/Content/Maps/L_Bunker/L_Bunker.umap
--- a/Content/Maps/L_BunkerDemo.umap
+++ b/Content/Maps/L_BunkerDemo.umap
--- a/Content/Maps/PitFall_Arena.umap
+++ b/Content/Maps/PitFall_Arena.umap
--- a/Content/Maps/PitFall_ArenaArtPass.umap
+++ b/Content/Maps/PitFall_ArenaArtPass.umap
--- a/Content/Maps/WatchTower_Arena.umap
+++ b/Content/Maps/WatchTower_Arena.umap
--- a/Content/Materials/Bunker/M_plates_concrete.uasset
+++ b/Content/Materials/Bunker/M_plates_concrete.uasset
--- a/Content/Materials/Bunker/M_wall_b.uasset
+++ b/Content/Materials/Bunker/M_wall_b.uasset
--- a/Content/Materials/Bunker/M_wall_cancrete.uasset
+++ b/Content/Materials/Bunker/M_wall_cancrete.uasset
--- a/Content/Materials/Bunker/M_wall_cancrete_Inst.uasset
+++ b/Content/Materials/Bunker/M_wall_cancrete_Inst.uasset
--- a/Content/Materials/MI_Respawn.uasset
+++ b/Content/Materials/MI_Respawn.uasset
--- a/Content/Sounds/Infantry/SC_EnemyHurt.uasset
+++ b/Content/Sounds/Infantry/SC_EnemyHurt.uasset
--- a/Content/Sounds/Infantry/SW_EnemyHurt1.uasset
+++ b/Content/Sounds/Infantry/SW_EnemyHurt1.uasset
--- a/Content/Sounds/Infantry/SW_EnemyHurt2.uasset
+++ b/Content/Sounds/Infantry/SW_EnemyHurt2.uasset
--- a/Content/Sounds/Infantry/SW_EnemyHurt3.uasset
+++ b/Content/Sounds/Infantry/SW_EnemyHurt3.uasset
--- a/Content/Sounds/SW_ButtonClick.uasset
+++ b/Content/Sounds/SW_ButtonClick.uasset
--- a/Content/Sounds/SW_ButtonHover.uasset
+++ b/Content/Sounds/SW_ButtonHover.uasset
--- a/Content/Sounds/SW_GainSkillPoint.uasset
+++ b/Content/Sounds/SW_GainSkillPoint.uasset
--- a/Content/UGBunker/BunkerParts/Materials/MI_Broken_Concrete_Floor_Inst1.uasset
+++ b/Content/UGBunker/BunkerParts/Materials/MI_Broken_Concrete_Floor_Inst1.uasset
--- a/Content/UGBunker/BunkerParts/Materials/MI_ConcreteBunker_Inst.uasset
+++ b/Content/UGBunker/BunkerParts/Materials/MI_ConcreteBunker_Inst.uasset
--- a/Content/UGBunker/BunkerParts/Materials/MI_ConcreteCeiling_01_Inst.uasset
+++ b/Content/UGBunker/BunkerParts/Materials/MI_ConcreteCeiling_01_Inst.uasset
--- a/Content/UI/Menus/WB_LevelSelect.uasset
+++ b/Content/UI/Menus/WB_LevelSelect.uasset
--- a/Content/UI/Menus/WB_SettingsMenu.uasset
+++ b/Content/UI/Menus/WB_SettingsMenu.uasset
--- a/Content/UI/Menus/WB_TitleMenu.uasset
+++ b/Content/UI/Menus/WB_TitleMenu.uasset