From afd259925f3abf22ceffd0a97fa4d65ecb669f19 Mon Sep 17 00:00:00 2001 From: Oleg Petruny Date: Wed, 20 Nov 2024 13:24:17 +0100 Subject: [PATCH] finalization --- .gitattributes | 1 + .../RAIMaquette_CustomDialogue/GLaDOS_HowHaveYouBeen.wav | 3 +++ .../Audio/Music/Minigames/SW_Minigame_RythmClick.uasset | 4 ++-- .../Test/Actors/RuntimeLoadTest/BP_Test_RuntimeLoad.uasset | 4 ++-- UnrealProject/Lost_Edge/Content/Levels/Test/L_Test.umap | 2 +- .../Content/Misc/ImportTest/BP_ImportTest_Barrel.uasset | 3 --- .../Lost_Edge/Content/Misc/ImportTest/DA_ImportTest.uasset | 3 --- .../Content/Misc/ImportTest/M_ImportTest_BarelWood.uasset | 3 --- .../Content/Misc/ImportTest/M_ImportTest_BarrelRings.uasset | 3 --- .../Content/Misc/ImportTest/SM_ImportTest_Barrel.uasset | 3 --- .../BP_RAIMaquett_CustomAnimatedLightLoader.uasset | 3 +++ .../Content/BP_RAIMaquett_SmokeLamp.uasset | 3 +++ .../Content/L_RAIMaquett_CustomAnimatedLightWorld.umap | 3 +++ .../Seq_RAIMaquett_CustomAnimatedLightAnimation.uasset | 3 +++ .../DA_RAIMaquett_CustomAnimatedLight.uasset | 3 +++ .../CustomDialogue/BP_RAIMaquett_CustomDialogue.uasset | 3 +++ .../CustomDialogue/DA_RAIMaquett_CustomDialogue.uasset | 3 +++ .../CustomDialogue/DT_RAIMaquett_CustomDialogue.uasset | 3 +++ .../CustomDialogue/SW_RAIMaquett_CustomDialogue.uasset | 3 +++ .../BP_RAIMaquett_CustomBarrel.uasset | 3 +++ .../DA_RAIMaquett_CustomMovableInteractable.uasset | 3 +++ .../CustomMovableInteractable/M_RAIMaquett_BarelWood.uasset | 3 +++ .../CustomMovableInteractable/M_RAIMaquett_BarrelRings.uasset | 3 +++ .../CustomMovableInteractable/SM_RAIMaquett_Barrel.uasset | 3 +++ .../Lost_Edge/Source/Lost_Edge/Private/DialogueManager.cpp | 2 +- 25 files changed, 52 insertions(+), 21 deletions(-) create mode 100644 Audio/Dialogue/RAIMaquette_CustomDialogue/GLaDOS_HowHaveYouBeen.wav delete mode 100644 UnrealProject/Lost_Edge/Content/Misc/ImportTest/BP_ImportTest_Barrel.uasset delete mode 100644 UnrealProject/Lost_Edge/Content/Misc/ImportTest/DA_ImportTest.uasset delete mode 100644 UnrealProject/Lost_Edge/Content/Misc/ImportTest/M_ImportTest_BarelWood.uasset delete mode 100644 UnrealProject/Lost_Edge/Content/Misc/ImportTest/M_ImportTest_BarrelRings.uasset delete mode 100644 UnrealProject/Lost_Edge/Content/Misc/ImportTest/SM_ImportTest_Barrel.uasset create mode 100644 UnrealProject/Lost_Edge/Content/Misc/RAIMaquetts/CustomAnimatedLight/BP_RAIMaquett_CustomAnimatedLightLoader.uasset create mode 100644 UnrealProject/Lost_Edge/Content/Misc/RAIMaquetts/CustomAnimatedLight/Content/BP_RAIMaquett_SmokeLamp.uasset create mode 100644 UnrealProject/Lost_Edge/Content/Misc/RAIMaquetts/CustomAnimatedLight/Content/L_RAIMaquett_CustomAnimatedLightWorld.umap create mode 100644 UnrealProject/Lost_Edge/Content/Misc/RAIMaquetts/CustomAnimatedLight/Content/Seq_RAIMaquett_CustomAnimatedLightAnimation.uasset create mode 100644 UnrealProject/Lost_Edge/Content/Misc/RAIMaquetts/CustomAnimatedLight/DA_RAIMaquett_CustomAnimatedLight.uasset create mode 100644 UnrealProject/Lost_Edge/Content/Misc/RAIMaquetts/CustomDialogue/BP_RAIMaquett_CustomDialogue.uasset create mode 100644 UnrealProject/Lost_Edge/Content/Misc/RAIMaquetts/CustomDialogue/DA_RAIMaquett_CustomDialogue.uasset create mode 100644 UnrealProject/Lost_Edge/Content/Misc/RAIMaquetts/CustomDialogue/DT_RAIMaquett_CustomDialogue.uasset create mode 100644 UnrealProject/Lost_Edge/Content/Misc/RAIMaquetts/CustomDialogue/SW_RAIMaquett_CustomDialogue.uasset create mode 100644 UnrealProject/Lost_Edge/Content/Misc/RAIMaquetts/CustomMovableInteractable/BP_RAIMaquett_CustomBarrel.uasset create mode 100644 UnrealProject/Lost_Edge/Content/Misc/RAIMaquetts/CustomMovableInteractable/DA_RAIMaquett_CustomMovableInteractable.uasset create mode 100644 UnrealProject/Lost_Edge/Content/Misc/RAIMaquetts/CustomMovableInteractable/M_RAIMaquett_BarelWood.uasset create mode 100644 UnrealProject/Lost_Edge/Content/Misc/RAIMaquetts/CustomMovableInteractable/M_RAIMaquett_BarrelRings.uasset create mode 100644 UnrealProject/Lost_Edge/Content/Misc/RAIMaquetts/CustomMovableInteractable/SM_RAIMaquett_Barrel.uasset diff --git a/.gitattributes b/.gitattributes index b0f32f0..ad623c1 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,3 +1,4 @@ ReleaseBuilds/** filter=lfs diff=lfs merge=lfs -text Images/** filter=lfs diff=lfs merge=lfs -text Fonts/** filter=lfs diff=lfs merge=lfs -text +Audio/** filter=lfs diff=lfs merge=lfs -text diff --git a/Audio/Dialogue/RAIMaquette_CustomDialogue/GLaDOS_HowHaveYouBeen.wav b/Audio/Dialogue/RAIMaquette_CustomDialogue/GLaDOS_HowHaveYouBeen.wav new file mode 100644 index 0000000..80afba7 --- /dev/null +++ b/Audio/Dialogue/RAIMaquette_CustomDialogue/GLaDOS_HowHaveYouBeen.wav @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d83b577196ae6976ff5ee2c6274b94f49cd653e8572fd038979430a5437313bf +size 403280 diff --git a/UnrealProject/Lost_Edge/Content/Audio/Music/Minigames/SW_Minigame_RythmClick.uasset b/UnrealProject/Lost_Edge/Content/Audio/Music/Minigames/SW_Minigame_RythmClick.uasset index a32b43b..1d5f328 100644 --- a/UnrealProject/Lost_Edge/Content/Audio/Music/Minigames/SW_Minigame_RythmClick.uasset +++ b/UnrealProject/Lost_Edge/Content/Audio/Music/Minigames/SW_Minigame_RythmClick.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:76f3fa2ae8f6d4389b6a1daf56df1fcb27b61e60590c9096d2d9119dce709728 -size 7376077 +oid sha256:04fc312b5b37ea8293d79a5f5f242f5ecd9dc1183e7680d2956d50d44a228fb0 +size 7376219 diff --git a/UnrealProject/Lost_Edge/Content/Levels/Test/Actors/RuntimeLoadTest/BP_Test_RuntimeLoad.uasset b/UnrealProject/Lost_Edge/Content/Levels/Test/Actors/RuntimeLoadTest/BP_Test_RuntimeLoad.uasset index 8ac1e67..aba621b 100644 --- a/UnrealProject/Lost_Edge/Content/Levels/Test/Actors/RuntimeLoadTest/BP_Test_RuntimeLoad.uasset +++ b/UnrealProject/Lost_Edge/Content/Levels/Test/Actors/RuntimeLoadTest/BP_Test_RuntimeLoad.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:aa2e821da734968bc3381ea5cd9595bf91638fa86634b0ab296f2fe79f315580 -size 72341 +oid sha256:8895891731e8da1a221aacd6a03ad0bf81128aa3a980588173be9fbd863a9244 +size 84828 diff --git a/UnrealProject/Lost_Edge/Content/Levels/Test/L_Test.umap b/UnrealProject/Lost_Edge/Content/Levels/Test/L_Test.umap index b2b7c82..278e2c4 100644 --- a/UnrealProject/Lost_Edge/Content/Levels/Test/L_Test.umap +++ b/UnrealProject/Lost_Edge/Content/Levels/Test/L_Test.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:429d510512b55b0c1bb5aedc97715de4ceaba362be6c8f1d9d1c5a0a38c40050 +oid sha256:26ba9021d327e31a02433e566da5b6428681e17f2ae92ad100200f30c073dea3 size 2257698 diff --git a/UnrealProject/Lost_Edge/Content/Misc/ImportTest/BP_ImportTest_Barrel.uasset b/UnrealProject/Lost_Edge/Content/Misc/ImportTest/BP_ImportTest_Barrel.uasset deleted file mode 100644 index c05daaf..0000000 --- a/UnrealProject/Lost_Edge/Content/Misc/ImportTest/BP_ImportTest_Barrel.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:951dd836a6715f743d3779f7db429ef6fcf444e3918ffe0b3ccd518217ba4a2e -size 31005 diff --git a/UnrealProject/Lost_Edge/Content/Misc/ImportTest/DA_ImportTest.uasset b/UnrealProject/Lost_Edge/Content/Misc/ImportTest/DA_ImportTest.uasset deleted file mode 100644 index a2e2dcc..0000000 --- a/UnrealProject/Lost_Edge/Content/Misc/ImportTest/DA_ImportTest.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:7ed903f0079d7add5446e94bcb4be9bd190157a441b4be3778465039cf9ef3f7 -size 3824 diff --git a/UnrealProject/Lost_Edge/Content/Misc/ImportTest/M_ImportTest_BarelWood.uasset b/UnrealProject/Lost_Edge/Content/Misc/ImportTest/M_ImportTest_BarelWood.uasset deleted file mode 100644 index f52518a..0000000 --- a/UnrealProject/Lost_Edge/Content/Misc/ImportTest/M_ImportTest_BarelWood.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:99c7f71a92b560c7cbb728e61859c2011d9d385b835d65490d1770d07f214097 -size 13533 diff --git a/UnrealProject/Lost_Edge/Content/Misc/ImportTest/M_ImportTest_BarrelRings.uasset b/UnrealProject/Lost_Edge/Content/Misc/ImportTest/M_ImportTest_BarrelRings.uasset deleted file mode 100644 index bdda9ad..0000000 --- a/UnrealProject/Lost_Edge/Content/Misc/ImportTest/M_ImportTest_BarrelRings.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:b342de6b20ff05eca91758b24424a618a4f1b1fbed125ef7c00b6df47883d770 -size 10948 diff --git a/UnrealProject/Lost_Edge/Content/Misc/ImportTest/SM_ImportTest_Barrel.uasset b/UnrealProject/Lost_Edge/Content/Misc/ImportTest/SM_ImportTest_Barrel.uasset deleted file mode 100644 index 77ff968..0000000 --- a/UnrealProject/Lost_Edge/Content/Misc/ImportTest/SM_ImportTest_Barrel.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:1aa963b1ca237c5f3838dc7a5926e5395f7c06a4ecff4decd2cf1b8d30a60895 -size 59070 diff --git a/UnrealProject/Lost_Edge/Content/Misc/RAIMaquetts/CustomAnimatedLight/BP_RAIMaquett_CustomAnimatedLightLoader.uasset b/UnrealProject/Lost_Edge/Content/Misc/RAIMaquetts/CustomAnimatedLight/BP_RAIMaquett_CustomAnimatedLightLoader.uasset new file mode 100644 index 0000000..76857d3 --- /dev/null +++ b/UnrealProject/Lost_Edge/Content/Misc/RAIMaquetts/CustomAnimatedLight/BP_RAIMaquett_CustomAnimatedLightLoader.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f904e38b34f7eab7cb9eff85f910776334b4b71caeff70fcc124424a75d7f8d8 +size 32082 diff --git a/UnrealProject/Lost_Edge/Content/Misc/RAIMaquetts/CustomAnimatedLight/Content/BP_RAIMaquett_SmokeLamp.uasset b/UnrealProject/Lost_Edge/Content/Misc/RAIMaquetts/CustomAnimatedLight/Content/BP_RAIMaquett_SmokeLamp.uasset new file mode 100644 index 0000000..d8e63b5 --- /dev/null +++ b/UnrealProject/Lost_Edge/Content/Misc/RAIMaquetts/CustomAnimatedLight/Content/BP_RAIMaquett_SmokeLamp.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e1a6eeaa00e0bffeeb078c4cce09b243ad48ed35516659535cabefb6563371b0 +size 21443 diff --git a/UnrealProject/Lost_Edge/Content/Misc/RAIMaquetts/CustomAnimatedLight/Content/L_RAIMaquett_CustomAnimatedLightWorld.umap b/UnrealProject/Lost_Edge/Content/Misc/RAIMaquetts/CustomAnimatedLight/Content/L_RAIMaquett_CustomAnimatedLightWorld.umap new file mode 100644 index 0000000..e0e117a --- /dev/null +++ b/UnrealProject/Lost_Edge/Content/Misc/RAIMaquetts/CustomAnimatedLight/Content/L_RAIMaquett_CustomAnimatedLightWorld.umap @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:005472c34d0b68e532975c44acd5d8fb1d0183145ec3534e7b5b3b209dddbbb0 +size 31617 diff --git a/UnrealProject/Lost_Edge/Content/Misc/RAIMaquetts/CustomAnimatedLight/Content/Seq_RAIMaquett_CustomAnimatedLightAnimation.uasset b/UnrealProject/Lost_Edge/Content/Misc/RAIMaquetts/CustomAnimatedLight/Content/Seq_RAIMaquett_CustomAnimatedLightAnimation.uasset new file mode 100644 index 0000000..d3b8ef6 --- /dev/null +++ b/UnrealProject/Lost_Edge/Content/Misc/RAIMaquetts/CustomAnimatedLight/Content/Seq_RAIMaquett_CustomAnimatedLightAnimation.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:141a669c733b383eaff586dcda3e149881829f65d0bc00d740cb0fe2c543eed7 +size 21227 diff --git a/UnrealProject/Lost_Edge/Content/Misc/RAIMaquetts/CustomAnimatedLight/DA_RAIMaquett_CustomAnimatedLight.uasset b/UnrealProject/Lost_Edge/Content/Misc/RAIMaquetts/CustomAnimatedLight/DA_RAIMaquett_CustomAnimatedLight.uasset new file mode 100644 index 0000000..6077994 --- /dev/null +++ b/UnrealProject/Lost_Edge/Content/Misc/RAIMaquetts/CustomAnimatedLight/DA_RAIMaquett_CustomAnimatedLight.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e2b92953aa0ab6e30b405b1a676c05cb60eae26373cbf1ae1cfcf5d8c2a1a973 +size 6098 diff --git a/UnrealProject/Lost_Edge/Content/Misc/RAIMaquetts/CustomDialogue/BP_RAIMaquett_CustomDialogue.uasset b/UnrealProject/Lost_Edge/Content/Misc/RAIMaquetts/CustomDialogue/BP_RAIMaquett_CustomDialogue.uasset new file mode 100644 index 0000000..6736789 --- /dev/null +++ b/UnrealProject/Lost_Edge/Content/Misc/RAIMaquetts/CustomDialogue/BP_RAIMaquett_CustomDialogue.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a07e099a034efa8b7a41a3b611f537cdd2493ca26152d6ada59ef4510026a15d +size 27705 diff --git a/UnrealProject/Lost_Edge/Content/Misc/RAIMaquetts/CustomDialogue/DA_RAIMaquett_CustomDialogue.uasset b/UnrealProject/Lost_Edge/Content/Misc/RAIMaquetts/CustomDialogue/DA_RAIMaquett_CustomDialogue.uasset new file mode 100644 index 0000000..24ee3c1 --- /dev/null +++ b/UnrealProject/Lost_Edge/Content/Misc/RAIMaquetts/CustomDialogue/DA_RAIMaquett_CustomDialogue.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:760a68a4934bae6b7d428f1aacbd2aab0d22ef5fc2e6ca16ccda5c9222a18e37 +size 3278 diff --git a/UnrealProject/Lost_Edge/Content/Misc/RAIMaquetts/CustomDialogue/DT_RAIMaquett_CustomDialogue.uasset b/UnrealProject/Lost_Edge/Content/Misc/RAIMaquetts/CustomDialogue/DT_RAIMaquett_CustomDialogue.uasset new file mode 100644 index 0000000..9a4ef6c --- /dev/null +++ b/UnrealProject/Lost_Edge/Content/Misc/RAIMaquetts/CustomDialogue/DT_RAIMaquett_CustomDialogue.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:916bfaab01566e0d018dd165b42ac179373550297ff4ad6016c971f354b36727 +size 3708 diff --git a/UnrealProject/Lost_Edge/Content/Misc/RAIMaquetts/CustomDialogue/SW_RAIMaquett_CustomDialogue.uasset b/UnrealProject/Lost_Edge/Content/Misc/RAIMaquetts/CustomDialogue/SW_RAIMaquett_CustomDialogue.uasset new file mode 100644 index 0000000..391b269 --- /dev/null +++ b/UnrealProject/Lost_Edge/Content/Misc/RAIMaquetts/CustomDialogue/SW_RAIMaquett_CustomDialogue.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:bf0a9397b1b63120fbf89026615cd30dc59303eeecff4bcd064a3aac00a1645e +size 315116 diff --git a/UnrealProject/Lost_Edge/Content/Misc/RAIMaquetts/CustomMovableInteractable/BP_RAIMaquett_CustomBarrel.uasset b/UnrealProject/Lost_Edge/Content/Misc/RAIMaquetts/CustomMovableInteractable/BP_RAIMaquett_CustomBarrel.uasset new file mode 100644 index 0000000..91d53be --- /dev/null +++ b/UnrealProject/Lost_Edge/Content/Misc/RAIMaquetts/CustomMovableInteractable/BP_RAIMaquett_CustomBarrel.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:262f978d4bd0cb3d6f1227eb6b4564f085a687113c08c5745e04e83687ab76ed +size 31360 diff --git a/UnrealProject/Lost_Edge/Content/Misc/RAIMaquetts/CustomMovableInteractable/DA_RAIMaquett_CustomMovableInteractable.uasset b/UnrealProject/Lost_Edge/Content/Misc/RAIMaquetts/CustomMovableInteractable/DA_RAIMaquett_CustomMovableInteractable.uasset new file mode 100644 index 0000000..29f2d23 --- /dev/null +++ b/UnrealProject/Lost_Edge/Content/Misc/RAIMaquetts/CustomMovableInteractable/DA_RAIMaquett_CustomMovableInteractable.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e823132261e8a387a386596e9bb416abff1b8f5b2d4b3c9bc991f835cfdd023e +size 4353 diff --git a/UnrealProject/Lost_Edge/Content/Misc/RAIMaquetts/CustomMovableInteractable/M_RAIMaquett_BarelWood.uasset b/UnrealProject/Lost_Edge/Content/Misc/RAIMaquetts/CustomMovableInteractable/M_RAIMaquett_BarelWood.uasset new file mode 100644 index 0000000..95b0d2c --- /dev/null +++ b/UnrealProject/Lost_Edge/Content/Misc/RAIMaquetts/CustomMovableInteractable/M_RAIMaquett_BarelWood.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e04e97db631606ef75e4eb3b99872828b0083ac1a7da78643d943115918bb1aa +size 13587 diff --git a/UnrealProject/Lost_Edge/Content/Misc/RAIMaquetts/CustomMovableInteractable/M_RAIMaquett_BarrelRings.uasset b/UnrealProject/Lost_Edge/Content/Misc/RAIMaquetts/CustomMovableInteractable/M_RAIMaquett_BarrelRings.uasset new file mode 100644 index 0000000..811bff7 --- /dev/null +++ b/UnrealProject/Lost_Edge/Content/Misc/RAIMaquetts/CustomMovableInteractable/M_RAIMaquett_BarrelRings.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8b1d1078d01ad66b7de433ec4a6b8532731f25a097872413b747f5f7d05f2575 +size 11002 diff --git a/UnrealProject/Lost_Edge/Content/Misc/RAIMaquetts/CustomMovableInteractable/SM_RAIMaquett_Barrel.uasset b/UnrealProject/Lost_Edge/Content/Misc/RAIMaquetts/CustomMovableInteractable/SM_RAIMaquett_Barrel.uasset new file mode 100644 index 0000000..04e5122 --- /dev/null +++ b/UnrealProject/Lost_Edge/Content/Misc/RAIMaquetts/CustomMovableInteractable/SM_RAIMaquett_Barrel.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1758dc7cc9e6203364525ffd5393cc7e278728798bc00602090beb69fccb422b +size 59290 diff --git a/UnrealProject/Lost_Edge/Source/Lost_Edge/Private/DialogueManager.cpp b/UnrealProject/Lost_Edge/Source/Lost_Edge/Private/DialogueManager.cpp index 6ed5613..a9bbbd1 100644 --- a/UnrealProject/Lost_Edge/Source/Lost_Edge/Private/DialogueManager.cpp +++ b/UnrealProject/Lost_Edge/Source/Lost_Edge/Private/DialogueManager.cpp @@ -147,7 +147,7 @@ void UDialogueManager::PlayNextDialogue() { FDialogueEndCallback callback; _endCallbacks.Dequeue(callback); - callback.Execute(); + callback.ExecuteIfBound(); _nextDialogues.Pop(); return; }