diff --git a/Content/Audio/Music/Level2/Minigames/SW_Minigame_RythmClick.uasset b/Content/Audio/Music/Level2/Minigames/SW_Minigame_RythmClick.uasset deleted file mode 100644 index 01a4af7..0000000 --- a/Content/Audio/Music/Level2/Minigames/SW_Minigame_RythmClick.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:1bd6ee30f0355d0921fc0d75acbd09c95844ceb3e951b7e9d69a1bbc0f1c09bb -size 7428784 diff --git a/Content/Audio/Music/Minigames/SW_Minigame_RythmClick.uasset b/Content/Audio/Music/Minigames/SW_Minigame_RythmClick.uasset new file mode 100644 index 0000000..a32b43b --- /dev/null +++ b/Content/Audio/Music/Minigames/SW_Minigame_RythmClick.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:76f3fa2ae8f6d4389b6a1daf56df1fcb27b61e60590c9096d2d9119dce709728 +size 7376077 diff --git a/Content/Blueprints/BP_CustomGameInstance.uasset b/Content/Blueprints/BP_CustomGameInstance.uasset index 005913a..44e8aed 100644 --- a/Content/Blueprints/BP_CustomGameInstance.uasset +++ b/Content/Blueprints/BP_CustomGameInstance.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0de06017dc169ae344130998119b1fef2cea5199f48e6e024474df02958eb1dd -size 6180 +oid sha256:600a48eed92b2dea4f31a9cd1affdfd72a60b5704ea47a6382db5c23b78f5135 +size 6291 diff --git a/Content/Blueprints/Characters/BP_Player.uasset b/Content/Blueprints/Characters/BP_Player.uasset index 3c8986a..1745f1d 100644 --- a/Content/Blueprints/Characters/BP_Player.uasset +++ b/Content/Blueprints/Characters/BP_Player.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0f118ff9fd868cc3d2abea7974208e24e16af5b2d403987ebed4c536311184b4 -size 491100 +oid sha256:65401d20c2bdd7a90f808492cb9fc7ffae46c67dc88e6eb46716c7a8dd1966da +size 491639 diff --git a/Content/Blueprints/Characters/StealthGuard/BP_StealthGuardAIController.uasset b/Content/Blueprints/Characters/StealthGuard/BP_StealthGuardAIController.uasset index 924b1ec..9c19083 100644 --- a/Content/Blueprints/Characters/StealthGuard/BP_StealthGuardAIController.uasset +++ b/Content/Blueprints/Characters/StealthGuard/BP_StealthGuardAIController.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:af8820e0affd49c3bb69483e0c4a3701152e2424bd520c6b957015b974834cb0 -size 74724 +oid sha256:48861b7bdfd09fc89800d6ecd463a4c5623580e6682f89a5f5f4834574822351 +size 87236 diff --git a/Content/Blueprints/Minigames/AgeOfWar/BP_Minigame_AgeOfWar.uasset b/Content/Blueprints/Minigames/AgeOfWar/BP_Minigame_AgeOfWar.uasset new file mode 100644 index 0000000..8a5cdf5 --- /dev/null +++ b/Content/Blueprints/Minigames/AgeOfWar/BP_Minigame_AgeOfWar.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:921cf84b1441404bc14b1def272a6ffcb75a515f2f3a45facbff5966a7fcb3f8 +size 22822 diff --git a/Content/Blueprints/Minigames/CrossyRoad/BP_Minigame_CrossyRoadManager.uasset b/Content/Blueprints/Minigames/CrossyRoad/BP_Minigame_CrossyRoadManager.uasset new file mode 100644 index 0000000..434b396 --- /dev/null +++ b/Content/Blueprints/Minigames/CrossyRoad/BP_Minigame_CrossyRoadManager.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2984ab03af8fe924be881f88d9e94170a2d13018fc85161423a594118aa99677 +size 23045 diff --git a/Content/Blueprints/Minigames/Fishing/BP_Minigame_FishingManager.uasset b/Content/Blueprints/Minigames/Fishing/BP_Minigame_FishingManager.uasset new file mode 100644 index 0000000..04534e0 --- /dev/null +++ b/Content/Blueprints/Minigames/Fishing/BP_Minigame_FishingManager.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2def02a7252bff3fa56d9c4a82fbbe9d7f586fb2ea3342830c2bb3c7d714eeee +size 105032 diff --git a/Content/Blueprints/Minigames/Fishing/UI_Minigame_Fishing.uasset b/Content/Blueprints/Minigames/Fishing/UI_Minigame_Fishing.uasset new file mode 100644 index 0000000..1d37b2f --- /dev/null +++ b/Content/Blueprints/Minigames/Fishing/UI_Minigame_Fishing.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6d0121c429a620566714ef042233852ca244bd607e6232a574f646a526f04c41 +size 495101 diff --git a/Content/Blueprints/Minigames/RythmClick/BP_Minigame_RythmClickManager.uasset b/Content/Blueprints/Minigames/RythmClick/BP_Minigame_RythmClickManager.uasset new file mode 100644 index 0000000..c371a8b --- /dev/null +++ b/Content/Blueprints/Minigames/RythmClick/BP_Minigame_RythmClickManager.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5f267ba1f4ef5f72ddc44a67bfbe4a0879c1f77076b5c0d1c1738957f3d34b3a +size 67082 diff --git a/Content/Blueprints/Minigames/RythmClick/UI/Textures/T_Minigame_RuthmClick_Button.uasset b/Content/Blueprints/Minigames/RythmClick/UI/Textures/T_Minigame_RuthmClick_Button.uasset deleted file mode 100644 index bbdf965..0000000 --- a/Content/Blueprints/Minigames/RythmClick/UI/Textures/T_Minigame_RuthmClick_Button.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:4efd405f5c81799a2f88aa4c252953544ecaa050395b7d6b187293db1f1c0876 -size 18641 diff --git a/Content/Blueprints/Minigames/RythmClick/UI/Textures/T_Minigame_RuthmClick_ButtonBorder.uasset b/Content/Blueprints/Minigames/RythmClick/UI/Textures/T_Minigame_RuthmClick_ButtonBorder.uasset deleted file mode 100644 index a067c6a..0000000 --- a/Content/Blueprints/Minigames/RythmClick/UI/Textures/T_Minigame_RuthmClick_ButtonBorder.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:eee7e0a5f62d39cd8a1fc7d44b5dc6c90325b5e5a0ec9b8bcd80660773ec406e -size 23580 diff --git a/Content/Blueprints/Minigames/RythmClick/UI/UIC_Minigame_RythmClick_Button.uasset b/Content/Blueprints/Minigames/RythmClick/UI/UIC_Minigame_RythmClick_Button.uasset deleted file mode 100644 index 1b22552..0000000 --- a/Content/Blueprints/Minigames/RythmClick/UI/UIC_Minigame_RythmClick_Button.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d88eee3ac5ad7073bea4c96021a637754f6516ee8585b66fb959e286f508b618 -size 37745 diff --git a/Content/Blueprints/Minigames/RythmClick/UI/UI_Minigame_RythmClick_Canvas.uasset b/Content/Blueprints/Minigames/RythmClick/UI/UI_Minigame_RythmClick_Canvas.uasset deleted file mode 100644 index 67dd672..0000000 --- a/Content/Blueprints/Minigames/RythmClick/UI/UI_Minigame_RythmClick_Canvas.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:fa9db88ef228ad70a97b6a5e52f7f16890b7e6bc74f22bb98ef6ae4c29e399fa -size 39106 diff --git a/Content/Blueprints/Minigames/RythmClick/UIC_Minigame_RythmClickButton.uasset b/Content/Blueprints/Minigames/RythmClick/UIC_Minigame_RythmClickButton.uasset new file mode 100644 index 0000000..a972c64 --- /dev/null +++ b/Content/Blueprints/Minigames/RythmClick/UIC_Minigame_RythmClickButton.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a90f2e194848e2aeabe1476bf66c531e909fd915fe7db13695632fd8ea1ad5f5 +size 248722 diff --git a/Content/Blueprints/Minigames/RythmClick/UI_Minigame_RythmClickCanvas.uasset b/Content/Blueprints/Minigames/RythmClick/UI_Minigame_RythmClickCanvas.uasset new file mode 100644 index 0000000..72aed6b --- /dev/null +++ b/Content/Blueprints/Minigames/RythmClick/UI_Minigame_RythmClickCanvas.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:113d1e52f6d9aeebb1a082226fdbbfd7cc0f096f2ab26d87c2b2de4f4133bbf3 +size 140049 diff --git a/Content/Blueprints/Minigames/SubwaySurf/BP_Minigame_SubwaySurfManager.uasset b/Content/Blueprints/Minigames/SubwaySurf/BP_Minigame_SubwaySurfManager.uasset new file mode 100644 index 0000000..01bbf81 --- /dev/null +++ b/Content/Blueprints/Minigames/SubwaySurf/BP_Minigame_SubwaySurfManager.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d64d8cc33d3db551fe17efc28db64f8d8b0ca7e1cea1c1da54b10486a4d61595 +size 36767 diff --git a/Content/Blueprints/Minigames/SubwaySurf/BP_Minigame_SubwaySurf_ObstacleBig.uasset b/Content/Blueprints/Minigames/SubwaySurf/BP_Minigame_SubwaySurf_ObstacleBig.uasset new file mode 100644 index 0000000..f3b7a0b --- /dev/null +++ b/Content/Blueprints/Minigames/SubwaySurf/BP_Minigame_SubwaySurf_ObstacleBig.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:738df64d0db94d2a115ef058c53d98a210d0de5db12e49b0ef55212438b33ea7 +size 42457 diff --git a/Content/Blueprints/Minigames/SubwaySurf/BP_Minigame_SubwaySurf_ObstacleHigh.uasset b/Content/Blueprints/Minigames/SubwaySurf/BP_Minigame_SubwaySurf_ObstacleHigh.uasset new file mode 100644 index 0000000..884aded --- /dev/null +++ b/Content/Blueprints/Minigames/SubwaySurf/BP_Minigame_SubwaySurf_ObstacleHigh.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3a0194935f0b0fc2b2bf1a3fdda83e0d70d0b460d76c75de5ec9794697b80f56 +size 43013 diff --git a/Content/Blueprints/Minigames/SubwaySurf/BP_Minigame_SubwaySurf_ObstacleLow.uasset b/Content/Blueprints/Minigames/SubwaySurf/BP_Minigame_SubwaySurf_ObstacleLow.uasset new file mode 100644 index 0000000..175b227 --- /dev/null +++ b/Content/Blueprints/Minigames/SubwaySurf/BP_Minigame_SubwaySurf_ObstacleLow.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f0d04bc593955f70fe21b252d2638828adde995929858cc5df6bf2384fa571c5 +size 42908 diff --git a/Content/Blueprints/Minigames/SubwaySurf/BP_SubwaySurf_Manager.uasset b/Content/Blueprints/Minigames/SubwaySurf/BP_SubwaySurf_Manager.uasset deleted file mode 100644 index 93d9a17..0000000 --- a/Content/Blueprints/Minigames/SubwaySurf/BP_SubwaySurf_Manager.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:776d26d43766cb7a5e99cdd53a42313fbb5b5cbd5ee7d0c3ee5bb7c758b5d769 -size 36576 diff --git a/Content/Blueprints/Minigames/SubwaySurf/BP_SubwaySurf_ObstacleBig.uasset b/Content/Blueprints/Minigames/SubwaySurf/BP_SubwaySurf_ObstacleBig.uasset deleted file mode 100644 index bdef5fc..0000000 --- a/Content/Blueprints/Minigames/SubwaySurf/BP_SubwaySurf_ObstacleBig.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:c427a7a24a284e9a25b16262da1b76ea8e637d11e14911b54eb67ad0538c2eb6 -size 42292 diff --git a/Content/Blueprints/Minigames/SubwaySurf/BP_SubwaySurf_ObstacleHigh.uasset b/Content/Blueprints/Minigames/SubwaySurf/BP_SubwaySurf_ObstacleHigh.uasset deleted file mode 100644 index 0f70e61..0000000 --- a/Content/Blueprints/Minigames/SubwaySurf/BP_SubwaySurf_ObstacleHigh.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:5f7c288ec878cca02af3530d7b426faa49f05ef0a42ef49ebbe3ca49845c704b -size 42848 diff --git a/Content/Blueprints/Minigames/SubwaySurf/BP_SubwaySurf_ObstacleLow.uasset b/Content/Blueprints/Minigames/SubwaySurf/BP_SubwaySurf_ObstacleLow.uasset deleted file mode 100644 index 0092d02..0000000 --- a/Content/Blueprints/Minigames/SubwaySurf/BP_SubwaySurf_ObstacleLow.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:cb7017f962a6701ff0c21bb1e96326d8a658f51137d785a01b4070a6d4bcf842 -size 42743 diff --git a/Content/Input/Minigame/Actions/IA_Minigame_Fishing.uasset b/Content/Input/Minigame/Actions/IA_Minigame_Fishing.uasset new file mode 100644 index 0000000..cc0dd01 --- /dev/null +++ b/Content/Input/Minigame/Actions/IA_Minigame_Fishing.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:66fb2f3f849d58738cd98bf2a0d62d4504f8b5b3dbb83765b5f8851cc9037359 +size 1811 diff --git a/Content/Input/Minigame/Actions/IA_Minigame_SubwaySurf_Down.uasset b/Content/Input/Minigame/Actions/IA_Minigame_SubwaySurf_Down.uasset new file mode 100644 index 0000000..666d667 --- /dev/null +++ b/Content/Input/Minigame/Actions/IA_Minigame_SubwaySurf_Down.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4705eb236862b3377e2cc97f3eb4438fa77cf7b7d90524e92f3e4cf154229aff +size 2198 diff --git a/Content/Input/Minigame/Actions/IA_Minigame_SubwaySurf_Left.uasset b/Content/Input/Minigame/Actions/IA_Minigame_SubwaySurf_Left.uasset new file mode 100644 index 0000000..9689e67 --- /dev/null +++ b/Content/Input/Minigame/Actions/IA_Minigame_SubwaySurf_Left.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2c05f7239577603b32f00053f23376bc134d350d03478393b13acd318ec53bc3 +size 2198 diff --git a/Content/Input/Minigame/Actions/IA_Minigame_SubwaySurf_Right.uasset b/Content/Input/Minigame/Actions/IA_Minigame_SubwaySurf_Right.uasset new file mode 100644 index 0000000..b04c64e --- /dev/null +++ b/Content/Input/Minigame/Actions/IA_Minigame_SubwaySurf_Right.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a2f2f94ec6fff94be141264c79c759c53c8158de814eb66a3df5d0fbac8e6488 +size 2207 diff --git a/Content/Input/Minigame/Actions/IA_Minigame_SubwaySurf_Up.uasset b/Content/Input/Minigame/Actions/IA_Minigame_SubwaySurf_Up.uasset new file mode 100644 index 0000000..7cb3e25 --- /dev/null +++ b/Content/Input/Minigame/Actions/IA_Minigame_SubwaySurf_Up.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4aaac36b1b70a5ff8ec4f6853e7e526980d2db8684e0dbe93da32e49afc7ba7a +size 2180 diff --git a/Content/Input/Minigame/Actions/IA_SubwaySurf_Down.uasset b/Content/Input/Minigame/Actions/IA_SubwaySurf_Down.uasset deleted file mode 100644 index beed083..0000000 Binary files a/Content/Input/Minigame/Actions/IA_SubwaySurf_Down.uasset and /dev/null differ diff --git a/Content/Input/Minigame/Actions/IA_SubwaySurf_Left.uasset b/Content/Input/Minigame/Actions/IA_SubwaySurf_Left.uasset deleted file mode 100644 index edfdc20..0000000 Binary files a/Content/Input/Minigame/Actions/IA_SubwaySurf_Left.uasset and /dev/null differ diff --git a/Content/Input/Minigame/Actions/IA_SubwaySurf_Right.uasset b/Content/Input/Minigame/Actions/IA_SubwaySurf_Right.uasset deleted file mode 100644 index c099ad0..0000000 Binary files a/Content/Input/Minigame/Actions/IA_SubwaySurf_Right.uasset and /dev/null differ diff --git a/Content/Input/Minigame/Actions/IA_SubwaySurf_Up.uasset b/Content/Input/Minigame/Actions/IA_SubwaySurf_Up.uasset deleted file mode 100644 index bdfe5e3..0000000 Binary files a/Content/Input/Minigame/Actions/IA_SubwaySurf_Up.uasset and /dev/null differ diff --git a/Content/Input/Minigame/IMC_Minigame_Fishing.uasset b/Content/Input/Minigame/IMC_Minigame_Fishing.uasset new file mode 100644 index 0000000..18cc9cc --- /dev/null +++ b/Content/Input/Minigame/IMC_Minigame_Fishing.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ef085e9aefd6187b4db27c0682d3758d7efd0b8490bdac5f0b0e2c4a1283fc8e +size 2891 diff --git a/Content/Input/Minigame/IMC_Minigame_SubwaySurf.uasset b/Content/Input/Minigame/IMC_Minigame_SubwaySurf.uasset new file mode 100644 index 0000000..5d7bbea --- /dev/null +++ b/Content/Input/Minigame/IMC_Minigame_SubwaySurf.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6d7144e86f63dbd76b453fe8cdc83a96728830ac4486d0ddf7d87165d2139ac3 +size 5036 diff --git a/Content/Input/Minigame/IMC_SubwaySurf.uasset b/Content/Input/Minigame/IMC_SubwaySurf.uasset deleted file mode 100644 index 29a4864..0000000 Binary files a/Content/Input/Minigame/IMC_SubwaySurf.uasset and /dev/null differ diff --git a/Content/Levels/Test/Actors/CutsceneTest/BP_Test_CutsceneMultiple.uasset b/Content/Levels/Test/Actors/CutsceneTest/BP_Test_CutsceneMultiple.uasset index d3b9413..4ec665a 100644 --- a/Content/Levels/Test/Actors/CutsceneTest/BP_Test_CutsceneMultiple.uasset +++ b/Content/Levels/Test/Actors/CutsceneTest/BP_Test_CutsceneMultiple.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6edfdf50b78e28f1baa750b13088fd8c23418f63aa088964f0fbf988c8ee4547 -size 58926 +oid sha256:8a5985adb1cdaa3637e14156e492d7fe6c3ace823903bf1ab296d05a30b4ffdd +size 60433 diff --git a/Content/Levels/Test/Actors/CutsceneTest/BP_Test_CutsceneSingle.uasset b/Content/Levels/Test/Actors/CutsceneTest/BP_Test_CutsceneSingle.uasset index a5dcfee..489c795 100644 --- a/Content/Levels/Test/Actors/CutsceneTest/BP_Test_CutsceneSingle.uasset +++ b/Content/Levels/Test/Actors/CutsceneTest/BP_Test_CutsceneSingle.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ba179a3b4e6be96cf310b37a1438592df2c0a2a3a82212460110ae4f0a16162f -size 53448 +oid sha256:20f0dcd7a2c7e3341213a26ff8aa28500f374ad295a3bd878e4f9f12f7ed0f3c +size 54150 diff --git a/Content/Levels/Test/Actors/Minigame/BP_Test_AgeOfWar.uasset b/Content/Levels/Test/Actors/Minigame/BP_Test_AgeOfWar.uasset new file mode 100644 index 0000000..0814872 --- /dev/null +++ b/Content/Levels/Test/Actors/Minigame/BP_Test_AgeOfWar.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:cae293633cb67098d9bf39d8efd55324dbe2b300001438829ee7abeeec916347 +size 32662 diff --git a/Content/Levels/Test/Actors/Minigame/BP_Test_CrossyRoad.uasset b/Content/Levels/Test/Actors/Minigame/BP_Test_CrossyRoad.uasset new file mode 100644 index 0000000..7e0dadb --- /dev/null +++ b/Content/Levels/Test/Actors/Minigame/BP_Test_CrossyRoad.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1de8241d54ca7d81dc4637201975e3376b16e93df90f4418350bd5a50dddf0bd +size 32698 diff --git a/Content/Levels/Test/L_Test.umap b/Content/Levels/Test/L_Test.umap index 19cce39..9f672ea 100644 --- a/Content/Levels/Test/L_Test.umap +++ b/Content/Levels/Test/L_Test.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:bee5982cdfa964c07d50869118ba2fc8b0152b51e9728ce695e4f4d9e86545bf -size 2141963 +oid sha256:433090460cc57acfafc50ada4b1124657d6a58cb9fd4414050cd8aebcc236f22 +size 2238202 diff --git a/Content/UI/Blueprints/MainMenu/UI_MainMenu.uasset b/Content/UI/Blueprints/MainMenu/UI_MainMenu.uasset index 4bf486e..e12c690 100644 --- a/Content/UI/Blueprints/MainMenu/UI_MainMenu.uasset +++ b/Content/UI/Blueprints/MainMenu/UI_MainMenu.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f318670de51ba318ca39b287f167d8b18c6d4bb6a0e09dc3ebe8e03c8ceb6481 -size 175855 +oid sha256:a4828fea25aee37109fdcb3461fbbd6461bcd59ba8819809d79c88383734b883 +size 172743 diff --git a/Content/UI/Blueprints/Overlays/UI_Crosshair.uasset b/Content/UI/Blueprints/Overlays/UI_Crosshair.uasset index 3d11d25..259987b 100644 Binary files a/Content/UI/Blueprints/Overlays/UI_Crosshair.uasset and b/Content/UI/Blueprints/Overlays/UI_Crosshair.uasset differ diff --git a/Plugins/FMODStudio/Binaries/Win64/UnrealEditor-FMODStudio.dll b/Plugins/FMODStudio/Binaries/Win64/UnrealEditor-FMODStudio.dll index 7cc2365..2de9b36 100644 --- a/Plugins/FMODStudio/Binaries/Win64/UnrealEditor-FMODStudio.dll +++ b/Plugins/FMODStudio/Binaries/Win64/UnrealEditor-FMODStudio.dll @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ed34273f38c1975857c0ba80e51f2d563db354bb8c1879832afe63e83be3cd2d -size 863232 +oid sha256:803e28e92d9849384fb3bd65583e1076f7f30c619755123a7f688958ee79e97c +size 862720 diff --git a/Plugins/FMODStudio/Binaries/Win64/UnrealEditor-FMODStudio.pdb b/Plugins/FMODStudio/Binaries/Win64/UnrealEditor-FMODStudio.pdb index c3ea015..15a3d38 100644 --- a/Plugins/FMODStudio/Binaries/Win64/UnrealEditor-FMODStudio.pdb +++ b/Plugins/FMODStudio/Binaries/Win64/UnrealEditor-FMODStudio.pdb @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:edd333d26226596363e502e4478f06193ee357cec19c055b6e85c31fe65d4949 -size 35491840 +oid sha256:151d329b0436c796b36c32d9c95d91f251f7f2fe4b8c7571b8aab0dc0c51fa90 +size 35295232 diff --git a/Plugins/FMODStudio/Binaries/Win64/UnrealEditor-FMODStudioEditor.dll b/Plugins/FMODStudio/Binaries/Win64/UnrealEditor-FMODStudioEditor.dll index 8933d83..c69ade1 100644 --- a/Plugins/FMODStudio/Binaries/Win64/UnrealEditor-FMODStudioEditor.dll +++ b/Plugins/FMODStudio/Binaries/Win64/UnrealEditor-FMODStudioEditor.dll @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:bcad0eb57f807da98c29312d6db54fbefb5fd9884688172baaff2434b971ced9 -size 1047552 +oid sha256:22c10299585d2e4db1de53f71c98c4904321e70390f5151e3e83de5dbf076d49 +size 1045504 diff --git a/Plugins/FMODStudio/Binaries/Win64/UnrealEditor-FMODStudioEditor.pdb b/Plugins/FMODStudio/Binaries/Win64/UnrealEditor-FMODStudioEditor.pdb index 6dbe4e1..672b19d 100644 --- a/Plugins/FMODStudio/Binaries/Win64/UnrealEditor-FMODStudioEditor.pdb +++ b/Plugins/FMODStudio/Binaries/Win64/UnrealEditor-FMODStudioEditor.pdb @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ab2c6770c2042b22842bd008a7189567db9f8654bb1ea7bb5c530cd7883db166 -size 45625344 +oid sha256:1d92ef22bca850ddd1ad620d911e1bcce33d8ddc44480e35d74ec460f14722df +size 45461504 diff --git a/Plugins/FMODStudioNiagara/Binaries/Win64/UnrealEditor-FMODStudioNiagara.dll b/Plugins/FMODStudioNiagara/Binaries/Win64/UnrealEditor-FMODStudioNiagara.dll index c5def2e..e2d169b 100644 --- a/Plugins/FMODStudioNiagara/Binaries/Win64/UnrealEditor-FMODStudioNiagara.dll +++ b/Plugins/FMODStudioNiagara/Binaries/Win64/UnrealEditor-FMODStudioNiagara.dll @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d27102e4a8e305ba2104785663685b118859ca8b2339251f1e5e29939e0cc22b +oid sha256:d428007df8be4a6ff0a90c3182d8e4ef1e883bf64ce6b5daedc2f4d0710ece4e size 228352 diff --git a/Plugins/FMODStudioNiagara/Binaries/Win64/UnrealEditor-FMODStudioNiagara.pdb b/Plugins/FMODStudioNiagara/Binaries/Win64/UnrealEditor-FMODStudioNiagara.pdb index 028e6a3..2125683 100644 --- a/Plugins/FMODStudioNiagara/Binaries/Win64/UnrealEditor-FMODStudioNiagara.pdb +++ b/Plugins/FMODStudioNiagara/Binaries/Win64/UnrealEditor-FMODStudioNiagara.pdb @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3362ff072696d4668329206186078750494e35b534dc9e567adc19f9c23b9151 -size 62033920 +oid sha256:1a4d2b3478eaefe6d804cd4092661adab286a6ab05c1f1af5f5fc3a1d782dfa5 +size 61911040 diff --git a/Source/Lost_Edge/Private/CutsceneManager.cpp b/Source/Lost_Edge/Private/CutsceneManager.cpp index 132bb2c..1f60ee4 100644 --- a/Source/Lost_Edge/Private/CutsceneManager.cpp +++ b/Source/Lost_Edge/Private/CutsceneManager.cpp @@ -29,9 +29,9 @@ UCutsceneManager::UCutsceneManager() } } -void UCutsceneManager::EnqueueSequence(TSoftObjectPtr sequence, FCutsceneEndCallback endCallback) +void UCutsceneManager::EnqueueSequence(ULevelSequence* sequence, FCutsceneEndCallback endCallback) { - if(!sequence.LoadSynchronous()) + if(!sequence) return; FScopeLock lock1(&_sequencesLock); @@ -81,9 +81,9 @@ void UCutsceneManager::PlayNextSequence() FScopeLock lock(&_sequencesLock); - TSoftObjectPtr sequence; + ULevelSequence* sequence; _nextSequences.Dequeue(sequence); - _sequencePlayer = ULevelSequencePlayer::CreateLevelSequencePlayer(GetWorld(), sequence.LoadSynchronous(), FMovieSceneSequencePlaybackSettings{}, _sequencePlayerActor); + _sequencePlayer = ULevelSequencePlayer::CreateLevelSequencePlayer(GetWorld(), sequence, FMovieSceneSequencePlaybackSettings{}, _sequencePlayerActor); _sequencePlayer->OnStop.AddDynamic(this, &UCutsceneManager::OnSequenceEnd); _sequencePlayer->Play(); } diff --git a/Source/Lost_Edge/Private/CutsceneManager.h b/Source/Lost_Edge/Private/CutsceneManager.h index fc21fde..708cde2 100644 --- a/Source/Lost_Edge/Private/CutsceneManager.h +++ b/Source/Lost_Edge/Private/CutsceneManager.h @@ -17,7 +17,7 @@ public: UCutsceneManager(); UFUNCTION(BlueprintCallable) - void EnqueueSequence(TSoftObjectPtr sequence, FCutsceneEndCallback endCallback); + void EnqueueSequence(class ULevelSequence* sequence, FCutsceneEndCallback endCallback); UFUNCTION(BlueprintCallable) void SkipSequence(); @@ -38,7 +38,7 @@ private: class ULevelSequencePlayer* _sequencePlayer = nullptr; class ALevelSequenceActor* _sequencePlayerActor = nullptr; - TQueue> _nextSequences; + TQueue _nextSequences; FCriticalSection _sequencesLock; TQueue _endCallbacks; FCriticalSection _callbacksLock; diff --git a/Source/Lost_Edge/Private/Interactable/Activators/InteractableScreenCapturer.cpp b/Source/Lost_Edge/Private/Interactable/Activators/InteractableScreenCapturer.cpp index ea2fd42..5f37b19 100644 --- a/Source/Lost_Edge/Private/Interactable/Activators/InteractableScreenCapturer.cpp +++ b/Source/Lost_Edge/Private/Interactable/Activators/InteractableScreenCapturer.cpp @@ -284,5 +284,5 @@ void UInteractableScreenCapturer::Process() running = false; } ); - } -} \ No newline at end of file + } + } \ No newline at end of file diff --git a/Source/Lost_Edge/Private/Minigame/AgeOfWar/AgeOfWarManager.cpp b/Source/Lost_Edge/Private/Minigame/AgeOfWar/AgeOfWarManager.cpp new file mode 100644 index 0000000..e1976ad --- /dev/null +++ b/Source/Lost_Edge/Private/Minigame/AgeOfWar/AgeOfWarManager.cpp @@ -0,0 +1,27 @@ +// Oleg Petruny proprietary. + + +#include "AgeOfWarManager.h" + +#include "MainGameModeBase.h" +#include "PlayerBase.h" + +AAgeOfWarManager::AAgeOfWarManager() +{} + +void AAgeOfWarManager::Start(APlayerBase* playerPawn, FMinigameEndCallback delegate) +{ + if(!playerPawn) + return; + + AMinigame::Start(playerPawn, delegate); + + player->LockPlayer(FPlayerLock::All()); +} + +void AAgeOfWarManager::End() +{ + player->UnlockPlayer(FPlayerLock::All()); + + AMinigame::End(); +} diff --git a/Source/Lost_Edge/Private/Minigame/AgeOfWar/AgeOfWarManager.h b/Source/Lost_Edge/Private/Minigame/AgeOfWar/AgeOfWarManager.h new file mode 100644 index 0000000..b414c2f --- /dev/null +++ b/Source/Lost_Edge/Private/Minigame/AgeOfWar/AgeOfWarManager.h @@ -0,0 +1,19 @@ +// Oleg Petruny proprietary. + +#pragma once + +#include "Minigame/Minigame.h" + +#include "AgeOfWarManager.generated.h" + +UCLASS(Blueprintable, BlueprintType, MinimalAPI) +class AAgeOfWarManager : public AMinigame +{ + GENERATED_BODY() + +public: + AAgeOfWarManager(); + + virtual void Start(class APlayerBase* playerPawn, FMinigameEndCallback delegate) override; + virtual void End() override; +}; diff --git a/Source/Lost_Edge/Private/Minigame/CrossyRoad/CrossyRoadManager.cpp b/Source/Lost_Edge/Private/Minigame/CrossyRoad/CrossyRoadManager.cpp new file mode 100644 index 0000000..d36902f --- /dev/null +++ b/Source/Lost_Edge/Private/Minigame/CrossyRoad/CrossyRoadManager.cpp @@ -0,0 +1,27 @@ +// Oleg Petruny proprietary. + + +#include "CrossyRoadManager.h" + +#include "MainGameModeBase.h" +#include "PlayerBase.h" + +ACrossyRoadManager::ACrossyRoadManager() +{} + +void ACrossyRoadManager::Start(APlayerBase* playerPawn, FMinigameEndCallback delegate) +{ + if(!playerPawn) + return; + + AMinigame::Start(playerPawn, delegate); + + player->LockPlayer(FPlayerLock::All()); +} + +void ACrossyRoadManager::End() +{ + player->UnlockPlayer(FPlayerLock::All()); + + AMinigame::End(); +} diff --git a/Source/Lost_Edge/Private/Minigame/CrossyRoad/CrossyRoadManager.h b/Source/Lost_Edge/Private/Minigame/CrossyRoad/CrossyRoadManager.h new file mode 100644 index 0000000..35acae1 --- /dev/null +++ b/Source/Lost_Edge/Private/Minigame/CrossyRoad/CrossyRoadManager.h @@ -0,0 +1,19 @@ +// Oleg Petruny proprietary. + +#pragma once + +#include "Minigame/Minigame.h" + +#include "CrossyRoadManager.generated.h" + +UCLASS(Blueprintable, BlueprintType, MinimalAPI) +class ACrossyRoadManager : public AMinigame +{ + GENERATED_BODY() + +public: + ACrossyRoadManager(); + + virtual void Start(class APlayerBase* playerPawn, FMinigameEndCallback delegate) override; + virtual void End() override; +}; diff --git a/Source/Lost_Edge/Private/Minigame/Fishing/FishingManager.cpp b/Source/Lost_Edge/Private/Minigame/Fishing/FishingManager.cpp new file mode 100644 index 0000000..1167c33 --- /dev/null +++ b/Source/Lost_Edge/Private/Minigame/Fishing/FishingManager.cpp @@ -0,0 +1,30 @@ +// Oleg Petruny proprietary. + + +#include "FishingManager.h" + +#include "MainGameModeBase.h" +#include "PlayerBase.h" + +AFishingManager::AFishingManager() +{ + static ConstructorHelpers::FObjectFinder asset{ TEXT("/Script/EnhancedInput.InputMappingContext'/Game/Input/Minigame/IMC_Minigame_Fishing.IMC_Minigame_Fishing'") }; + input = asset.Object; +} + +void AFishingManager::Start(APlayerBase* playerPawn, FMinigameEndCallback delegate) +{ + if(!playerPawn) + return; + + AMinigame::Start(playerPawn, delegate); + + player->LockPlayer(FPlayerLock::All()); +} + +void AFishingManager::End() +{ + player->UnlockPlayer(FPlayerLock::All()); + + AMinigame::End(); +} diff --git a/Source/Lost_Edge/Private/Minigame/Fishing/FishingManager.h b/Source/Lost_Edge/Private/Minigame/Fishing/FishingManager.h new file mode 100644 index 0000000..2bd69e2 --- /dev/null +++ b/Source/Lost_Edge/Private/Minigame/Fishing/FishingManager.h @@ -0,0 +1,46 @@ +// Oleg Petruny proprietary. + +#pragma once + +#include "Minigame/Minigame.h" + +#include "FishingManager.generated.h" + +USTRUCT(BlueprintType) +struct FFishVariation +{ + GENERATED_BODY() + + UPROPERTY(EditAnywhere, BlueprintReadWrite) + float difficulty; + + UPROPERTY(EditAnywhere, BlueprintReadWrite) + float size; + + UPROPERTY(EditAnywhere, BlueprintReadWrite) + float duration; + + UPROPERTY(EditAnywhere, BlueprintReadWrite) + int32 price; + + UPROPERTY(EditAnywhere, BlueprintReadWrite) + FLinearColor color; +}; + +UCLASS(Blueprintable, BlueprintType, MinimalAPI) +class AFishingManager : public AMinigame +{ + GENERATED_BODY() + +public: + AFishingManager(); + + virtual void Start(class APlayerBase* playerPawn, FMinigameEndCallback delegate) override; + virtual void End() override; + + UFUNCTION(BlueprintImplementableEvent, BlueprintCallable) + void CatchSucceed(int32 price); + + UFUNCTION(BlueprintImplementableEvent, BlueprintCallable) + void CatchFailed(); +}; diff --git a/Source/Lost_Edge/Private/Minigame/Minigame.cpp b/Source/Lost_Edge/Private/Minigame/Minigame.cpp index 1d563de..eb49fc5 100644 --- a/Source/Lost_Edge/Private/Minigame/Minigame.cpp +++ b/Source/Lost_Edge/Private/Minigame/Minigame.cpp @@ -3,17 +3,24 @@ #include "Minigame.h" +#include "EnhancedInputSubsystems.h" #include "InputMappingContext.h" +#include "PlayerBase.h" + AMinigame::AMinigame() - : AActor() { PrimaryActorTick.bStartWithTickEnabled = false; PrimaryActorTick.bCanEverTick = true; } void AMinigame::End() -{} +{ + if(callback.IsBound()) + callback.Execute(result, score); + + OnEnd(); +} void AMinigame::Restart() {} @@ -23,8 +30,15 @@ UInputMappingContext* AMinigame::GetInputMappings() return input.LoadSynchronous(); } -void AMinigame::Start(class APlayerBase* playerPawn, FMinigameEndCallback delegate) +void AMinigame::Start(APlayerBase* playerPawn, FMinigameEndCallback delegate) { player = playerPawn; callback = delegate; + + if(input) + if(auto PC = Cast(playerPawn->GetController())) + if(auto inputSubsystem = ULocalPlayer::GetSubsystem(PC->GetLocalPlayer())) + inputSubsystem->AddMappingContext(input.LoadSynchronous(), 0); + + OnStart(); } diff --git a/Source/Lost_Edge/Private/Minigame/Minigame.h b/Source/Lost_Edge/Private/Minigame/Minigame.h index 4f4d580..e103c50 100644 --- a/Source/Lost_Edge/Private/Minigame/Minigame.h +++ b/Source/Lost_Edge/Private/Minigame/Minigame.h @@ -26,12 +26,18 @@ public: UFUNCTION(BlueprintCallable) virtual void Start(class APlayerBase* playerPawn, FMinigameEndCallback delegate); + UFUNCTION(BlueprintImplementableEvent) + void OnStart(); + UFUNCTION(BlueprintCallable) virtual void End(); UFUNCTION(BlueprintCallable) virtual void Restart(); + UFUNCTION(BlueprintImplementableEvent) + void OnEnd(); + UFUNCTION(BlueprintPure) class UInputMappingContext* GetInputMappings(); @@ -42,6 +48,9 @@ protected: UPROPERTY(EditAnywhere, BlueprintReadWrite) int32 score = 0; + UPROPERTY(EditAnywhere, BlueprintReadWrite) + EMinigameResult result = EMinigameResult::Loss; + UPROPERTY(EditAnywhere, BlueprintReadWrite) bool ended = false; diff --git a/Source/Lost_Edge/Private/Minigame/RythmClick/RythmClickManager.cpp b/Source/Lost_Edge/Private/Minigame/RythmClick/RythmClickManager.cpp new file mode 100644 index 0000000..297e092 --- /dev/null +++ b/Source/Lost_Edge/Private/Minigame/RythmClick/RythmClickManager.cpp @@ -0,0 +1,27 @@ +// Oleg Petruny proprietary. + + +#include "RythmClickManager.h" + +#include "MainGameModeBase.h" +#include "PlayerBase.h" + +ARythmClickManager::ARythmClickManager() +{} + +void ARythmClickManager::Start(APlayerBase* playerPawn, FMinigameEndCallback delegate) +{ + if(!playerPawn) + return; + + AMinigame::Start(playerPawn, delegate); + + player->LockPlayer(FPlayerLock::All()); +} + +void ARythmClickManager::End() +{ + player->UnlockPlayer(FPlayerLock::All()); + + AMinigame::End(); +} diff --git a/Source/Lost_Edge/Private/Minigame/RythmClick/RythmClickManager.h b/Source/Lost_Edge/Private/Minigame/RythmClick/RythmClickManager.h new file mode 100644 index 0000000..23fc800 --- /dev/null +++ b/Source/Lost_Edge/Private/Minigame/RythmClick/RythmClickManager.h @@ -0,0 +1,19 @@ +// Oleg Petruny proprietary. + +#pragma once + +#include "Minigame/Minigame.h" + +#include "RythmClickManager.generated.h" + +UCLASS(Blueprintable, BlueprintType, MinimalAPI) +class ARythmClickManager : public AMinigame +{ + GENERATED_BODY() + +public: + ARythmClickManager(); + + virtual void Start(class APlayerBase* playerPawn, FMinigameEndCallback delegate) override; + virtual void End() override; +}; diff --git a/Source/Lost_Edge/Private/Minigame/SubwaySurf/SubwaySurfManager.cpp b/Source/Lost_Edge/Private/Minigame/SubwaySurf/SubwaySurfManager.cpp index a904839..2350786 100644 --- a/Source/Lost_Edge/Private/Minigame/SubwaySurf/SubwaySurfManager.cpp +++ b/Source/Lost_Edge/Private/Minigame/SubwaySurf/SubwaySurfManager.cpp @@ -18,7 +18,7 @@ ASubwaySurfManager::ASubwaySurfManager() : AMinigame() { - static ConstructorHelpers::FObjectFinder asset{ TEXT("/Script/EnhancedInput.InputMappingContext'/Game/Input/Minigame/IMC_SubwaySurf.IMC_SubwaySurf'") }; + static ConstructorHelpers::FObjectFinder asset{ TEXT("/Script/EnhancedInput.InputMappingContext'/Game/Input/Minigame/IMC_Minigame_SubwaySurf.IMC_Minigame_SubwaySurf'") }; input = asset.Object; auto root = CreateDefaultSubobject(TEXT("Scene")); @@ -40,8 +40,6 @@ void ASubwaySurfManager::Start(APlayerBase* playerPawn, FMinigameEndCallback del AMinigame::Start(playerPawn, delegate); - AMainGameModeBase::GetWidgetsManager()->HideInteractionHints(nullptr); - player->LockPlayer(FPlayerLock::All()); player->SwitchToView(this); @@ -70,8 +68,6 @@ void ASubwaySurfManager::End() for(int32 handler : inputHandlers) player->inputComponent->RemoveActionBindingForHandle(handler); - AMainGameModeBase::GetWidgetsManager()->ShowInteractionHints(nullptr); - player->UnlockPlayer(FPlayerLock::All()); player->ReturnPlayerView(); @@ -91,15 +87,13 @@ void ASubwaySurfManager::Hit() return; } - if(callback.IsBound()) - callback.Execute(EMinigameResult::Loss, score); + result = EMinigameResult::Loss; End(); } void ASubwaySurfManager::Finish() { - if(callback.IsBound()) - callback.Execute(EMinigameResult::Win, score); + result = EMinigameResult::Win; End(); } diff --git a/Source/Lost_Edge/Private/PlayerBase.cpp b/Source/Lost_Edge/Private/PlayerBase.cpp index 07dda52..a4b058b 100644 --- a/Source/Lost_Edge/Private/PlayerBase.cpp +++ b/Source/Lost_Edge/Private/PlayerBase.cpp @@ -141,6 +141,9 @@ void APlayerBase::LockPlayer(FPlayerLock lock) interactionLocked += lock.interaction; cameraLocked += lock.camera; inventoryLocked += lock.inventory; + + if(interactionLocked) + ResetIntractions(); } void APlayerBase::UnlockPlayer(FPlayerLock lock) @@ -158,6 +161,11 @@ void APlayerBase::FlyMode(bool on) GetCharacterMovement()->GravityScale = on ? 0.0f : 1.0f; } +void APlayerBase::ResetIntractions() +{ + InteractableDeactivated(lastInteractable, static_cast(0xFF)); +} + FVector APlayerBase::GetCameraDirection() { return camera->GetForwardVector(); diff --git a/Source/Lost_Edge/Private/PlayerBase.h b/Source/Lost_Edge/Private/PlayerBase.h index d612b0d..a07f7ee 100644 --- a/Source/Lost_Edge/Private/PlayerBase.h +++ b/Source/Lost_Edge/Private/PlayerBase.h @@ -48,6 +48,7 @@ public: void LockPlayer(const FPlayerLock lock); void UnlockPlayer(const FPlayerLock lock); void FlyMode(bool on); + void ResetIntractions(); UFUNCTION(BlueprintCallable, Category = Character) void SwitchToView(class AActor* target);