diff --git a/Config/DefaultEngine.ini b/Config/DefaultEngine.ini index e3dcf88..92e270d 100644 --- a/Config/DefaultEngine.ini +++ b/Config/DefaultEngine.ini @@ -2,8 +2,8 @@ GameName=CapstoneTest [/Script/EngineSettings.GameMapsSettings] -EditorStartupMap=/Game/Maps/L_LevelTest.L_LevelTest -GameDefaultMap=/Game/Maps/L_LevelTest.L_LevelTest +EditorStartupMap=/Game/Maps/L_BunkerDemo.L_BunkerDemo +GameDefaultMap=/Game/Maps/L_Title.L_Title TransitionMap= bUseSplitscreen=True TwoPlayerSplitscreenLayout=Horizontal diff --git a/Content/Blueprints/BP_GameController.uasset b/Content/Blueprints/BP_GameController.uasset index 7fbc604..43f055a 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:801ab9f2698a9b2c3615e1bd333c6b94361983f3bc0aa136d588c4ed205f2652 -size 2530226 +oid sha256:b1ed035b26d006443362285cea0dd54830b6d6ed64da11ade74e55839dda35eb +size 2481992 diff --git a/Content/Blueprints/Enemys/BP_BossEnemy.uasset b/Content/Blueprints/Enemys/BP_BossEnemy.uasset index db35d0f..2fc922a 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:10cc6a7e347f660d6ce6236d8794722e882758d00e0cb155713cd9d333e38b64 -size 463180 +oid sha256:c0d89b5cd6d9d05dc8ff1073303febe29c7f62d48bcf8ff4088e4c3c9c3cf50f +size 483737 diff --git a/Content/Blueprints/Enemys/BP_IntermediateEnemy_Missile.uasset b/Content/Blueprints/Enemys/BP_IntermediateEnemy_Missile.uasset index ee8a8ad..86e022f 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:6bb226009a496eb284aa236d6d2277dd830bda57b50163b49761a20943b0e7ba -size 298392 +oid sha256:6d29000d3ddf214a7b550a08d98e7d7928ee9cbc58f63fa973ac668ad793ced8 +size 296378 diff --git a/Content/Blueprints/Enemys/Basics/BP_Enemy_Base.uasset b/Content/Blueprints/Enemys/Basics/BP_Enemy_Base.uasset index f2684bd..e0b8e32 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:18b0232e5f731e77d2505384e47d1d66af330e09a7578edab200e967deeb9cf1 -size 629013 +oid sha256:712e7ba6b7520805dac05d2790a6d7048e54dce70519f4b47ab81d4dd5cad994 +size 629551 diff --git a/Content/Blueprints/LevelDesign/EventSystem/BP_Event.uasset b/Content/Blueprints/LevelDesign/EventSystem/BP_Event.uasset index 378117a..6851e92 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:770be8ca5f24053f59a42dbe35a724778da1cb2d0c381d3e23f26540177e1e8e -size 482470 +oid sha256:2736497bcc50080ddc3c57c6c2095c3e67515ca8a1f082f5475f3090be8bdfdb +size 571699 diff --git a/Content/Blueprints/LevelDesign/EventSystem/EventStruct.uasset b/Content/Blueprints/LevelDesign/EventSystem/EventStruct.uasset index 3216da9..1eea283 100644 --- a/Content/Blueprints/LevelDesign/EventSystem/EventStruct.uasset +++ b/Content/Blueprints/LevelDesign/EventSystem/EventStruct.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:75c3460dc7122575bc82d655ab7098b94eb83b0595a06689c42bc68dbb859d06 -size 20259 +oid sha256:a192ebbdd1d981a351b144684a004ed070a2687ed7e90cf71d46cd7cad5cabd4 +size 23025 diff --git a/Content/Blueprints/LevelDesign/EventSystem/StageLights/Enum_StageLights.uasset b/Content/Blueprints/LevelDesign/EventSystem/StageLights/Enum_StageLights.uasset new file mode 100644 index 0000000..a652dd4 --- /dev/null +++ b/Content/Blueprints/LevelDesign/EventSystem/StageLights/Enum_StageLights.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e383274ba8103be9b71b929027c130604059c0ffb08ba3d6edf7d3b1eb13f1c1 +size 2497 diff --git a/Content/Blueprints/LevelDesign/EventSystem/StageLights/EventStruct_StageLights.uasset b/Content/Blueprints/LevelDesign/EventSystem/StageLights/EventStruct_StageLights.uasset new file mode 100644 index 0000000..de9c40b --- /dev/null +++ b/Content/Blueprints/LevelDesign/EventSystem/StageLights/EventStruct_StageLights.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ba900b5ee5dcc52e90e42837a4397710e76508b75104fdf29c738c54408c18cd +size 5469 diff --git a/Content/Blueprints/LevelDesign/EventSystem/UI/Enum_UI.uasset b/Content/Blueprints/LevelDesign/EventSystem/UI/Enum_UI.uasset new file mode 100644 index 0000000..0176f2d --- /dev/null +++ b/Content/Blueprints/LevelDesign/EventSystem/UI/Enum_UI.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:bfc81f4766b9c38905e50323a4b7143750cde0733a0c6eadf855f8b5dcc2daa2 +size 2347 diff --git a/Content/Blueprints/LevelDesign/EventSystem/UI/EventStruct_UI.uasset b/Content/Blueprints/LevelDesign/EventSystem/UI/EventStruct_UI.uasset new file mode 100644 index 0000000..9f1c6aa --- /dev/null +++ b/Content/Blueprints/LevelDesign/EventSystem/UI/EventStruct_UI.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6eccaed0ef5a7d9a045ee60be81e839856ff1241e3e22e8c34418b99ed45b8c8 +size 5328 diff --git a/Content/Blueprints/LevelDesign/Msc/AC_EnemySpawning.uasset b/Content/Blueprints/LevelDesign/Msc/AC_EnemySpawning.uasset index 86b4db8..6985f42 100644 --- a/Content/Blueprints/LevelDesign/Msc/AC_EnemySpawning.uasset +++ b/Content/Blueprints/LevelDesign/Msc/AC_EnemySpawning.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3cbf90bab64d3786f27869b98c99de324cfe96d33c978819208ebe0e5765791e -size 377515 +oid sha256:16128a935ab353519cff14b28dd56377fe6dca0c39490da98df4c1867b528a0f +size 402038 diff --git a/Content/Blueprints/LevelDesign/World/BP_EnemySpawner.uasset b/Content/Blueprints/LevelDesign/World/BP_EnemySpawner.uasset index c6ec947..b155a76 100644 --- a/Content/Blueprints/LevelDesign/World/BP_EnemySpawner.uasset +++ b/Content/Blueprints/LevelDesign/World/BP_EnemySpawner.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:08b4990e6b38684c8e0f54709d2d99389150289b053e9205b55688baca51ab3f -size 47938 +oid sha256:da146a7ea3a20ee55b344e35c5f8d46c456cc56c7a12e5a4518cf8dff4656373 +size 46930 diff --git a/Content/Blueprints/LevelDesign/World/BP_EnemySpawningHut.uasset b/Content/Blueprints/LevelDesign/World/BP_EnemySpawningHut.uasset index 1b5eb57..368c10f 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:22ca9054fb62067fca977a12e149dd2f596de715aa83baf32e87e2ea4d48575a -size 149427 +oid sha256:406503a30d796573cb59f70629d686683efbb32bf75a93f3fd0c18bc0271d50e +size 149186 diff --git a/Content/Blueprints/LevelDesign/World/BP_ExplodingBarrel.uasset b/Content/Blueprints/LevelDesign/World/BP_ExplodingBarrel.uasset index 6dd0834..970b27c 100644 --- a/Content/Blueprints/LevelDesign/World/BP_ExplodingBarrel.uasset +++ b/Content/Blueprints/LevelDesign/World/BP_ExplodingBarrel.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e35fa19923402c5a043bc30704af1b17a800b124f9c737ca4e74346baa892ddb -size 256641 +oid sha256:21099deff1a7c1b69f05b1a570ba2263769c28ce317a84254ceedfe182396895 +size 254394 diff --git a/Content/Blueprints/LevelDesign/World/BP_Interact.uasset b/Content/Blueprints/LevelDesign/World/BP_Interact.uasset index cacf507..79a7215 100644 --- a/Content/Blueprints/LevelDesign/World/BP_Interact.uasset +++ b/Content/Blueprints/LevelDesign/World/BP_Interact.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a39d449915a2a30b0a235a4f603373a1ef95dba3d6299c88b7c280b60f387bf8 -size 97366 +oid sha256:495c341a1a176253fa8cd64137eeef501e46002a23e5957b1d1200a4b54300e7 +size 96376 diff --git a/Content/Blueprints/SaveGame/BP_SaveGame.uasset b/Content/Blueprints/SaveGame/BP_SaveGame.uasset index d378840..8793c0a 100644 --- a/Content/Blueprints/SaveGame/BP_SaveGame.uasset +++ b/Content/Blueprints/SaveGame/BP_SaveGame.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8af8ac671f4884ebb88f848dd9f167a713284323d73ada90fedc4e140b4d700b -size 49096 +oid sha256:59d6a59dfe78a0efbc03949e303313a0ebd685d08d88cc20201cb9a9c622a8c3 +size 48808 diff --git a/Content/Blueprints/SaveGame/World/WorldSaveStruct.uasset b/Content/Blueprints/SaveGame/World/WorldSaveStruct.uasset index 6a31827..29f44ea 100644 --- a/Content/Blueprints/SaveGame/World/WorldSaveStruct.uasset +++ b/Content/Blueprints/SaveGame/World/WorldSaveStruct.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6041b39ea20760ac570ed8f41b10cfe81eb7a681a70765110890351f815f602d +oid sha256:1344706fd7bb9ec64b5e65c9dd585fc15414a2b2ae6824b4570ba4c5d8d4ffd2 size 11323 diff --git a/Content/Blueprints/SaveGame/World/WorldSaveStruct_Interactables.uasset b/Content/Blueprints/SaveGame/World/WorldSaveStruct_Interactables.uasset index d488798..e33ce30 100644 --- a/Content/Blueprints/SaveGame/World/WorldSaveStruct_Interactables.uasset +++ b/Content/Blueprints/SaveGame/World/WorldSaveStruct_Interactables.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:39dca4d536449b4fffcd6358026a25b7f5c303e1ea79bbd606ddbcdc924097b5 +oid sha256:fb90602bb06a53fdc4d71b32f9fa8a3e26e38221d495f784be06fc8fc03496cf size 8801 diff --git a/Content/Blueprints/VFX/StageLights/BP_LightRig.uasset b/Content/Blueprints/VFX/StageLights/BP_LightRig.uasset index ec2349e..6d2200a 100644 --- a/Content/Blueprints/VFX/StageLights/BP_LightRig.uasset +++ b/Content/Blueprints/VFX/StageLights/BP_LightRig.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e7e8a58f3776a0cf64969509dd917bccc3fb8adbc34f5f42bf7ba993e868a5b9 -size 908171 +oid sha256:e213783267f0e1c42af9bf63de526138fa97aef4956ca413c63af4e51a211ce1 +size 908438 diff --git a/Content/Maps/L_BunkerDemo.umap b/Content/Maps/L_BunkerDemo.umap index 59b63af..785d685 100644 Binary files a/Content/Maps/L_BunkerDemo.umap and b/Content/Maps/L_BunkerDemo.umap differ diff --git a/Content/UI/WB_BossHealthBar.uasset b/Content/UI/WB_BossHealthBar.uasset index 943869a..be2eafb 100644 --- a/Content/UI/WB_BossHealthBar.uasset +++ b/Content/UI/WB_BossHealthBar.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:93b77d79bbb53f42c80d271cb1bd7dc9ea56027bd34086860aad018deb662bd6 -size 65391 +oid sha256:f2202f25cbe0969cfc81e329457f9ab9b341730f3feb25f54a82579a4ca3e503 +size 64777 diff --git a/Content/UI/WB_TutorialPrompt.uasset b/Content/UI/WB_TutorialPrompt.uasset new file mode 100644 index 0000000..2b2d0be --- /dev/null +++ b/Content/UI/WB_TutorialPrompt.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3023164288b51f83aef814208e1627bc2eea188e7a94fec8f63d4eafcf9bc55b +size 146794 diff --git a/Content/UI/WB_UI.uasset b/Content/UI/WB_UI.uasset index b724d7a..832bbe2 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:fcf289e34a06ef568c90829b65af086941ac16059db1a164054e0d220f0d9336 -size 483171 +oid sha256:251fd6c4432c801a65c7f692475e2371e07e0f73ab549e17fcba4a6f3bbf6117 +size 488745