diff --git a/CapstoneTest.uproject b/CapstoneTest.uproject index 9720719..67fd3ab 100644 --- a/CapstoneTest.uproject +++ b/CapstoneTest.uproject @@ -1,6 +1,6 @@ { "FileVersion": 3, - "EngineAssociation": "{8DD3F189-468A-C131-1845-B893D72A159C}", + "EngineAssociation": "5.1", "Category": "", "Description": "", "Plugins": [ diff --git a/Config/DefaultEngine.ini b/Config/DefaultEngine.ini index 6ae9d96..a22669b 100644 --- a/Config/DefaultEngine.ini +++ b/Config/DefaultEngine.ini @@ -123,6 +123,7 @@ ManualIPAddress= +DefaultChannelResponses=(Channel=ECC_GameTraceChannel1,DefaultResponse=ECR_Block,bTraceType=False,bStaticObject=False,Name="Projectile") +DefaultChannelResponses=(Channel=ECC_GameTraceChannel2,DefaultResponse=ECR_Block,bTraceType=False,bStaticObject=False,Name="Enemy") +DefaultChannelResponses=(Channel=ECC_GameTraceChannel3,DefaultResponse=ECR_Block,bTraceType=False,bStaticObject=False,Name="Player") ++DefaultChannelResponses=(Channel=ECC_GameTraceChannel4,DefaultResponse=ECR_Block,bTraceType=False,bStaticObject=False,Name="Boss") -ProfileRedirects=(OldName="BlockingVolume",NewName="InvisibleWall") -ProfileRedirects=(OldName="InterpActor",NewName="IgnoreOnlyPawn") -ProfileRedirects=(OldName="StaticMeshComponent",NewName="BlockAllDynamic") diff --git a/Content/Blueprints/Enemys/BP_AdvancedEnemy.uasset b/Content/Blueprints/Enemys/BP_AdvancedEnemy.uasset index 5bd61b5..0125765 100644 --- a/Content/Blueprints/Enemys/BP_AdvancedEnemy.uasset +++ b/Content/Blueprints/Enemys/BP_AdvancedEnemy.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e83183d8e45b035bd303771a54e41a551dd9503294ed3b0960867f2dba91c170 -size 278848 +oid sha256:ce9d55bbdebd3c65b7f0c8c88f73499452e2496fd43a88a97f31d47d2482b983 +size 400275 diff --git a/Content/Blueprints/Enemys/Basics/BP_Enemy_Base.uasset b/Content/Blueprints/Enemys/Basics/BP_Enemy_Base.uasset index 7125d7d..828b7b9 100644 --- a/Content/Blueprints/Enemys/Basics/BP_Enemy_Base.uasset +++ b/Content/Blueprints/Enemys/Basics/BP_Enemy_Base.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3bc05712a0ec9f0f2acea29b557d122f0a577290ac733c1ae81f2a5ad7b333a1 -size 532700 +oid sha256:d2dae3dc8476f4b38a5f7bd723922d48fef9ad3645c14f8fe9a26f7d543d1135 +size 525640 diff --git a/Content/Blueprints/Enemys/Bosses/TutorialBoss/BP_ElectricFence.uasset b/Content/Blueprints/Enemys/Bosses/TutorialBoss/BP_ElectricFence.uasset deleted file mode 100644 index 330a198..0000000 --- a/Content/Blueprints/Enemys/Bosses/TutorialBoss/BP_ElectricFence.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:5535193a0b4cbaabb73d461b06db6cdc229dcbf6bef9f14fa2d474c617408256 -size 185922 diff --git a/Content/Blueprints/Enemys/Bosses/TutorialBoss/BP_ElectricFenceAttack.uasset b/Content/Blueprints/Enemys/Bosses/TutorialBoss/BP_ElectricFenceAttack.uasset new file mode 100644 index 0000000..6fc5c4e --- /dev/null +++ b/Content/Blueprints/Enemys/Bosses/TutorialBoss/BP_ElectricFenceAttack.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:69e048f4c33b0fb606e7760697bc083a6b679b7de78388dcfaa6b0253557f5a9 +size 179278 diff --git a/Content/Blueprints/Enemys/Bosses/TutorialBoss/BP_ElectricFenceProjectile.uasset b/Content/Blueprints/Enemys/Bosses/TutorialBoss/BP_ElectricFenceProjectile.uasset index df19d47..298a3c1 100644 --- a/Content/Blueprints/Enemys/Bosses/TutorialBoss/BP_ElectricFenceProjectile.uasset +++ b/Content/Blueprints/Enemys/Bosses/TutorialBoss/BP_ElectricFenceProjectile.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:15b7624cb8582e7c424196d86b428f529d8bc9f0b317001c28049f050c78da6f -size 148979 +oid sha256:0d90ddda2f1a809407490860c5d71612cfe2d38ffcaf630f0777f56f6f2fe965 +size 148077 diff --git a/Content/Blueprints/Enemys/Bosses/TutorialBoss/BP_ElectricRocket.uasset b/Content/Blueprints/Enemys/Bosses/TutorialBoss/BP_ElectricRocket.uasset index 4855ed1..102e2dd 100644 --- a/Content/Blueprints/Enemys/Bosses/TutorialBoss/BP_ElectricRocket.uasset +++ b/Content/Blueprints/Enemys/Bosses/TutorialBoss/BP_ElectricRocket.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5165ae58d348dd4012aaf805135501611a54e9729d63367b89203f41aa54f750 -size 196523 +oid sha256:fb95067ef23e114640af4c2359ef42d4ab6d9d97dbc20266a387d9bd08887c63 +size 198042 diff --git a/Content/Blueprints/Enemys/Bosses/TutorialBoss/BP_ElectricRocketAOE.uasset b/Content/Blueprints/Enemys/Bosses/TutorialBoss/BP_ElectricRocketAOE.uasset index c1577a6..85e3f06 100644 --- a/Content/Blueprints/Enemys/Bosses/TutorialBoss/BP_ElectricRocketAOE.uasset +++ b/Content/Blueprints/Enemys/Bosses/TutorialBoss/BP_ElectricRocketAOE.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0f2b4af9d5a3063b4d592ef492fced808143e96f7a9fac9e42fdac82d057e943 -size 249442 +oid sha256:01407b932c3c9bac987956cb0c9dc8eb561e6bca369ce263ff9a4f7e7937ea6b +size 248663 diff --git a/Content/Blueprints/Enemys/Bosses/TutorialBoss/BP_ElectricRocketLauncher.uasset b/Content/Blueprints/Enemys/Bosses/TutorialBoss/BP_ElectricRocketLauncher.uasset new file mode 100644 index 0000000..c76cf84 --- /dev/null +++ b/Content/Blueprints/Enemys/Bosses/TutorialBoss/BP_ElectricRocketLauncher.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3eed184a523da1d98e272797bd46b99a1dff98e7168e2b1d85333099ccd2f251 +size 80912 diff --git a/Content/Blueprints/Enemys/Bosses/TutorialBoss/BP_ElectricWave.uasset b/Content/Blueprints/Enemys/Bosses/TutorialBoss/BP_ElectricWave.uasset index d5fe53a..f61ec6f 100644 --- a/Content/Blueprints/Enemys/Bosses/TutorialBoss/BP_ElectricWave.uasset +++ b/Content/Blueprints/Enemys/Bosses/TutorialBoss/BP_ElectricWave.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3ea95a547946d12dd9084e1df64bd2e932db31f292a7e8483931a5dd00ddf4f1 -size 168197 +oid sha256:bd06f83ad5a183c2ce48b4cc415bc6390f943a66612902cd7d96646a8f00b8d0 +size 170131 diff --git a/Content/Blueprints/Enemys/Bosses/TutorialBoss/TestRocketLauncher.uasset b/Content/Blueprints/Enemys/Bosses/TutorialBoss/TestRocketLauncher.uasset deleted file mode 100644 index 2402622..0000000 --- a/Content/Blueprints/Enemys/Bosses/TutorialBoss/TestRocketLauncher.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:7fe70693ab64d90dac3ae4596b9217aeef05d2d540342e0d05698c8add5f20eb -size 84312 diff --git a/Content/Blueprints/Enemys/CharacterEnemies/BehaviorTree/AdvancedEnemyBehavior.uasset b/Content/Blueprints/Enemys/CharacterEnemies/BehaviorTree/AdvancedEnemyBehavior.uasset index a11812d..0d37a3f 100644 --- a/Content/Blueprints/Enemys/CharacterEnemies/BehaviorTree/AdvancedEnemyBehavior.uasset +++ b/Content/Blueprints/Enemys/CharacterEnemies/BehaviorTree/AdvancedEnemyBehavior.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d7902741f90cea51cd9b2e3161074af2c0fee21bcb88929b1ea5c45f11c7dcd6 -size 75434 +oid sha256:209531d0805437c5b089a3856df117dc6574c81f33093b0fbd8658318727c123 +size 76855 diff --git a/Content/Blueprints/LevelDesign/World/BP_EnemySpawningHut.uasset b/Content/Blueprints/LevelDesign/World/BP_EnemySpawningHut.uasset index 78b50ad..276ee1b 100644 --- a/Content/Blueprints/LevelDesign/World/BP_EnemySpawningHut.uasset +++ b/Content/Blueprints/LevelDesign/World/BP_EnemySpawningHut.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ade49cce48d30173d832a6dc2dbdc626c703132f4b55f4aeb5828bd5050d3432 -size 137707 +oid sha256:d685881e8c556750d7de023c7dbd6b9956645e64ff328742b8f27f6d6f7aa861 +size 146772 diff --git a/Content/Maps/L_BunkerDemo.umap b/Content/Maps/L_BunkerDemo.umap index 428f08f..16b1df3 100644 Binary files a/Content/Maps/L_BunkerDemo.umap and b/Content/Maps/L_BunkerDemo.umap differ diff --git a/Content/Maps/L_ConnorTest1.umap b/Content/Maps/L_ConnorTest1.umap index 1916686..bfa9ead 100644 Binary files a/Content/Maps/L_ConnorTest1.umap and b/Content/Maps/L_ConnorTest1.umap differ