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 a22669b..dcc036f 100644 --- a/Config/DefaultEngine.ini +++ b/Config/DefaultEngine.ini @@ -124,6 +124,7 @@ ManualIPAddress= +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") ++DefaultChannelResponses=(Channel=ECC_GameTraceChannel5,DefaultResponse=ECR_Block,bTraceType=False,bStaticObject=False,Name="IgnoredByPlayer") -ProfileRedirects=(OldName="BlockingVolume",NewName="InvisibleWall") -ProfileRedirects=(OldName="InterpActor",NewName="IgnoreOnlyPawn") -ProfileRedirects=(OldName="StaticMeshComponent",NewName="BlockAllDynamic") diff --git a/Content/Blueprints/Enemys/BP_BasicEnemy.uasset b/Content/Blueprints/Enemys/BP_BasicEnemy.uasset index 03bc8e4..b3b3eb6 100644 --- a/Content/Blueprints/Enemys/BP_BasicEnemy.uasset +++ b/Content/Blueprints/Enemys/BP_BasicEnemy.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:204659de8ec5911e101e789301a9a60cd261203fe1f93b023dd903a92f7da163 -size 131189 +oid sha256:aedf559cdfad0c4d95200f7911f089c32b900c083ee835193c6feaa10cc326f3 +size 130213 diff --git a/Content/Blueprints/Enemys/BP_BossEnemy.uasset b/Content/Blueprints/Enemys/BP_BossEnemy.uasset index 0bc832a..49f812e 100644 --- a/Content/Blueprints/Enemys/BP_BossEnemy.uasset +++ b/Content/Blueprints/Enemys/BP_BossEnemy.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8b1d8b3d738b9ee0d51e950321f4261748c46d08598168d06b228a318ecc44f7 -size 457472 +oid sha256:5c0a404181329d22ed3bb851bbd91c848f261af0c0a543e96dcc5a6c3e62d2b1 +size 458928 diff --git a/Content/Blueprints/Enemys/BP_IntermediateEnemy_Energy.uasset b/Content/Blueprints/Enemys/BP_IntermediateEnemy_Energy.uasset index c61e556..c9bf85b 100644 --- a/Content/Blueprints/Enemys/BP_IntermediateEnemy_Energy.uasset +++ b/Content/Blueprints/Enemys/BP_IntermediateEnemy_Energy.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:041243e7efefde93f9476609665a413c8817050a1b4a1e61a5e58bbb89c5ee1c -size 290136 +oid sha256:5c90174a0ce0b8fdd9f1b31cf77a2fe95cda965b537e4a75ca59865ccb91b7e6 +size 293114 diff --git a/Content/Blueprints/Enemys/BP_IntermediateEnemy_Missile.uasset b/Content/Blueprints/Enemys/BP_IntermediateEnemy_Missile.uasset index 64dcc3b..1936766 100644 --- a/Content/Blueprints/Enemys/BP_IntermediateEnemy_Missile.uasset +++ b/Content/Blueprints/Enemys/BP_IntermediateEnemy_Missile.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1c26908a7c28ed25552b1a0f5e4135888e66c3b53ed46632cd456e5e3ba51609 -size 293178 +oid sha256:f23a23fc69e6b95e368360938919953924339674f2b3c4ad3ce05fe9a2e9dd10 +size 294640 diff --git a/Content/Blueprints/Enemys/Basics/BP_Enemy_Base.uasset b/Content/Blueprints/Enemys/Basics/BP_Enemy_Base.uasset index 57e1f26..25080a5 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:49a09a12e80bfabf243a95d462c0e4383945ef547cb59b478b8c33f21fd49202 -size 530630 +oid sha256:3700e358f4f2140aef65033ffe08b7bbbbc22e97f2c4cfd916d4b251a9936551 +size 551773 diff --git a/Content/Blueprints/Enemys/CharacterEnemies/BP_Enemy_Character.uasset b/Content/Blueprints/Enemys/CharacterEnemies/BP_Enemy_Character.uasset index e19945e..88e74b1 100644 --- a/Content/Blueprints/Enemys/CharacterEnemies/BP_Enemy_Character.uasset +++ b/Content/Blueprints/Enemys/CharacterEnemies/BP_Enemy_Character.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c70c79806d1937c58aa69512fb4b52b7623cf633f48682adf535d921541bce49 -size 378622 +oid sha256:3731cafca704bfa304ad6467bbce61d5c8778fbd10e3fcb757c4ef5a904a4544 +size 441426 diff --git a/Content/Blueprints/Items/BP_PickupItem_Health.uasset b/Content/Blueprints/Items/BP_PickupItem_Health.uasset index 1d8ff5f..b8e7fe4 100644 --- a/Content/Blueprints/Items/BP_PickupItem_Health.uasset +++ b/Content/Blueprints/Items/BP_PickupItem_Health.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8ed78896e7d3d97f0beacd8b30cf68916af5874bb54c4fc98d7055e9e4f51134 -size 64518 +oid sha256:851d654a0ab13598512bfba658942b18568efb0bac84cd4ff17d5805b17e9c67 +size 64329 diff --git a/Content/Blueprints/Items/Basics/BP_PickupItem_Magnetic.uasset b/Content/Blueprints/Items/Basics/BP_PickupItem_Magnetic.uasset index 3c1b7e5..87d35d0 100644 --- a/Content/Blueprints/Items/Basics/BP_PickupItem_Magnetic.uasset +++ b/Content/Blueprints/Items/Basics/BP_PickupItem_Magnetic.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:cb3f21a6c09a513d110ff65795340b670e53149a0c8e027235fa6691fdb39493 -size 124972 +oid sha256:8b1faf03bd9783404f2d3570988ecc8ccfedb64f0b11ba2fedb80b4b76d7db4f +size 132647 diff --git a/Content/Blueprints/LevelDesign/World/BP_EnemySpawningHut.uasset b/Content/Blueprints/LevelDesign/World/BP_EnemySpawningHut.uasset index eb9c318..4782f35 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:029ebbe107dc4a98d676aea1cf8e45e76082638d03a0b1f434dad95e9426d948 -size 145304 +oid sha256:ba28ecc5e403fddd688b2dbe086cc4bba050d61307c86d4b922fa4c2d4cc8003 +size 147125 diff --git a/Content/Blueprints/LevelDesign/World/BP_RespawnPoint.uasset b/Content/Blueprints/LevelDesign/World/BP_RespawnPoint.uasset index 5ec174c..600d0cd 100644 --- a/Content/Blueprints/LevelDesign/World/BP_RespawnPoint.uasset +++ b/Content/Blueprints/LevelDesign/World/BP_RespawnPoint.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8e5182283e42f0e5efe9f56ad87ade2c802e2d190b2f6b9dd6f1a81e21ba830e -size 147545 +oid sha256:79bfd1e4921abb10232f65226610ba2042174dc220f76e6f7a0be4532265a658 +size 145566 diff --git a/Content/Blueprints/Player/BP_ThirdPersonCharacter.uasset b/Content/Blueprints/Player/BP_ThirdPersonCharacter.uasset index 57ad851..32ae7c7 100644 --- a/Content/Blueprints/Player/BP_ThirdPersonCharacter.uasset +++ b/Content/Blueprints/Player/BP_ThirdPersonCharacter.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ac39bfdaaf89bdeeedc79c898ea1561aa5d242a05cd5855d1c385cb03fed5652 -size 4925720 +oid sha256:d6b46b35db9887cf047e489c559dce2a176ae6411c411972ae49b6ec74b137c5 +size 4914834 diff --git a/Content/Blueprints/Projectile/BP_ThrownProjectile.uasset b/Content/Blueprints/Projectile/BP_ThrownProjectile.uasset index 7f1e3ea..49fa851 100644 --- a/Content/Blueprints/Projectile/BP_ThrownProjectile.uasset +++ b/Content/Blueprints/Projectile/BP_ThrownProjectile.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:35e478459398efd1a5b960d297b25e388fb82efc004df20886e6f0f6d7231748 -size 494807 +oid sha256:7fd826cc60b8f5743aad35a21d2fa988f54a4380ba84f15615b098838b782fd3 +size 508397 diff --git a/Content/Characters/Infantry/SK_Infantry_PhysicsAsset.uasset b/Content/Characters/Infantry/SK_Infantry_PhysicsAsset.uasset index e8979a0..6d97c21 100644 --- a/Content/Characters/Infantry/SK_Infantry_PhysicsAsset.uasset +++ b/Content/Characters/Infantry/SK_Infantry_PhysicsAsset.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c435bf046bc3c41488b986209950b470a1a654615a7521b8f54f26cb6a227f52 -size 14874 +oid sha256:f3c30b3cae6fd1420e343f2ab9797c9bf1237bc25bfe9e782d10057b84b2c2ed +size 14653 diff --git a/Content/Maps/L_BunkerDemo.umap b/Content/Maps/L_BunkerDemo.umap index b37e0db..d2a2be6 100644 Binary files a/Content/Maps/L_BunkerDemo.umap and b/Content/Maps/L_BunkerDemo.umap differ diff --git a/Content/Materials/Enemies/M_Enemy_Parent.uasset b/Content/Materials/Enemies/M_Enemy_Parent.uasset index b901e9a..0faad72 100644 --- a/Content/Materials/Enemies/M_Enemy_Parent.uasset +++ b/Content/Materials/Enemies/M_Enemy_Parent.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:52831c2e4ec3801d5f71a5aac401db1a6a350fc16337b3263d03b9c86c99e666 -size 26998 +oid sha256:e052257184a90adfb0be5576501d6e40ef3e59f8ce0372e5cc1941ebb0f8e82f +size 30837 diff --git a/Content/UI/WB_UI.uasset b/Content/UI/WB_UI.uasset index 50ef290..b724d7a 100644 --- a/Content/UI/WB_UI.uasset +++ b/Content/UI/WB_UI.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:96e6a242b21f1494591c7aee147b4b1143d12dac1e3469758f9e86b1083f8ec8 -size 490704 +oid sha256:fcf289e34a06ef568c90829b65af086941ac16059db1a164054e0d220f0d9336 +size 483171