diff --git a/Config/DefaultEngine.ini b/Config/DefaultEngine.ini index 10b816a..e75fb0a 100644 --- a/Config/DefaultEngine.ini +++ b/Config/DefaultEngine.ini @@ -2,8 +2,8 @@ GameName=CapstoneTest [/Script/EngineSettings.GameMapsSettings] -EditorStartupMap=/Game/Maps/LevelDesignTest.LevelDesignTest -GameDefaultMap=/Game/ThirdPerson/Maps/ThirdPersonMap.ThirdPersonMap +EditorStartupMap= +GameDefaultMap= TransitionMap= bUseSplitscreen=True TwoPlayerSplitscreenLayout=Horizontal diff --git a/Content/Blueprints/BP_GameController.uasset b/Content/Blueprints/BP_GameController.uasset index 0442a7b..c39d40f 100644 --- a/Content/Blueprints/BP_GameController.uasset +++ b/Content/Blueprints/BP_GameController.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5014ba11c778c91fc600b19254a26d1351cfbd738c26810605161deb46945d94 -size 1204172 +oid sha256:0e1ea9bfaf5fea25b118ee0e1944034e76883bf44c765b994b325ebaafc09f03 +size 1197282 diff --git a/Content/Blueprints/Enemys/BP_BasicEnemy.uasset b/Content/Blueprints/Enemys/BP_BasicEnemy.uasset index f26aea0..e382970 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:d798385f591110b98b5f8ae5ded50babd0f8c49e421ff6010b4b190262a6ff42 -size 35693 +oid sha256:59ae5c19a1204d4547adaf33b4ab56a92c324adc722dbb29a59f7ffd0b8759f4 +size 36074 diff --git a/Content/Blueprints/Enemys/BP_TurretEnemy.uasset b/Content/Blueprints/Enemys/BP_TurretEnemy.uasset index 5db3675..6f86dd9 100644 --- a/Content/Blueprints/Enemys/BP_TurretEnemy.uasset +++ b/Content/Blueprints/Enemys/BP_TurretEnemy.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:92770ed35e83a47e8ac42dbe4741a6cc9512625259a4f0f0181d596c3a75af25 -size 268957 +oid sha256:64c0a520da3917d3b8da5e7179aa54bb5b4f19a42e6aa06f55445881714ed958 +size 267644 diff --git a/Content/Blueprints/Enemys/Basics/BP_Enemy_Base.uasset b/Content/Blueprints/Enemys/Basics/BP_Enemy_Base.uasset index 5283072..6c41f76 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:51e9813515bccf5857338aec6a1d12abc547e3458296675efa015de0df2e2d95 -size 308041 +oid sha256:4589c02e9d281b2591dc06f44f73536d64a50880258cf030267338184e238ca5 +size 307634 diff --git a/Content/Blueprints/Enemys/CharacterEnemies/BP_Enemy_Character.uasset b/Content/Blueprints/Enemys/CharacterEnemies/BP_Enemy_Character.uasset index 3516fee..5ad1bb2 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:48ff33840a9b0496850798420efe0fd7cd19e13b4707858f188ea481b050e6c3 -size 145922 +oid sha256:1a67605660e8eb3ee3b2547e78851382539b46d8a4f3b474bd3102e2303c5da3 +size 146300 diff --git a/Content/Blueprints/Items/Basics/BP_PickupItem_OnContact.uasset b/Content/Blueprints/Items/Basics/BP_PickupItem_OnContact.uasset new file mode 100644 index 0000000..e451f2a --- /dev/null +++ b/Content/Blueprints/Items/Basics/BP_PickupItem_OnContact.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:432e716ecbb14dbdd5e886e3a0a6f25eed3aba678a3f15fdd4ba7c4347f9a7e9 +size 63697 diff --git a/Content/Blueprints/Items/Collectables/BP_Collectable.uasset b/Content/Blueprints/Items/Collectables/BP_Collectable.uasset new file mode 100644 index 0000000..193959f --- /dev/null +++ b/Content/Blueprints/Items/Collectables/BP_Collectable.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6f25c5677861d983770e94e23b9a2db7044555e5c9792bbe7e8094278067a5a3 +size 38880 diff --git a/Content/Blueprints/LevelDesign/EventSystem/BP_Event.uasset b/Content/Blueprints/LevelDesign/EventSystem/BP_Event.uasset index f740526..458c78c 100644 --- a/Content/Blueprints/LevelDesign/EventSystem/BP_Event.uasset +++ b/Content/Blueprints/LevelDesign/EventSystem/BP_Event.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:fda277d33c07c8dada0aefe9618e3d728e31c877d309ddf1f38e095a759269c7 -size 392644 +oid sha256:99c984a6a6b72c102a026fb003198ccb54ecb4d948eaffe3246f3b62f3a35ec7 +size 375022 diff --git a/Content/Blueprints/LevelDesign/World/BP_EnemySpawningHut.uasset b/Content/Blueprints/LevelDesign/World/BP_EnemySpawningHut.uasset index f0a0201..45f681f 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:be2a2ff631c0afa6fe4f59ced9cefee7abd31c7943c45d40ebef24f90db99dcb -size 100573 +oid sha256:59db0948914909e366f7fdb69c1df7a5f5212707cd6cadbd54b88d0df3c8875c +size 100015 diff --git a/Content/Blueprints/Player/BP_ThirdPersonCharacter.uasset b/Content/Blueprints/Player/BP_ThirdPersonCharacter.uasset index 24dbcfb..7a47f0c 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:22036ef111385bead0d9c79df8bdec2e8977f8b122252117466e66596072aa1b -size 2170595 +oid sha256:e48f72b00722d7a83b4f91b01844c6594f68921ff61997fc1d09ded494e6a59d +size 2175993 diff --git a/Content/__ExternalActors__/Maps/L_LevelDesignTest/0/DR/8QSS0NJV3HOBH8QSA0HO5H.uasset b/Content/__ExternalActors__/Maps/L_LevelDesignTest/0/DR/8QSS0NJV3HOBH8QSA0HO5H.uasset index 3d8244e..9e1d54e 100644 --- a/Content/__ExternalActors__/Maps/L_LevelDesignTest/0/DR/8QSS0NJV3HOBH8QSA0HO5H.uasset +++ b/Content/__ExternalActors__/Maps/L_LevelDesignTest/0/DR/8QSS0NJV3HOBH8QSA0HO5H.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:65a305a93340bede4dfcf68ff007e8c4fedec1e00af3d6ba3e618f9a13941152 +oid sha256:954ea6758e76e9bbd95fb884a659597f1f9a5bbb5c9a0b04f752c190852e3d96 size 6433 diff --git a/Content/__ExternalActors__/Maps/L_LevelDesignTest/2/3B/NZA6UVVVX6GBR9IEOLB0Q8.uasset b/Content/__ExternalActors__/Maps/L_LevelDesignTest/2/3B/NZA6UVVVX6GBR9IEOLB0Q8.uasset index 2cbf473..697dd7e 100644 --- a/Content/__ExternalActors__/Maps/L_LevelDesignTest/2/3B/NZA6UVVVX6GBR9IEOLB0Q8.uasset +++ b/Content/__ExternalActors__/Maps/L_LevelDesignTest/2/3B/NZA6UVVVX6GBR9IEOLB0Q8.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5222e3b3705bb5fa00c76560b883c564cf54defb330eb4ccbce98dadea053424 -size 9712 +oid sha256:aca8a291f9324f713a664133ece42cf9d8b046bc43fe23be4b28f9453f513dff +size 9619 diff --git a/Content/__ExternalActors__/Maps/L_LevelDesignTest/3/P3/QN1F152O6DMJ9KKIMZNQDA.uasset b/Content/__ExternalActors__/Maps/L_LevelDesignTest/3/P3/QN1F152O6DMJ9KKIMZNQDA.uasset index 034ad1e..1eec345 100644 --- a/Content/__ExternalActors__/Maps/L_LevelDesignTest/3/P3/QN1F152O6DMJ9KKIMZNQDA.uasset +++ b/Content/__ExternalActors__/Maps/L_LevelDesignTest/3/P3/QN1F152O6DMJ9KKIMZNQDA.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0b4b4606632b1d74f2f088e5d2ac30b834f675dfd6560b35892ab77e4ee51f2b +oid sha256:b93377cbf29090b92bcd27d4ccbcb69fcc072ec9fe3a9ee63874116ff3cbd06f size 7970 diff --git a/Content/__ExternalActors__/Maps/L_LevelDesignTest/9/6N/6PF8LOYC9DVNPPFLHMHQ1N.uasset b/Content/__ExternalActors__/Maps/L_LevelDesignTest/9/6N/6PF8LOYC9DVNPPFLHMHQ1N.uasset index 8a77dd6..830801c 100644 --- a/Content/__ExternalActors__/Maps/L_LevelDesignTest/9/6N/6PF8LOYC9DVNPPFLHMHQ1N.uasset +++ b/Content/__ExternalActors__/Maps/L_LevelDesignTest/9/6N/6PF8LOYC9DVNPPFLHMHQ1N.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:21dd7f44fd40d9c655542a5484a51f1da36f38cf4a4a1bb9ea4ae433cdb93bc3 -size 5937 +oid sha256:c68378c0b0539f3830d3afb47ccb730e546e1498f2d34ad22345b83da97aa786 +size 6767 diff --git a/Content/__ExternalActors__/Maps/L_LevelDesignTest/9/U4/SKT4JMWQSRG5QJF7STEOP9.uasset b/Content/__ExternalActors__/Maps/L_LevelDesignTest/9/U4/SKT4JMWQSRG5QJF7STEOP9.uasset index 525b149..22ab592 100644 --- a/Content/__ExternalActors__/Maps/L_LevelDesignTest/9/U4/SKT4JMWQSRG5QJF7STEOP9.uasset +++ b/Content/__ExternalActors__/Maps/L_LevelDesignTest/9/U4/SKT4JMWQSRG5QJF7STEOP9.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:28bdf00ccbf74b70f480c27fc290217665e92c8de35dcfbe6425794ed4052b24 +oid sha256:f48bb75d11aede2a2cd710724c905b6ffe49271508551c73b76768bc192147cb size 7968 diff --git a/Content/__ExternalActors__/Maps/L_LevelDesignTest/9/WR/WK2AE6F5RXHENXTM0039NM.uasset b/Content/__ExternalActors__/Maps/L_LevelDesignTest/9/WR/WK2AE6F5RXHENXTM0039NM.uasset deleted file mode 100644 index 43868fa..0000000 --- a/Content/__ExternalActors__/Maps/L_LevelDesignTest/9/WR/WK2AE6F5RXHENXTM0039NM.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:b50a7b9eabf824442da0c76bc143640bcb149d3c285fd79bc9a6d2d42f8ef3c8 -size 5578 diff --git a/Content/__ExternalActors__/Maps/L_LevelDesignTest/9/ZM/Y4XU0YKY24QE9809CCOD6O.uasset b/Content/__ExternalActors__/Maps/L_LevelDesignTest/9/ZM/Y4XU0YKY24QE9809CCOD6O.uasset new file mode 100644 index 0000000..d8592cb --- /dev/null +++ b/Content/__ExternalActors__/Maps/L_LevelDesignTest/9/ZM/Y4XU0YKY24QE9809CCOD6O.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:175bc93c26a7a2e7d4eb5dd1d8ca91af321f804cf644a2133b35e1b3b0ebe083 +size 5397 diff --git a/Content/__ExternalActors__/Maps/L_LevelDesignTest/C/0S/QAO7JPO7HISZG83QUNIALY.uasset b/Content/__ExternalActors__/Maps/L_LevelDesignTest/C/0S/QAO7JPO7HISZG83QUNIALY.uasset deleted file mode 100644 index 9d69bfe..0000000 --- a/Content/__ExternalActors__/Maps/L_LevelDesignTest/C/0S/QAO7JPO7HISZG83QUNIALY.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e7927615c1aaadfb64fb6a35a32bd8790da933fac97c7c890eabc1d743d9f25d -size 4416 diff --git a/Content/__ExternalActors__/Maps/L_LevelDesignTest/C/E4/GC9ZTE2MAIR2S2PJDTLTMZ.uasset b/Content/__ExternalActors__/Maps/L_LevelDesignTest/C/E4/GC9ZTE2MAIR2S2PJDTLTMZ.uasset new file mode 100644 index 0000000..d1dbcd8 --- /dev/null +++ b/Content/__ExternalActors__/Maps/L_LevelDesignTest/C/E4/GC9ZTE2MAIR2S2PJDTLTMZ.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:73ce6c2b0f9ca68c9499dcd5c16d9d47728dfc351448fb0f094b867dcf95e2dd +size 5144 diff --git a/Content/__ExternalActors__/Maps/L_LevelDesignTest/C/VW/V52COVPGER68N1EJ5P392B.uasset b/Content/__ExternalActors__/Maps/L_LevelDesignTest/C/VW/V52COVPGER68N1EJ5P392B.uasset index 9a11b87..b2854d2 100644 --- a/Content/__ExternalActors__/Maps/L_LevelDesignTest/C/VW/V52COVPGER68N1EJ5P392B.uasset +++ b/Content/__ExternalActors__/Maps/L_LevelDesignTest/C/VW/V52COVPGER68N1EJ5P392B.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:babb29ecacc201498bd82067e5374248c4aa897f4336787dd5eef98e48e57ea3 +oid sha256:c9e062c3050a7aaee60fff33b74bfd1f655af8b97c606fbce9a9788d792cb76d size 6439 diff --git a/Content/__ExternalActors__/Maps/L_LevelDesignTest/D/BS/I28R99HH3FIWYRE69RY5MN.uasset b/Content/__ExternalActors__/Maps/L_LevelDesignTest/D/BS/I28R99HH3FIWYRE69RY5MN.uasset index c6bc4be..c431b34 100644 --- a/Content/__ExternalActors__/Maps/L_LevelDesignTest/D/BS/I28R99HH3FIWYRE69RY5MN.uasset +++ b/Content/__ExternalActors__/Maps/L_LevelDesignTest/D/BS/I28R99HH3FIWYRE69RY5MN.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:fff5ec87cf54b92fa5749fe77f046ef4d4364403ab56e522d581da8a317f079d +oid sha256:4234b3298ff9897aa24a106a0adc88acae02f03425fbc366f786b9c631d27253 size 3899