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

Work on test level
2024-02-20 00:58:04 -05:00 · 2024-02-20 00:57:43 -05:00
12 changed files with 23 additions and 17 deletions
--- a/Content/Blueprints/Enemys/CharacterEnemies/BP_Enemy_Character.uasset
+++ b/Content/Blueprints/Enemys/CharacterEnemies/BP_Enemy_Character.uasset
--- a/Content/Blueprints/LevelDesign/World/BP_EnemySpawningHut.uasset
+++ b/Content/Blueprints/LevelDesign/World/BP_EnemySpawningHut.uasset
--- a/Content/Blueprints/Player/BP_ThirdPersonCharacter.uasset
+++ b/Content/Blueprints/Player/BP_ThirdPersonCharacter.uasset
--- a/Content/Maps/L_BunkerDemo.umap
+++ b/Content/Maps/L_BunkerDemo.umap
--- a/Content/Materials/Bunker/M_Puddle01.uasset
+++ b/Content/Materials/Bunker/M_Puddle01.uasset
--- a/Content/Materials/Bunker/M_brick.uasset
+++ b/Content/Materials/Bunker/M_brick.uasset
--- a/Content/Materials/Bunker/M_concrete_plate_floor.uasset
+++ b/Content/Materials/Bunker/M_concrete_plate_floor.uasset
--- a/Content/Materials/Bunker/M_concrete_tile.uasset
+++ b/Content/Materials/Bunker/M_concrete_tile.uasset
--- a/Content/Materials/Bunker/M_wall_cancrete.uasset
+++ b/Content/Materials/Bunker/M_wall_cancrete.uasset
--- a/Content/Materials/PostProcess/PP_Outline.uasset
+++ b/Content/Materials/PostProcess/PP_Outline.uasset
--- a/Content/Sounds/Infantry/SC_FleshHit.uasset
+++ b/Content/Sounds/Infantry/SC_FleshHit.uasset
--- a/Content/Sounds/Infantry/SW_FleshHit.uasset
+++ b/Content/Sounds/Infantry/SW_FleshHit.uasset
Author	SHA1	Message	Date
Connor Elsworth	5876bef562	Merge branch 'master' of https://git.alanocull.com/triple-aaa-games/hook-line-axe	2024-02-20 00:58:04 -05:00
Connor Elsworth	79f959a7bc	Work on test level	2024-02-20 00:57:43 -05:00