diff --git a/Config/DefaultEngine.ini b/Config/DefaultEngine.ini index e75fb0a..0c59675 100644 --- a/Config/DefaultEngine.ini +++ b/Config/DefaultEngine.ini @@ -2,13 +2,13 @@ GameName=CapstoneTest [/Script/EngineSettings.GameMapsSettings] -EditorStartupMap= -GameDefaultMap= +EditorStartupMap=/Game/Maps/L_LevelTest.L_LevelTest +GameDefaultMap=/Game/Maps/L_LevelTest.L_LevelTest TransitionMap= bUseSplitscreen=True TwoPlayerSplitscreenLayout=Horizontal ThreePlayerSplitscreenLayout=FavorTop -GlobalDefaultGameMode=/Game/ThirdPerson/Blueprints/BP_ThirdPersonGameMode.BP_ThirdPersonGameMode_C +GlobalDefaultGameMode=/Game/Blueprints/Player/Msc/BP_ThirdPersonGameMode.BP_ThirdPersonGameMode_C GlobalDefaultServerGameMode=None [/Script/Engine.RendererSettings] @@ -115,6 +115,7 @@ ManualIPAddress= +Profiles=(Name="UI",CollisionEnabled=QueryOnly,bCanModify=False,ObjectTypeName="WorldDynamic",CustomResponses=((Channel="WorldStatic",Response=ECR_Overlap),(Channel="Pawn",Response=ECR_Overlap),(Channel="Visibility"),(Channel="WorldDynamic",Response=ECR_Overlap),(Channel="Camera",Response=ECR_Overlap),(Channel="PhysicsBody",Response=ECR_Overlap),(Channel="Vehicle",Response=ECR_Overlap),(Channel="Destructible",Response=ECR_Overlap)),HelpMessage="WorldStatic object that overlaps all actors by default. All new custom channels will use its own default response. ") +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") -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 b1d7dc5..2223809 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:6c688e067c0dd677a02915a1037bef172593ae1aef669e80b33ea3c844b4fac9 -size 92848 +oid sha256:6a5e3c1e8cc78854f62f0e573bb0ffe2b9d52b3b1ac9a1976a8da1b0570042e6 +size 107334 diff --git a/Content/Blueprints/Items/Basics/BP_PickupItem_Magnetic.uasset b/Content/Blueprints/Items/Basics/BP_PickupItem_Magnetic.uasset index d4b9c9f..929eae0 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:0e67568fa01cfb8397f44364cb319c53b5bcdae630f127bda6fe59b2a7277239 -size 125129 +oid sha256:d3016fa576786f66015b0ce52c0732de5af7c129b00c745f84c9d926a9f92983 +size 129605 diff --git a/Content/Blueprints/Items/Basics/BP_PickupItem_OnContact.uasset b/Content/Blueprints/Items/Basics/BP_PickupItem_OnContact.uasset index 2d429d9..f4545c3 100644 --- a/Content/Blueprints/Items/Basics/BP_PickupItem_OnContact.uasset +++ b/Content/Blueprints/Items/Basics/BP_PickupItem_OnContact.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:fc32e0d008c13dc23d16fce7d258eff94387b137f0538b944058f25f05bf01c0 -size 61914 +oid sha256:8a997747b4940ba73ea3f5552e28746f6e0cd854faec40c9b28dc0c0a0eec5c5 +size 65835 diff --git a/Content/Blueprints/LevelDesign/World/BP_Interact_TriggerBox.uasset b/Content/Blueprints/LevelDesign/World/BP_Interact_TriggerBox.uasset index ce3c99d..d532252 100644 --- a/Content/Blueprints/LevelDesign/World/BP_Interact_TriggerBox.uasset +++ b/Content/Blueprints/LevelDesign/World/BP_Interact_TriggerBox.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7c2d927b1ae9a34caf401467b8493c1b05e67202adf92398ae4c1122a1b85a41 -size 40969 +oid sha256:8dfdddfe379850bd3d1774a3b56d05458f9a25c322c9a5a9ecc2f15acd526bc9 +size 43579 diff --git a/Content/Blueprints/Player/BP_ThirdPersonCharacter.uasset b/Content/Blueprints/Player/BP_ThirdPersonCharacter.uasset index 489d952..6560400 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:5e8251d70392a21216e73004ee960aa528f45f404ca8150b9c139cd7e86f1104 -size 2296262 +oid sha256:216ab59675a2abcb0bdb1d40d953b82db2baab8290c29c97fcc3dee77713d560 +size 2287045 diff --git a/Content/Maps/L_LevelTest.umap b/Content/Maps/L_LevelTest.umap index 0250f6a..6fa4758 100644 Binary files a/Content/Maps/L_LevelTest.umap and b/Content/Maps/L_LevelTest.umap differ