diff --git a/Audio/Sounds/Click.wav b/Audio/Sounds/Click.wav new file mode 100644 index 0000000..55846ba Binary files /dev/null and b/Audio/Sounds/Click.wav differ diff --git a/Audio/Sounds/ElectricTransform.wav b/Audio/Sounds/ElectricTransform.wav new file mode 100644 index 0000000..a4790d9 Binary files /dev/null and b/Audio/Sounds/ElectricTransform.wav differ diff --git a/Audio/Sounds/ElectricZap.wav b/Audio/Sounds/ElectricZap.wav new file mode 100644 index 0000000..e78124b Binary files /dev/null and b/Audio/Sounds/ElectricZap.wav differ diff --git a/Audio/Sounds/ServerFans.wav b/Audio/Sounds/ServerFans.wav new file mode 100644 index 0000000..78dba8c Binary files /dev/null and b/Audio/Sounds/ServerFans.wav differ diff --git a/Audio/Sounds/source.txt b/Audio/Sounds/source.txt new file mode 100644 index 0000000..7966ed6 --- /dev/null +++ b/Audio/Sounds/source.txt @@ -0,0 +1,4 @@ +Click - https://freesound.org/people/ccr_fs/sounds/484719/ +ElectricTransform - https://freesound.org/people/ShahruhAudio/sounds/336881/ +ElectricZap - https://freesound.org/people/egomassive/sounds/536741/ +ServerFans - https://freesound.org/people/Nox_Sound/sounds/465613/ \ No newline at end of file diff --git a/Models/Decorations/SMA_SecurityCamera.blend b/Models/Decorations/SMA_SecurityCamera.blend new file mode 100644 index 0000000..473d7ee Binary files /dev/null and b/Models/Decorations/SMA_SecurityCamera.blend differ diff --git a/Models/Decorations/SMA_SecurityCamera.fbx b/Models/Decorations/SMA_SecurityCamera.fbx new file mode 100644 index 0000000..e15a664 Binary files /dev/null and b/Models/Decorations/SMA_SecurityCamera.fbx differ diff --git a/UnrealProject/Lost_Edge/Content/Audio/Sounds/Cues/SC_ElectricTransform_Pitched.uasset b/UnrealProject/Lost_Edge/Content/Audio/Sounds/Cues/SC_ElectricTransform_Pitched.uasset new file mode 100644 index 0000000..a57ffe9 --- /dev/null +++ b/UnrealProject/Lost_Edge/Content/Audio/Sounds/Cues/SC_ElectricTransform_Pitched.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:91535d245908d66820502c201680954d8d4086467aba3e293644f1b0a66c8d60 +size 6370 diff --git a/UnrealProject/Lost_Edge/Content/Audio/Sounds/Cues/SC_ElectricZap_Pitched.uasset b/UnrealProject/Lost_Edge/Content/Audio/Sounds/Cues/SC_ElectricZap_Pitched.uasset new file mode 100644 index 0000000..bf84999 --- /dev/null +++ b/UnrealProject/Lost_Edge/Content/Audio/Sounds/Cues/SC_ElectricZap_Pitched.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:aeff1ebacbc44d1d56daab80bf92d592ba7217271321e972e73a66426f4f2197 +size 6328 diff --git a/UnrealProject/Lost_Edge/Content/Audio/Sounds/SW_Click.uasset b/UnrealProject/Lost_Edge/Content/Audio/Sounds/SW_Click.uasset new file mode 100644 index 0000000..4a56b63 --- /dev/null +++ b/UnrealProject/Lost_Edge/Content/Audio/Sounds/SW_Click.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7fbf8ce95fd2feda98fc624c3a588ce158f69eabf6e5d9087bed3e75f995905e +size 19103 diff --git a/UnrealProject/Lost_Edge/Content/Audio/Sounds/SW_ElectricTransform.uasset b/UnrealProject/Lost_Edge/Content/Audio/Sounds/SW_ElectricTransform.uasset new file mode 100644 index 0000000..4fbe167 --- /dev/null +++ b/UnrealProject/Lost_Edge/Content/Audio/Sounds/SW_ElectricTransform.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:dff6478dc2830be8d5812db334b0f35dccf5cf3e408a0a88b69a2bf7adbadfcf +size 54351 diff --git a/UnrealProject/Lost_Edge/Content/Audio/Sounds/SW_ElectricZap.uasset b/UnrealProject/Lost_Edge/Content/Audio/Sounds/SW_ElectricZap.uasset new file mode 100644 index 0000000..fddbd2c --- /dev/null +++ b/UnrealProject/Lost_Edge/Content/Audio/Sounds/SW_ElectricZap.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0f41d90de6f41a601ea6da91a82d37f20324331f17776c70dab6f5eea7ff5c90 +size 29446 diff --git a/UnrealProject/Lost_Edge/Content/Audio/Sounds/SW_ServerFans.uasset b/UnrealProject/Lost_Edge/Content/Audio/Sounds/SW_ServerFans.uasset new file mode 100644 index 0000000..8e25243 --- /dev/null +++ b/UnrealProject/Lost_Edge/Content/Audio/Sounds/SW_ServerFans.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6f1719fe854896663b7b82eda87e1ba5ecc4e74e4828719c6b21999fcb69a8ae +size 3408204 diff --git a/UnrealProject/Lost_Edge/Content/Blueprints/Characters/BP_Charles.uasset b/UnrealProject/Lost_Edge/Content/Blueprints/Characters/BP_Charles.uasset index 3b2857f..cac73bd 100644 --- a/UnrealProject/Lost_Edge/Content/Blueprints/Characters/BP_Charles.uasset +++ b/UnrealProject/Lost_Edge/Content/Blueprints/Characters/BP_Charles.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:810d9cb303a44d05b9f6cccefe3b51997ef12a04d0cc0498240a5221c8de9298 -size 112642 +oid sha256:e30ff0459cbc6bafd0cb94b546437342c678f0deb06bf39a0c7a4bc8c6ee5617 +size 37376 diff --git a/UnrealProject/Lost_Edge/Content/Blueprints/Decorations/BP_Camera.uasset b/UnrealProject/Lost_Edge/Content/Blueprints/Decorations/BP_Camera.uasset new file mode 100644 index 0000000..118aae0 --- /dev/null +++ b/UnrealProject/Lost_Edge/Content/Blueprints/Decorations/BP_Camera.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:aea2bcd7798581dc0708fc815e438fcb21626d1eb0015bf204658fb0ad72e685 +size 100944 diff --git a/UnrealProject/Lost_Edge/Content/Levels/Level_2/L_Level2.umap b/UnrealProject/Lost_Edge/Content/Levels/Level_2/L_Level2.umap index d412783..dd533ee 100644 --- a/UnrealProject/Lost_Edge/Content/Levels/Level_2/L_Level2.umap +++ b/UnrealProject/Lost_Edge/Content/Levels/Level_2/L_Level2.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3f06be145ad81dc049587677dc1ec36c8ae005298c81af1ef8b41c024a089c66 -size 79017144 +oid sha256:c4c1fef5cda63f868c4391f978b08be7c0ccdedc634ccd565a12069b81bf8534 +size 79189607 diff --git a/UnrealProject/Lost_Edge/Content/Levels/Level_3/Actors/BP_Level3_StartRoom_EndButton.uasset b/UnrealProject/Lost_Edge/Content/Levels/Level_3/Actors/BP_Level3_StartRoom_EndButton.uasset index afca338..d1abb11 100644 --- a/UnrealProject/Lost_Edge/Content/Levels/Level_3/Actors/BP_Level3_StartRoom_EndButton.uasset +++ b/UnrealProject/Lost_Edge/Content/Levels/Level_3/Actors/BP_Level3_StartRoom_EndButton.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ca3344df52f75daa1ae69b8efd7ff5fb83fc617e1e4e714788109e30e22b0d25 -size 33294 +oid sha256:687c395de0a241944234b32953e63b62e8b6bf1d25f6e78607f0154914e81c64 +size 32802 diff --git a/UnrealProject/Lost_Edge/Content/Levels/Level_3/Actors/BP_Level3_TechnicalRoom_Cable.uasset b/UnrealProject/Lost_Edge/Content/Levels/Level_3/Actors/BP_Level3_TechnicalRoom_Cable.uasset new file mode 100644 index 0000000..00b63dd --- /dev/null +++ b/UnrealProject/Lost_Edge/Content/Levels/Level_3/Actors/BP_Level3_TechnicalRoom_Cable.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e49a72a0a7da72896caca597ee0d13466dd150a37cde00251bdd0f9d9072b4a3 +size 2896 diff --git a/UnrealProject/Lost_Edge/Content/Levels/Level_3/Actors/BP_Level3_TechnicalRoom_CableEnd.uasset b/UnrealProject/Lost_Edge/Content/Levels/Level_3/Actors/BP_Level3_TechnicalRoom_CableEnd.uasset new file mode 100644 index 0000000..06302ae --- /dev/null +++ b/UnrealProject/Lost_Edge/Content/Levels/Level_3/Actors/BP_Level3_TechnicalRoom_CableEnd.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ad05ad5ef4dabc6d24e30f4f59303525d47e7a043403bc12b62a8ca16172b0a4 +size 2956 diff --git a/UnrealProject/Lost_Edge/Content/Levels/Level_3/Actors/BP_Level3_WitnessRoom_Button.uasset b/UnrealProject/Lost_Edge/Content/Levels/Level_3/Actors/BP_Level3_WitnessRoom_Button.uasset deleted file mode 100644 index 5e25747..0000000 --- a/UnrealProject/Lost_Edge/Content/Levels/Level_3/Actors/BP_Level3_WitnessRoom_Button.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:41b776e42c758565e0aaf72f63fb88063192d2afdba05ecd2f60056212724a1c -size 32867 diff --git a/UnrealProject/Lost_Edge/Content/Levels/Level_3/Actors/TechnicalRoom/BP_Level3_TechnicalRoom_Cable.uasset b/UnrealProject/Lost_Edge/Content/Levels/Level_3/Actors/TechnicalRoom/BP_Level3_TechnicalRoom_Cable.uasset new file mode 100644 index 0000000..5c2a6c7 --- /dev/null +++ b/UnrealProject/Lost_Edge/Content/Levels/Level_3/Actors/TechnicalRoom/BP_Level3_TechnicalRoom_Cable.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c6fa0b768356fa10fece7fa3dc0ea4eaff92d2204a5f6d60119e1196ebaf0fac +size 184939 diff --git a/UnrealProject/Lost_Edge/Content/Levels/Level_3/Actors/TechnicalRoom/BP_Level3_TechnicalRoom_CableEnd.uasset b/UnrealProject/Lost_Edge/Content/Levels/Level_3/Actors/TechnicalRoom/BP_Level3_TechnicalRoom_CableEnd.uasset new file mode 100644 index 0000000..a751ff6 --- /dev/null +++ b/UnrealProject/Lost_Edge/Content/Levels/Level_3/Actors/TechnicalRoom/BP_Level3_TechnicalRoom_CableEnd.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b55f3820b02d8a8922976c9875a568cff6a02a1ccb7e269839d6256b37aa04b4 +size 31557 diff --git a/UnrealProject/Lost_Edge/Content/Levels/Level_3/Actors/TechnicalRoom/BP_Level3_TechnicalRoom_Intro.uasset b/UnrealProject/Lost_Edge/Content/Levels/Level_3/Actors/TechnicalRoom/BP_Level3_TechnicalRoom_Intro.uasset new file mode 100644 index 0000000..c0e2d38 --- /dev/null +++ b/UnrealProject/Lost_Edge/Content/Levels/Level_3/Actors/TechnicalRoom/BP_Level3_TechnicalRoom_Intro.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3eaaf0884dd13a10adaf61fda31b64a63e1ff0fc5f0f291aa9f5f5efd60aa91d +size 41425 diff --git a/UnrealProject/Lost_Edge/Content/Levels/Level_3/Actors/TechnicalRoom/Materials/M_Level3_TechnicalRoom_Cable_Color.uasset b/UnrealProject/Lost_Edge/Content/Levels/Level_3/Actors/TechnicalRoom/Materials/M_Level3_TechnicalRoom_Cable_Color.uasset new file mode 100644 index 0000000..4369449 --- /dev/null +++ b/UnrealProject/Lost_Edge/Content/Levels/Level_3/Actors/TechnicalRoom/Materials/M_Level3_TechnicalRoom_Cable_Color.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:930d5cfd50118f64653db1f9401aba7a433a6e6d0a642d5ac368688d0a28767d +size 11856 diff --git a/UnrealProject/Lost_Edge/Content/Levels/Level_3/Actors/TechnicalRoom/Materials/M_Level3_TechnicalRoom_Port_Color.uasset b/UnrealProject/Lost_Edge/Content/Levels/Level_3/Actors/TechnicalRoom/Materials/M_Level3_TechnicalRoom_Port_Color.uasset new file mode 100644 index 0000000..a75000c --- /dev/null +++ b/UnrealProject/Lost_Edge/Content/Levels/Level_3/Actors/TechnicalRoom/Materials/M_Level3_TechnicalRoom_Port_Color.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d37b8b7596c398a3ca2aba71a5d624e0d2f063cf8552d17746d0c92186181599 +size 11328 diff --git a/UnrealProject/Lost_Edge/Content/Levels/Level_3/Dialogue/DT_Dialogue_Level3_TechnicalRoom.uasset b/UnrealProject/Lost_Edge/Content/Levels/Level_3/Dialogue/DT_Dialogue_Level3_TechnicalRoom.uasset new file mode 100644 index 0000000..8a293bf --- /dev/null +++ b/UnrealProject/Lost_Edge/Content/Levels/Level_3/Dialogue/DT_Dialogue_Level3_TechnicalRoom.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b6476905a5a20c69e901ccdd5b0c0610c206fdcbc2b8b272e5c0eb97218545b5 +size 4280 diff --git a/UnrealProject/Lost_Edge/Content/Levels/Level_3/EventCodes/E_Level3_RoomCode.uasset b/UnrealProject/Lost_Edge/Content/Levels/Level_3/EventCodes/E_Level3_RoomCode.uasset new file mode 100644 index 0000000..256381b --- /dev/null +++ b/UnrealProject/Lost_Edge/Content/Levels/Level_3/EventCodes/E_Level3_RoomCode.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:fee8e3ed216434fda1bf25e3fc4f95897b89bbf008eae40b1073f8975abbdb91 +size 1839 diff --git a/UnrealProject/Lost_Edge/Content/Levels/Level_3/EventCodes/E_Level3_TechnicalRoom_Event.uasset b/UnrealProject/Lost_Edge/Content/Levels/Level_3/EventCodes/E_Level3_TechnicalRoom_Event.uasset new file mode 100644 index 0000000..6016b7f --- /dev/null +++ b/UnrealProject/Lost_Edge/Content/Levels/Level_3/EventCodes/E_Level3_TechnicalRoom_Event.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:31c08ac04b22c659bf482fdaeedc8751f35cfeb55bdbe788964b5a0846af2ee4 +size 2940 diff --git a/UnrealProject/Lost_Edge/Content/Levels/Level_3/L_Level3.umap b/UnrealProject/Lost_Edge/Content/Levels/Level_3/L_Level3.umap index 696a0f9..a39b423 100644 --- a/UnrealProject/Lost_Edge/Content/Levels/Level_3/L_Level3.umap +++ b/UnrealProject/Lost_Edge/Content/Levels/Level_3/L_Level3.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8f80e00a14ffbe0a4df0af69c2d3b1a097158df8de8f04484420a4869f932d48 -size 675848 +oid sha256:20182cc037fa3b2999a7801b2d8015be78ef60d0d2e8158cda72a78b74542a50 +size 1641059 diff --git a/UnrealProject/Lost_Edge/Content/Levels/Level_3/L_Level3_BuiltData.uasset b/UnrealProject/Lost_Edge/Content/Levels/Level_3/L_Level3_BuiltData.uasset index b83418e..4b273a6 100644 --- a/UnrealProject/Lost_Edge/Content/Levels/Level_3/L_Level3_BuiltData.uasset +++ b/UnrealProject/Lost_Edge/Content/Levels/Level_3/L_Level3_BuiltData.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:599048971918cf0d26d2a15ac48e08bf57211b1ff6cb3c86494e9f0ef83b5216 -size 225154 +oid sha256:d3ed42fa26a688051aded3424f342c55344aaf1d5dd3c38bb3e67e079a292033 +size 308225 diff --git a/UnrealProject/Lost_Edge/Content/Levels/Level_3/Materials/M_Level3_Fence.uasset b/UnrealProject/Lost_Edge/Content/Levels/Level_3/Materials/M_Level3_Fence.uasset index 1ae9abf..6996edf 100644 --- a/UnrealProject/Lost_Edge/Content/Levels/Level_3/Materials/M_Level3_Fence.uasset +++ b/UnrealProject/Lost_Edge/Content/Levels/Level_3/Materials/M_Level3_Fence.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6e990c1e2a2539985740805702ec02f16a225b66430be65f10cb5a20353bbdbf -size 16955 +oid sha256:41ac9bc83da1a89dc861393dea7b2b3528afd23a37c4e8328a3228f3c6ac3f97 +size 17355 diff --git a/UnrealProject/Lost_Edge/Content/Levels/Level_3/Materials/M_Level3_LedRed1.uasset b/UnrealProject/Lost_Edge/Content/Levels/Level_3/Materials/M_Level3_LedRed1.uasset index c40ae22..c850dc2 100644 --- a/UnrealProject/Lost_Edge/Content/Levels/Level_3/Materials/M_Level3_LedRed1.uasset +++ b/UnrealProject/Lost_Edge/Content/Levels/Level_3/Materials/M_Level3_LedRed1.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a738515c66ce0442f9f926e9b5807325270b66c2144738eebd3b6931fd2c3b87 -size 12381 +oid sha256:b45978f71499404f50e5189feac62a983892bc7dab7bee20d23a0ab55ed257b6 +size 12802 diff --git a/UnrealProject/Lost_Edge/Content/Levels/Level_3/Materials/M_Level3_PurpleLiquid.uasset b/UnrealProject/Lost_Edge/Content/Levels/Level_3/Materials/M_Level3_PurpleLiquid.uasset index e1e2499..472a4cd 100644 --- a/UnrealProject/Lost_Edge/Content/Levels/Level_3/Materials/M_Level3_PurpleLiquid.uasset +++ b/UnrealProject/Lost_Edge/Content/Levels/Level_3/Materials/M_Level3_PurpleLiquid.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c245e9b9c65450b4fb09411c1af96ebe8da941eb2abd70af47f261605bc70db0 -size 12610 +oid sha256:41ab2964ec69159e44c221541a8715088fefd1f7c6adb184575a95309ced8f6f +size 13031 diff --git a/UnrealProject/Lost_Edge/Content/Levels/Level_3/Materials/M_Level3_TechnicalRoom_Light.uasset b/UnrealProject/Lost_Edge/Content/Levels/Level_3/Materials/M_Level3_TechnicalRoom_Light.uasset new file mode 100644 index 0000000..372d46e --- /dev/null +++ b/UnrealProject/Lost_Edge/Content/Levels/Level_3/Materials/M_Level3_TechnicalRoom_Light.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:81e2fc6ee677d35bd6e4bd16b4312e8858b0d23d13f96293ceecbccc24efabfc +size 1723 diff --git a/UnrealProject/Lost_Edge/Content/Levels/Level_3/Materials/TechnicalRoom/MI_Level3_TechnicalRoom_BlinkDisplay.uasset b/UnrealProject/Lost_Edge/Content/Levels/Level_3/Materials/TechnicalRoom/MI_Level3_TechnicalRoom_BlinkDisplay.uasset new file mode 100644 index 0000000..6825cb3 --- /dev/null +++ b/UnrealProject/Lost_Edge/Content/Levels/Level_3/Materials/TechnicalRoom/MI_Level3_TechnicalRoom_BlinkDisplay.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:059afa99c994ac2e3866eaef5456f9eca08dcf6bfe4b65401999dd132b60dc6b +size 9898 diff --git a/UnrealProject/Lost_Edge/Content/Levels/Level_3/Materials/TechnicalRoom/MPC_Level3_TechnicalRoomLampsLight.uasset b/UnrealProject/Lost_Edge/Content/Levels/Level_3/Materials/TechnicalRoom/MPC_Level3_TechnicalRoomLampsLight.uasset new file mode 100644 index 0000000..81c893f --- /dev/null +++ b/UnrealProject/Lost_Edge/Content/Levels/Level_3/Materials/TechnicalRoom/MPC_Level3_TechnicalRoomLampsLight.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6c352e266d83bf8acf2bfdb00e5043d60581ea93c97283b8af66466c933cd5fd +size 1852 diff --git a/UnrealProject/Lost_Edge/Content/Levels/Level_3/Materials/TechnicalRoom/MPC_Level3_TechnicalRoom_LightLamps.uasset b/UnrealProject/Lost_Edge/Content/Levels/Level_3/Materials/TechnicalRoom/MPC_Level3_TechnicalRoom_LightLamps.uasset new file mode 100644 index 0000000..4c5d576 --- /dev/null +++ b/UnrealProject/Lost_Edge/Content/Levels/Level_3/Materials/TechnicalRoom/MPC_Level3_TechnicalRoom_LightLamps.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:620b75c926cd35109ef784e046dfbfd1b64a45be69f57af7704d336a48312320 +size 1998 diff --git a/UnrealProject/Lost_Edge/Content/Levels/Level_3/Materials/TechnicalRoom/MPC_Level3_TechnicalRoom_LightTechnics.uasset b/UnrealProject/Lost_Edge/Content/Levels/Level_3/Materials/TechnicalRoom/MPC_Level3_TechnicalRoom_LightTechnics.uasset new file mode 100644 index 0000000..4042e94 --- /dev/null +++ b/UnrealProject/Lost_Edge/Content/Levels/Level_3/Materials/TechnicalRoom/MPC_Level3_TechnicalRoom_LightTechnics.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b41389671aa72d7a3af5864f56ade656c99347a26db3f1a568a18a6589d59bc9 +size 2013 diff --git a/UnrealProject/Lost_Edge/Content/Levels/Level_3/Materials/TechnicalRoom/M_Level3_TechnicalRoom_LightLamps.uasset b/UnrealProject/Lost_Edge/Content/Levels/Level_3/Materials/TechnicalRoom/M_Level3_TechnicalRoom_LightLamps.uasset new file mode 100644 index 0000000..ba9f7c7 --- /dev/null +++ b/UnrealProject/Lost_Edge/Content/Levels/Level_3/Materials/TechnicalRoom/M_Level3_TechnicalRoom_LightLamps.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:534951ab809e09a48af94ccae720a6fe0814d9ccfcc13b04de1c246765954127 +size 14648 diff --git a/UnrealProject/Lost_Edge/Content/Levels/Level_3/Materials/TechnicalRoom/M_Level3_TechnicalRoom_LightTechnics.uasset b/UnrealProject/Lost_Edge/Content/Levels/Level_3/Materials/TechnicalRoom/M_Level3_TechnicalRoom_LightTechnics.uasset new file mode 100644 index 0000000..a8c466f --- /dev/null +++ b/UnrealProject/Lost_Edge/Content/Levels/Level_3/Materials/TechnicalRoom/M_Level3_TechnicalRoom_LightTechnics.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ee23ec35253b2dd72d211511e324094f4d50e7ac29eb30fef2ffa3cc904ebdca +size 14672 diff --git a/UnrealProject/Lost_Edge/Content/Levels/Level_3/Models/SM_Level3_TechnicalRoom_Stage2_Box1.uasset b/UnrealProject/Lost_Edge/Content/Levels/Level_3/Models/SM_Level3_TechnicalRoom_Stage2_Box1.uasset new file mode 100644 index 0000000..f7d85bb --- /dev/null +++ b/UnrealProject/Lost_Edge/Content/Levels/Level_3/Models/SM_Level3_TechnicalRoom_Stage2_Box1.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1b83e81c53819898cafeb1d446bd894d629081a3af089ac5ef119067aa040ef0 +size 48023 diff --git a/UnrealProject/Lost_Edge/Content/Levels/Level_3/Models/SM_Level3_TechnicalRoom_Stage2_Box2.uasset b/UnrealProject/Lost_Edge/Content/Levels/Level_3/Models/SM_Level3_TechnicalRoom_Stage2_Box2.uasset new file mode 100644 index 0000000..973cfb8 --- /dev/null +++ b/UnrealProject/Lost_Edge/Content/Levels/Level_3/Models/SM_Level3_TechnicalRoom_Stage2_Box2.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9d298ae76cddad9ca8fa9a6a40316976b0b941db46e05b30e74c83d12b3ed87f +size 40504 diff --git a/UnrealProject/Lost_Edge/Content/Levels/Level_3/Models/SM_SM_Level3_TechnicalRoom_Stage2_Box1.uasset b/UnrealProject/Lost_Edge/Content/Levels/Level_3/Models/SM_SM_Level3_TechnicalRoom_Stage2_Box1.uasset new file mode 100644 index 0000000..63fad53 --- /dev/null +++ b/UnrealProject/Lost_Edge/Content/Levels/Level_3/Models/SM_SM_Level3_TechnicalRoom_Stage2_Box1.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e1efae3a4653532a1026accd3380fd7f518b55ba55b2d2f51b45ee9cc38c72e5 +size 1770 diff --git a/UnrealProject/Lost_Edge/Content/Levels/Level_3/Sequences/Seq_Level3_TechnicalRoom_Stage2Open.uasset b/UnrealProject/Lost_Edge/Content/Levels/Level_3/Sequences/Seq_Level3_TechnicalRoom_Stage2Open.uasset new file mode 100644 index 0000000..a6517c5 --- /dev/null +++ b/UnrealProject/Lost_Edge/Content/Levels/Level_3/Sequences/Seq_Level3_TechnicalRoom_Stage2Open.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:15ec7d9b8bdb3573c69127a2a1b8996c71afa327909b1cf6913c0d16261cb883 +size 21335 diff --git a/UnrealProject/Lost_Edge/Content/Levels/Level_3/Sequences/Seq_Level3_TechnicalRoom_Stage3Advance1.uasset b/UnrealProject/Lost_Edge/Content/Levels/Level_3/Sequences/Seq_Level3_TechnicalRoom_Stage3Advance1.uasset new file mode 100644 index 0000000..0cefab4 --- /dev/null +++ b/UnrealProject/Lost_Edge/Content/Levels/Level_3/Sequences/Seq_Level3_TechnicalRoom_Stage3Advance1.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a513b29b8014f4e66be5cb54b813946d7309214d96ade4c8ccb8654ae948ca73 +size 19973 diff --git a/UnrealProject/Lost_Edge/Content/Levels/Level_3/Sequences/Seq_Level3_TechnicalRoom_Stage3Advance2.uasset b/UnrealProject/Lost_Edge/Content/Levels/Level_3/Sequences/Seq_Level3_TechnicalRoom_Stage3Advance2.uasset new file mode 100644 index 0000000..61e9c4f --- /dev/null +++ b/UnrealProject/Lost_Edge/Content/Levels/Level_3/Sequences/Seq_Level3_TechnicalRoom_Stage3Advance2.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:93dc3b69e71fd5fc3277be7f8377f6dbaa20722254d7b282e18a77be8e31d14f +size 20467 diff --git a/UnrealProject/Lost_Edge/Content/Levels/Level_3/Sequences/Seq_Level3_TechnicalRoom_Stage3Open.uasset b/UnrealProject/Lost_Edge/Content/Levels/Level_3/Sequences/Seq_Level3_TechnicalRoom_Stage3Open.uasset new file mode 100644 index 0000000..8f67897 --- /dev/null +++ b/UnrealProject/Lost_Edge/Content/Levels/Level_3/Sequences/Seq_Level3_TechnicalRoom_Stage3Open.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:db11afcd90d0b71593525f439581f9cbe57d7de98695e3f5fc046be3c7eaaffb +size 15813 diff --git a/UnrealProject/Lost_Edge/Content/MaterialsLibrary/Colors/M_Color_BlackSoft.uasset b/UnrealProject/Lost_Edge/Content/MaterialsLibrary/Colors/M_Color_BlackSoft.uasset new file mode 100644 index 0000000..6ff171d --- /dev/null +++ b/UnrealProject/Lost_Edge/Content/MaterialsLibrary/Colors/M_Color_BlackSoft.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5295e3ba145b37892613b0320e0d75c1ac0fc174ff98688229e77db64a707ab9 +size 11259 diff --git a/UnrealProject/Lost_Edge/Content/MaterialsLibrary/Colors/M_Color_RedBasalt.uasset b/UnrealProject/Lost_Edge/Content/MaterialsLibrary/Colors/M_Color_RedBasalt.uasset new file mode 100644 index 0000000..0c0748e --- /dev/null +++ b/UnrealProject/Lost_Edge/Content/MaterialsLibrary/Colors/M_Color_RedBasalt.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4f80eaddc31fea02ee322f379f327cfe515c27f9560e1335434141e8e3a51eda +size 10586 diff --git a/UnrealProject/Lost_Edge/Content/MaterialsLibrary/Colors/M_Color_RedRoyal.uasset b/UnrealProject/Lost_Edge/Content/MaterialsLibrary/Colors/M_Color_RedRoyal.uasset new file mode 100644 index 0000000..93f42ef --- /dev/null +++ b/UnrealProject/Lost_Edge/Content/MaterialsLibrary/Colors/M_Color_RedRoyal.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f624b3596a4976b9f783675bdd02100664d560046b2c6795a0b28f29933c42fc +size 10585 diff --git a/UnrealProject/Lost_Edge/Content/MaterialsLibrary/Colors/M_Color_White.uasset b/UnrealProject/Lost_Edge/Content/MaterialsLibrary/Colors/M_Color_White.uasset index aab96b0..1d46190 100644 --- a/UnrealProject/Lost_Edge/Content/MaterialsLibrary/Colors/M_Color_White.uasset +++ b/UnrealProject/Lost_Edge/Content/MaterialsLibrary/Colors/M_Color_White.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:72cb7e48f153eb71253123cd89d202a4e108e8261c0835e8acca9f4d99044f87 -size 12260 +oid sha256:4ff96c0d0f32e4cc5fd54714aa6175a6607dfe0a865e89c1f7b72b264cbec9cf +size 12626 diff --git a/UnrealProject/Lost_Edge/Content/MaterialsLibrary/M_BlinkColor.uasset b/UnrealProject/Lost_Edge/Content/MaterialsLibrary/M_BlinkColor.uasset new file mode 100644 index 0000000..99dd405 --- /dev/null +++ b/UnrealProject/Lost_Edge/Content/MaterialsLibrary/M_BlinkColor.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a35193c74c97af5ae4c6b1dc24e64fb2db1589dcc59a7621c5fdc21dc161cb46 +size 15866 diff --git a/UnrealProject/Lost_Edge/Content/MaterialsLibrary/M_InterestColor.uasset b/UnrealProject/Lost_Edge/Content/MaterialsLibrary/M_InterestColor.uasset new file mode 100644 index 0000000..e3d2020 --- /dev/null +++ b/UnrealProject/Lost_Edge/Content/MaterialsLibrary/M_InterestColor.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:66140f4eba7ecb2831eb4c9445ce20742c0c048c8d9c35fbd4a3dd3c57235fec +size 12264 diff --git a/UnrealProject/Lost_Edge/Content/MaterialsLibrary/Neons/M_Neon_Blue.uasset b/UnrealProject/Lost_Edge/Content/MaterialsLibrary/Neons/M_Neon_Blue.uasset new file mode 100644 index 0000000..3c65cbc --- /dev/null +++ b/UnrealProject/Lost_Edge/Content/MaterialsLibrary/Neons/M_Neon_Blue.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6caefe22962624c1b6595887b064c05c95b323fb2479062dad025a063543ac32 +size 12950 diff --git a/UnrealProject/Lost_Edge/Content/MaterialsLibrary/Neons/M_Neon_BlueLight.uasset b/UnrealProject/Lost_Edge/Content/MaterialsLibrary/Neons/M_Neon_BlueLight.uasset deleted file mode 100644 index 6962ff8..0000000 --- a/UnrealProject/Lost_Edge/Content/MaterialsLibrary/Neons/M_Neon_BlueLight.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:439332a7cf1bdbb634802157f369a1f5f5b2ec8fb9d5975e5792cd0f5061eb36 -size 12686 diff --git a/UnrealProject/Lost_Edge/Content/MaterialsLibrary/Neons/M_Neon_Blue_Scalar.uasset b/UnrealProject/Lost_Edge/Content/MaterialsLibrary/Neons/M_Neon_Blue_Scalar.uasset new file mode 100644 index 0000000..2e98f05 --- /dev/null +++ b/UnrealProject/Lost_Edge/Content/MaterialsLibrary/Neons/M_Neon_Blue_Scalar.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d3532cd66348a83501aaaac9804ff44cb76cfbba8e2bbe259ce74b954e825ac0 +size 14538 diff --git a/UnrealProject/Lost_Edge/Content/MaterialsLibrary/Neons/M_Neon_LightGreen.uasset b/UnrealProject/Lost_Edge/Content/MaterialsLibrary/Neons/M_Neon_LightGreen.uasset new file mode 100644 index 0000000..24164ce --- /dev/null +++ b/UnrealProject/Lost_Edge/Content/MaterialsLibrary/Neons/M_Neon_LightGreen.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d337393196a518b3bd8dbf82e06ed5c1ef68ff48d6ac03c30f07f2c910fef509 +size 12852 diff --git a/UnrealProject/Lost_Edge/Content/MaterialsLibrary/Neons/M_Neon_LightRedStrong.uasset b/UnrealProject/Lost_Edge/Content/MaterialsLibrary/Neons/M_Neon_LightRedStrong.uasset new file mode 100644 index 0000000..12b2052 --- /dev/null +++ b/UnrealProject/Lost_Edge/Content/MaterialsLibrary/Neons/M_Neon_LightRedStrong.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2bbc163e1aedcf9d77ba98685cf77b8336016d13e800d7685322a09b5cd06fb4 +size 12763 diff --git a/UnrealProject/Lost_Edge/Content/MaterialsLibrary/Neons/M_Neon_LightYellow.uasset b/UnrealProject/Lost_Edge/Content/MaterialsLibrary/Neons/M_Neon_LightYellow.uasset new file mode 100644 index 0000000..fe60cdb --- /dev/null +++ b/UnrealProject/Lost_Edge/Content/MaterialsLibrary/Neons/M_Neon_LightYellow.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a8b34615567ba74408998a9cea9871b8979388194b0238950f89c56109e1e49b +size 12763 diff --git a/UnrealProject/Lost_Edge/Content/MaterialsLibrary/Neons/M_Neon_Sun.uasset b/UnrealProject/Lost_Edge/Content/MaterialsLibrary/Neons/M_Neon_Sun.uasset new file mode 100644 index 0000000..4763643 --- /dev/null +++ b/UnrealProject/Lost_Edge/Content/MaterialsLibrary/Neons/M_Neon_Sun.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7c415e6864f1b90ff9dcdeae6420f307d86536cd77e7ce2f256e6ff130664a7f +size 12588 diff --git a/UnrealProject/Lost_Edge/Content/Models/Decorations/Cables/Materials/M_Cables1.uasset b/UnrealProject/Lost_Edge/Content/Models/Decorations/Cables/Materials/M_Cables1.uasset index 29783ff..6dc5572 100644 --- a/UnrealProject/Lost_Edge/Content/Models/Decorations/Cables/Materials/M_Cables1.uasset +++ b/UnrealProject/Lost_Edge/Content/Models/Decorations/Cables/Materials/M_Cables1.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4a81a038bf07cd49bf79e1ed65c84b409d7b092b809ae566ea22266468b80428 -size 12063 +oid sha256:5cdd5090e5f662cb2a71a0acd9ffbf706e32403c768ec78aa81153253c559a75 +size 12120 diff --git a/UnrealProject/Lost_Edge/Content/Models/Decorations/SMA_SecurityCamera/M_Color_White.uasset b/UnrealProject/Lost_Edge/Content/Models/Decorations/SMA_SecurityCamera/M_Color_White.uasset new file mode 100644 index 0000000..3efb7fe --- /dev/null +++ b/UnrealProject/Lost_Edge/Content/Models/Decorations/SMA_SecurityCamera/M_Color_White.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ee32b12d33c770b7c8067c4b7968dec4872cd619c194cf2906253421c9d00a39 +size 1267 diff --git a/UnrealProject/Lost_Edge/Content/Models/Decorations/SMA_SecurityCamera/SM_SecurityCamera_Cam.uasset b/UnrealProject/Lost_Edge/Content/Models/Decorations/SMA_SecurityCamera/SM_SecurityCamera_Cam.uasset new file mode 100644 index 0000000..ebf6ed5 --- /dev/null +++ b/UnrealProject/Lost_Edge/Content/Models/Decorations/SMA_SecurityCamera/SM_SecurityCamera_Cam.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4e090bf5575b6aa1e53702391b954db040778167f06039c3c9b2fa5459b01efc +size 64406 diff --git a/UnrealProject/Lost_Edge/Content/Models/Decorations/SMA_SecurityCamera/SM_SecurityCamera_Stand.uasset b/UnrealProject/Lost_Edge/Content/Models/Decorations/SMA_SecurityCamera/SM_SecurityCamera_Stand.uasset new file mode 100644 index 0000000..da5bc1d --- /dev/null +++ b/UnrealProject/Lost_Edge/Content/Models/Decorations/SMA_SecurityCamera/SM_SecurityCamera_Stand.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:cc3de379012a5c8ec4e8f91bf78e27a2fbddf24ebb4cf28f18d9fe890c821682 +size 58869 diff --git a/UnrealProject/Lost_Edge/Content/Models/Marketplace/Furniture_Free/SM_fridge_001.uasset b/UnrealProject/Lost_Edge/Content/Models/Marketplace/Furniture_Free/SM_fridge_001.uasset index 1f9246f..097e198 100644 --- a/UnrealProject/Lost_Edge/Content/Models/Marketplace/Furniture_Free/SM_fridge_001.uasset +++ b/UnrealProject/Lost_Edge/Content/Models/Marketplace/Furniture_Free/SM_fridge_001.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0c4ca33afb662b959c406bb7f3abdee8a10d09d2ad6849e4f55adc63154f2fa6 -size 22586 +oid sha256:b0837c0c24769671eeee44428a7bc61cbc53d2ab4783ad667fe8343b4fdd7971 +size 21118 diff --git a/UnrealProject/Lost_Edge/Content/Models/Marketplace/LPGenericPropsSet02/Mixed/SM_CDSet01.uasset b/UnrealProject/Lost_Edge/Content/Models/Marketplace/LPGenericPropsSet02/Mixed/SM_CDSet01.uasset index 0184836..adb809b 100644 --- a/UnrealProject/Lost_Edge/Content/Models/Marketplace/LPGenericPropsSet02/Mixed/SM_CDSet01.uasset +++ b/UnrealProject/Lost_Edge/Content/Models/Marketplace/LPGenericPropsSet02/Mixed/SM_CDSet01.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:bddc734311e2a2669034d88fde9aa713cc50c08ea9c51515ae8ea309d559b3f1 -size 97024 +oid sha256:94195046e7be607daaac2cdaa75928216934fb62cb4c0fcde52a4a57ed5b47d2 +size 95177 diff --git a/UnrealProject/Lost_Edge/Content/Models/Marketplace/LPGenericPropsSet02/Pipe/SM_PipeSet01BaseSize1000.uasset b/UnrealProject/Lost_Edge/Content/Models/Marketplace/LPGenericPropsSet02/Pipe/SM_PipeSet01BaseSize1000.uasset index b765493..0570b24 100644 --- a/UnrealProject/Lost_Edge/Content/Models/Marketplace/LPGenericPropsSet02/Pipe/SM_PipeSet01BaseSize1000.uasset +++ b/UnrealProject/Lost_Edge/Content/Models/Marketplace/LPGenericPropsSet02/Pipe/SM_PipeSet01BaseSize1000.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c46694fb079ff73f9c1f4cb2f4a235c6631c3fe8f70259ce3a3c54d566f74b26 -size 33564 +oid sha256:ec2a4500bbd6b70183f4a028174d4b6f936c13bc852d2c72564b9d90cf98b50c +size 32258 diff --git a/UnrealProject/Lost_Edge/Content/Models/Marketplace/LPGenericPropsSet02/Pipe/SM_PipeSet02BaseSize350.uasset b/UnrealProject/Lost_Edge/Content/Models/Marketplace/LPGenericPropsSet02/Pipe/SM_PipeSet02BaseSize350.uasset index 73a896e..e78d829 100644 --- a/UnrealProject/Lost_Edge/Content/Models/Marketplace/LPGenericPropsSet02/Pipe/SM_PipeSet02BaseSize350.uasset +++ b/UnrealProject/Lost_Edge/Content/Models/Marketplace/LPGenericPropsSet02/Pipe/SM_PipeSet02BaseSize350.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2aebb8b5d11f1a72582a655a3aaa2bd164584ae3d450ea083966bb2291f95a92 -size 46706 +oid sha256:fee5ded7311e00890c9eb0b3ce1eff425f5a5e8942492eed976ffef2fe554579 +size 49198 diff --git a/UnrealProject/Lost_Edge/Content/Models/Marketplace/LPGenericPropsSet02/Pipe/SM_PipeSet02ClampSize350.uasset b/UnrealProject/Lost_Edge/Content/Models/Marketplace/LPGenericPropsSet02/Pipe/SM_PipeSet02ClampSize350.uasset index 6b877c4..89fcdae 100644 --- a/UnrealProject/Lost_Edge/Content/Models/Marketplace/LPGenericPropsSet02/Pipe/SM_PipeSet02ClampSize350.uasset +++ b/UnrealProject/Lost_Edge/Content/Models/Marketplace/LPGenericPropsSet02/Pipe/SM_PipeSet02ClampSize350.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d2e929404047ef759d95ed5de66337bb917926d52ccb0f3398e224bf6057fdbb -size 82515 +oid sha256:e2d055320e560c8214cb75ca1db86817a05dfed6c7e43deb11e8b0c430d0a357 +size 80086 diff --git a/UnrealProject/Lost_Edge/Content/Models/Marketplace/LPGenericPropsSet02/Shelf/SM_ShelfSet02.uasset b/UnrealProject/Lost_Edge/Content/Models/Marketplace/LPGenericPropsSet02/Shelf/SM_ShelfSet02.uasset index 22c881b..319179d 100644 --- a/UnrealProject/Lost_Edge/Content/Models/Marketplace/LPGenericPropsSet02/Shelf/SM_ShelfSet02.uasset +++ b/UnrealProject/Lost_Edge/Content/Models/Marketplace/LPGenericPropsSet02/Shelf/SM_ShelfSet02.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c7c92c75ff1d40e1fc56284c846560159776503b6d174bd4aad1480ba1da8782 -size 50419 +oid sha256:b5b9d4e4e26f94c24952941556a3c969f2b1433c94269aba3a1ac769c6cfac00 +size 49729 diff --git a/UnrealProject/Lost_Edge/Content/Models/Marketplace/LPGenericPropsSet02/Shelf/SM_ShelfSet12.uasset b/UnrealProject/Lost_Edge/Content/Models/Marketplace/LPGenericPropsSet02/Shelf/SM_ShelfSet12.uasset index 0d5fe98..e57dd53 100644 --- a/UnrealProject/Lost_Edge/Content/Models/Marketplace/LPGenericPropsSet02/Shelf/SM_ShelfSet12.uasset +++ b/UnrealProject/Lost_Edge/Content/Models/Marketplace/LPGenericPropsSet02/Shelf/SM_ShelfSet12.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:00ed5b92fb22eaffc3b81911e76aee7fe417535be35ff543331dbb30e1b70a50 -size 39561 +oid sha256:6917d424c68bc7c714b276fa72e61e57b888d83d07c837db3222702ae260cc2d +size 38900 diff --git a/UnrealProject/Lost_Edge/Content/Models/Marketplace/LowPolyOffice/Materials/M_BinColor.uasset b/UnrealProject/Lost_Edge/Content/Models/Marketplace/LowPolyOffice/Materials/M_BinColor.uasset index 568ac70..816d751 100644 --- a/UnrealProject/Lost_Edge/Content/Models/Marketplace/LowPolyOffice/Materials/M_BinColor.uasset +++ b/UnrealProject/Lost_Edge/Content/Models/Marketplace/LowPolyOffice/Materials/M_BinColor.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:13cffa4055789676a332e76e6f0507292801e744083940577bf7c4e15d289cad -size 52667 +oid sha256:2d0353dff6710ef370b7a2db87cfc618040c9b9ac0961614a3f438e0d8b09f47 +size 52724 diff --git a/UnrealProject/Lost_Edge/Content/Models/Marketplace/LowPolyOffice/Materials/M_Calendar.uasset b/UnrealProject/Lost_Edge/Content/Models/Marketplace/LowPolyOffice/Materials/M_Calendar.uasset index cb5e434..f0bafe2 100644 --- a/UnrealProject/Lost_Edge/Content/Models/Marketplace/LowPolyOffice/Materials/M_Calendar.uasset +++ b/UnrealProject/Lost_Edge/Content/Models/Marketplace/LowPolyOffice/Materials/M_Calendar.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:183a51ae92b38ed206882dac2c30227c4e2e453adacad370cf57ad969983ef58 -size 53251 +oid sha256:4148c92bcd2f5f613dbf24bae041673f6b784f17e55c39835efa5224adea4a79 +size 53308 diff --git a/UnrealProject/Lost_Edge/Content/Models/Marketplace/LowPolyOffice/Materials/M_CalenderFont.uasset b/UnrealProject/Lost_Edge/Content/Models/Marketplace/LowPolyOffice/Materials/M_CalenderFont.uasset index 204c96f..7d36db9 100644 --- a/UnrealProject/Lost_Edge/Content/Models/Marketplace/LowPolyOffice/Materials/M_CalenderFont.uasset +++ b/UnrealProject/Lost_Edge/Content/Models/Marketplace/LowPolyOffice/Materials/M_CalenderFont.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:bbc998adef4a44ade29bf3f829c27b4edeac434aaa862bf4cc4ed2e7510e579e -size 51940 +oid sha256:7746c28e85263180697f8447284fba75bf3e8ff5f5fe6664ea4f690bdddc5cef +size 51997 diff --git a/UnrealProject/Lost_Edge/Content/Models/Marketplace/LowPolyOffice/Materials/M_CalenderPaper.uasset b/UnrealProject/Lost_Edge/Content/Models/Marketplace/LowPolyOffice/Materials/M_CalenderPaper.uasset index adb791c..48582bf 100644 --- a/UnrealProject/Lost_Edge/Content/Models/Marketplace/LowPolyOffice/Materials/M_CalenderPaper.uasset +++ b/UnrealProject/Lost_Edge/Content/Models/Marketplace/LowPolyOffice/Materials/M_CalenderPaper.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:73375902248dd1df1ee5e4dab19da4a64b1bbf3a44c6a3a85c35905df81eac1c -size 53652 +oid sha256:b15db18ce206989de0f569654950550b908a571e58b5954433e436bd94048040 +size 53709 diff --git a/UnrealProject/Lost_Edge/Content/Models/Marketplace/LowPolyOffice/Materials/M_EraserBlue.uasset b/UnrealProject/Lost_Edge/Content/Models/Marketplace/LowPolyOffice/Materials/M_EraserBlue.uasset index 9fe6ebe..76afdd3 100644 --- a/UnrealProject/Lost_Edge/Content/Models/Marketplace/LowPolyOffice/Materials/M_EraserBlue.uasset +++ b/UnrealProject/Lost_Edge/Content/Models/Marketplace/LowPolyOffice/Materials/M_EraserBlue.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:50b6f992a75cbdbf98d9604a6bf77d1d30679322a19214bb7205adf4a1149b25 -size 53726 +oid sha256:c7c55d514be7a23e8ff2fb9d008e432df068e57d2cb400d064ad8b8986ca2bc8 +size 53783 diff --git a/UnrealProject/Lost_Edge/Content/Models/Marketplace/LowPolyOffice/Materials/M_EraserPink.uasset b/UnrealProject/Lost_Edge/Content/Models/Marketplace/LowPolyOffice/Materials/M_EraserPink.uasset index 8f29911..75eb8a6 100644 --- a/UnrealProject/Lost_Edge/Content/Models/Marketplace/LowPolyOffice/Materials/M_EraserPink.uasset +++ b/UnrealProject/Lost_Edge/Content/Models/Marketplace/LowPolyOffice/Materials/M_EraserPink.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e309ee5862633190286d7564607dcdd079f378bb59c7da557d4e5fafdc72bbab -size 53484 +oid sha256:e9ad2dae65425039be56cee630ed95d63af3a159b28fc83bbb8e9677f2f73fbb +size 53541 diff --git a/UnrealProject/Lost_Edge/Content/Models/Marketplace/LowPolyOffice/SM_Bin.uasset b/UnrealProject/Lost_Edge/Content/Models/Marketplace/LowPolyOffice/SM_Bin.uasset index 37d477f..e289df5 100644 --- a/UnrealProject/Lost_Edge/Content/Models/Marketplace/LowPolyOffice/SM_Bin.uasset +++ b/UnrealProject/Lost_Edge/Content/Models/Marketplace/LowPolyOffice/SM_Bin.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:54624c000e266bb6efdd3c6cbd4010f654af9631cf22d7a83ffeb73e3b71a2a5 -size 109436 +oid sha256:161077f3e01fd9771a9c13db4087968a8aec530f71d74002f06ce6ab7fb600ea +size 108450 diff --git a/UnrealProject/Lost_Edge/Content/Models/Marketplace/LowPolyOffice/SM_Calendar.uasset b/UnrealProject/Lost_Edge/Content/Models/Marketplace/LowPolyOffice/SM_Calendar.uasset index 2bd0db5..8345a61 100644 --- a/UnrealProject/Lost_Edge/Content/Models/Marketplace/LowPolyOffice/SM_Calendar.uasset +++ b/UnrealProject/Lost_Edge/Content/Models/Marketplace/LowPolyOffice/SM_Calendar.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ed02a7240511bf76782aed2e75b3a272142d850022c3bd5dd71b9549c07b77d2 -size 294900 +oid sha256:232709f799b4831903ecad1f8a477351299c538a118726d88a1b022f72c623ad +size 292908 diff --git a/UnrealProject/Lost_Edge/Content/Models/Marketplace/LowPolyOffice/SM_Eraser.uasset b/UnrealProject/Lost_Edge/Content/Models/Marketplace/LowPolyOffice/SM_Eraser.uasset index 7ebdb81..b2285e1 100644 --- a/UnrealProject/Lost_Edge/Content/Models/Marketplace/LowPolyOffice/SM_Eraser.uasset +++ b/UnrealProject/Lost_Edge/Content/Models/Marketplace/LowPolyOffice/SM_Eraser.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:03e9d7776c77ed803382b3a6520fec4d2bd0ee4bfe8bdb724a3a7eb9ba4f37f4 -size 62760 +oid sha256:82102dc036f14b18b2150f7bad1c9f4df16fb2de0c9792fc2108c1c842776500 +size 62013 diff --git a/UnrealProject/Lost_Edge/Content/Models/Marketplace/LowPolyServerRoom/SM_Keyboard.uasset b/UnrealProject/Lost_Edge/Content/Models/Marketplace/LowPolyServerRoom/SM_Keyboard.uasset index 47e7f39..af86e3b 100644 --- a/UnrealProject/Lost_Edge/Content/Models/Marketplace/LowPolyServerRoom/SM_Keyboard.uasset +++ b/UnrealProject/Lost_Edge/Content/Models/Marketplace/LowPolyServerRoom/SM_Keyboard.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e6c20fec7648902df6e781f988137841777b9e3c8a90a0a32034454179d109b3 -size 75646 +oid sha256:7876925a2056eb20338e7fcff701102262a2590566ccaf2843d0bbf98b3c2b89 +size 75481 diff --git a/UnrealProject/Lost_Edge/Content/Models/Marketplace/LowPolyServerRoom/SM_box.uasset b/UnrealProject/Lost_Edge/Content/Models/Marketplace/LowPolyServerRoom/SM_box.uasset index 3f1c0ae..024f5de 100644 --- a/UnrealProject/Lost_Edge/Content/Models/Marketplace/LowPolyServerRoom/SM_box.uasset +++ b/UnrealProject/Lost_Edge/Content/Models/Marketplace/LowPolyServerRoom/SM_box.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5a7a663afe6347f6fcdc611dcc5e693d0a8f755f84d2e41523741f289c8791fa -size 61554 +oid sha256:d4fe31852d699ec32ad7f6b63c09354b8e78c5082c0a45233708b733640eeec9 +size 61044 diff --git a/UnrealProject/Lost_Edge/Content/Models/Marketplace/LowPolyServerRoom/SM_chair.uasset b/UnrealProject/Lost_Edge/Content/Models/Marketplace/LowPolyServerRoom/SM_chair.uasset index b4d4cf3..0cc951d 100644 --- a/UnrealProject/Lost_Edge/Content/Models/Marketplace/LowPolyServerRoom/SM_chair.uasset +++ b/UnrealProject/Lost_Edge/Content/Models/Marketplace/LowPolyServerRoom/SM_chair.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:db97c1caf656d514e4c58142e4336395ce7b3f8673d603ed3532afb81c6bbf8c -size 74480 +oid sha256:cb1a82c6b0611a205540eb1284e13f58ea5125ff0a4d6ac5f5c07ea48d453b72 +size 79302 diff --git a/UnrealProject/Lost_Edge/Content/Models/Marketplace/LowPolyServerRoom/SM_desk.uasset b/UnrealProject/Lost_Edge/Content/Models/Marketplace/LowPolyServerRoom/SM_desk.uasset index 56b9a08..5d4c977 100644 --- a/UnrealProject/Lost_Edge/Content/Models/Marketplace/LowPolyServerRoom/SM_desk.uasset +++ b/UnrealProject/Lost_Edge/Content/Models/Marketplace/LowPolyServerRoom/SM_desk.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:086f3bc95fd191cc6ba97e2ecf427513b8314b09f7f643485450fb2545d3b658 -size 61528 +oid sha256:76f3a998bcc0cc636d8e21825f3b3fe07749407195376cb461e440b97b2ff7b3 +size 61464 diff --git a/UnrealProject/Lost_Edge/Content/Models/Marketplace/LowPolyServerRoom/SM_display.uasset b/UnrealProject/Lost_Edge/Content/Models/Marketplace/LowPolyServerRoom/SM_display.uasset index 5ffc296..6806737 100644 --- a/UnrealProject/Lost_Edge/Content/Models/Marketplace/LowPolyServerRoom/SM_display.uasset +++ b/UnrealProject/Lost_Edge/Content/Models/Marketplace/LowPolyServerRoom/SM_display.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:171904baad9856d07493e534c307f0bffb07ae74cd8c8f86cc275728c465003e -size 65346 +oid sha256:9ba35b1693ed46c14f7b0d42396e5e623ac788a3c69860c4c3b80106ccb16048 +size 63956 diff --git a/UnrealProject/Lost_Edge/Content/Models/Marketplace/LowPolyServerRoom/SM_display_001.uasset b/UnrealProject/Lost_Edge/Content/Models/Marketplace/LowPolyServerRoom/SM_display_001.uasset deleted file mode 100644 index 90871b5..0000000 --- a/UnrealProject/Lost_Edge/Content/Models/Marketplace/LowPolyServerRoom/SM_display_001.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:bdb65a0aa59131e4bebeddbc831e7f312a439a32f63d840a709bf77927c68860 -size 65742 diff --git a/UnrealProject/Lost_Edge/Content/Models/Marketplace/LowPolyServerRoom/SM_display_004.uasset b/UnrealProject/Lost_Edge/Content/Models/Marketplace/LowPolyServerRoom/SM_display_004.uasset index 04c60d6..4ccc01c 100644 --- a/UnrealProject/Lost_Edge/Content/Models/Marketplace/LowPolyServerRoom/SM_display_004.uasset +++ b/UnrealProject/Lost_Edge/Content/Models/Marketplace/LowPolyServerRoom/SM_display_004.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:74c531d163989a2653c2bba15c6108094b057641775da51bf0bb2bc2c8b2b566 -size 60416 +oid sha256:5a598eea1b4ed31c755aa6022160e00adb1ba36bba0b4ce767565091ee113ca4 +size 58662 diff --git a/UnrealProject/Lost_Edge/Content/Models/Marketplace/LowPolyServerRoom/SM_mouse.uasset b/UnrealProject/Lost_Edge/Content/Models/Marketplace/LowPolyServerRoom/SM_mouse.uasset index 1b20655..da0ca87 100644 --- a/UnrealProject/Lost_Edge/Content/Models/Marketplace/LowPolyServerRoom/SM_mouse.uasset +++ b/UnrealProject/Lost_Edge/Content/Models/Marketplace/LowPolyServerRoom/SM_mouse.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0bb7189d166d3120431296dd15d22eff55c64b095eb330812e37e5a6bc450b03 -size 58218 +oid sha256:1f1d9eac3bff1e8c1d125da642661d3dca0b513cd8d83257e7cfcaf758bd432e +size 57326 diff --git a/UnrealProject/Lost_Edge/Content/Models/Marketplace/LowPolyServerRoom/SM_panel.uasset b/UnrealProject/Lost_Edge/Content/Models/Marketplace/LowPolyServerRoom/SM_panel.uasset index 27f17f0..22d3199 100644 --- a/UnrealProject/Lost_Edge/Content/Models/Marketplace/LowPolyServerRoom/SM_panel.uasset +++ b/UnrealProject/Lost_Edge/Content/Models/Marketplace/LowPolyServerRoom/SM_panel.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:33ab75a7c919611fbe92f6218c92611337ceddc90ad4886f6c60f554ee7c9be7 -size 58969 +oid sha256:93dc91ed15cef10f01211ae29cfa900fc4fe10691ed409f8d6db11605f75b9e8 +size 57212 diff --git a/UnrealProject/Lost_Edge/Content/Models/Marketplace/LowPolyServerRoom/SM_pencilbox.uasset b/UnrealProject/Lost_Edge/Content/Models/Marketplace/LowPolyServerRoom/SM_pencilbox.uasset index 27b3614..280dbae 100644 --- a/UnrealProject/Lost_Edge/Content/Models/Marketplace/LowPolyServerRoom/SM_pencilbox.uasset +++ b/UnrealProject/Lost_Edge/Content/Models/Marketplace/LowPolyServerRoom/SM_pencilbox.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:96e874b9e34e436f22de65485ce955214143061479d5cd114f30b4b50e588f70 -size 61066 +oid sha256:8acae20ba56cacc81697aa743ecb638ea6bba18c13e9360887b32701987da93d +size 61924 diff --git a/UnrealProject/Lost_Edge/Content/Models/Marketplace/LowPolyServerRoom/SM_security_camera.uasset b/UnrealProject/Lost_Edge/Content/Models/Marketplace/LowPolyServerRoom/SM_security_camera.uasset deleted file mode 100644 index ed6b78d..0000000 --- a/UnrealProject/Lost_Edge/Content/Models/Marketplace/LowPolyServerRoom/SM_security_camera.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:5448695325c8d92e2292ed7338ac4ab84cdaa88a5570588ccad4baed62aabcca -size 79236 diff --git a/UnrealProject/Lost_Edge/Content/Models/Marketplace/LowPolyServerRoom/SM_tablet.uasset b/UnrealProject/Lost_Edge/Content/Models/Marketplace/LowPolyServerRoom/SM_tablet.uasset index ecd3e37..d37a6d0 100644 --- a/UnrealProject/Lost_Edge/Content/Models/Marketplace/LowPolyServerRoom/SM_tablet.uasset +++ b/UnrealProject/Lost_Edge/Content/Models/Marketplace/LowPolyServerRoom/SM_tablet.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8ba2b5b18f9c18408cf3139a205fefb8ba5bc558b177acc948e07a9958338100 -size 60769 +oid sha256:8d1bd77be9cb733447b1ccf296223f11143e4d646e7c9b96e5d177032ea751f6 +size 58870 diff --git a/UnrealProject/Lost_Edge/Source/Lost_Edge/Private/CommonFunctions.cpp b/UnrealProject/Lost_Edge/Source/Lost_Edge/Private/CommonFunctions.cpp index 11e9d00..58bc6c2 100644 --- a/UnrealProject/Lost_Edge/Source/Lost_Edge/Private/CommonFunctions.cpp +++ b/UnrealProject/Lost_Edge/Source/Lost_Edge/Private/CommonFunctions.cpp @@ -105,6 +105,16 @@ FWorldDilationChangedDelegate& UCommonFunctions::GetWorldDilationChangedDelegate return SlowMotion::worldDilationChangedDelegate; } +FIntByteView UCommonFunctions::MakeIntByteView(const int32 in) +{ + return FIntByteView::Make(in); +} + +int32 UCommonFunctions::IntByteViewAsInt(const FIntByteView in) +{ + return in.AsInt(); +} + TArray UCommonFunctions::IntArrayToStringArray(const TArray& in) { TArray result; @@ -161,6 +171,16 @@ TArray UCommonFunctions::StringArrayToIntPointArray(const TArray& in) { int32 result = 0; @@ -204,3 +224,18 @@ void UCommonFunctions::SlowMotionTick() world->GetTimerManager().ClearTimer(SlowMotion::timer); } } + +FIntByteView FIntByteView::Make(const int32 in) +{ + FIntByteView result; + *reinterpret_cast(&result) = in; + return result; +} + +int32 FIntByteView::AsInt() const +{ + int32 result; + // in standard, [this] not always points to the object beginning, so we use the address to the first member + result = *reinterpret_cast(&first); + return result; +} diff --git a/UnrealProject/Lost_Edge/Source/Lost_Edge/Private/CommonFunctions.h b/UnrealProject/Lost_Edge/Source/Lost_Edge/Private/CommonFunctions.h index 29f2903..54e3474 100644 --- a/UnrealProject/Lost_Edge/Source/Lost_Edge/Private/CommonFunctions.h +++ b/UnrealProject/Lost_Edge/Source/Lost_Edge/Private/CommonFunctions.h @@ -3,11 +3,31 @@ #pragma once #include "Kismet/BlueprintFunctionLibrary.h" +#include "Math/Color.h" #include "CommonFunctions.generated.h" DECLARE_DYNAMIC_MULTICAST_DELEGATE_OneParam(FWorldDilationChangedDelegate, float, newDilation); +USTRUCT(BlueprintType) +struct FIntByteView +{ + GENERATED_BODY() + +public: + UPROPERTY(EditAnywhere, BlueprintReadWrite) + uint8 first; + UPROPERTY(EditAnywhere, BlueprintReadWrite) + uint8 second; + UPROPERTY(EditAnywhere, BlueprintReadWrite) + uint8 third; + UPROPERTY(EditAnywhere, BlueprintReadWrite) + uint8 fourth; + + static FIntByteView Make(const int32 in); + int32 AsInt() const; +}; + /** * Collection of common/universal/without own scope/specific functions. */ @@ -44,6 +64,12 @@ public: + + UFUNCTION(BlueprintPure, Category = TypeCasts) + static FIntByteView MakeIntByteView(const int32 in); + UFUNCTION(BlueprintPure) + static int32 IntByteViewAsInt(const FIntByteView in); + UFUNCTION(BlueprintPure, Category = TypeCasts) static TArray IntArrayToStringArray(const TArray& in); UFUNCTION(BlueprintPure, Category = TypeCasts) @@ -62,6 +88,14 @@ public: + // like wtf this isn't in the engine? + UFUNCTION(BlueprintPure, Category = "Color|Operators", meta = (DisplayName = "Equal", CompactNodeTitle = "==")) + static bool ColorEquals(const FColor a, const FColor b); + UFUNCTION(BlueprintCallable, Category = "Byte|Operators", meta = (DisplayName = "Increment", CompactNodeTitle = "++")) + static UPARAM(ref) uint8& ByteIncerement(UPARAM(ref) uint8& var); + + + UFUNCTION(BlueprintPure, Category = String) static int32 GetLongestCharCount(UPARAM(ref) TArray& in); diff --git a/UnrealProject/Lost_Edge/Source/Lost_Edge/Private/DialogueManager.cpp b/UnrealProject/Lost_Edge/Source/Lost_Edge/Private/DialogueManager.cpp index c4a1f44..f932034 100644 --- a/UnrealProject/Lost_Edge/Source/Lost_Edge/Private/DialogueManager.cpp +++ b/UnrealProject/Lost_Edge/Source/Lost_Edge/Private/DialogueManager.cpp @@ -65,7 +65,7 @@ void UDialogueManager::PlayDialogue(FDialogueEnqueProperties properties, FDialog timers->RemoveAt(timerId); timersLock->Unlock(); - endCallback.Execute(); + endCallback.ExecuteIfBound(); }; float duration = row->wave ? row->wave->GetDuration() : row->duration; @@ -90,17 +90,15 @@ void UDialogueManager::EnqueDialogue(FDialogueEnqueProperties properties, FDialo void UDialogueManager::PlayNextDialogue() { - dialoguesLock.Lock(); + FScopeLock lock1(&dialoguesLock); + FScopeLock lock2(&callbacksLock); auto properties = nextDialogues.Peek(); TArray rows = properties->dialogue.LoadSynchronous()->GetRowNames(); if(rows.Num() == 0) { - FDialogueEndCallback callback; - if(endCallbacks.Dequeue(callback)) - callback.Execute(); - nextDialogues.Pop(); + QueueEnded(); return; } @@ -113,20 +111,14 @@ void UDialogueManager::PlayNextDialogue() if(!row) { - FDialogueEndCallback callback; - endCallbacks.Dequeue(callback); - callback.ExecuteIfBound(); - nextDialogues.Pop(); + QueueEnded(); return; } if(properties->playMode == EDialoguePlayMode::Sequential && !properties->rowName.ToString().IsNumeric()) { - nextDialogues.Pop(); - FDialogueEndCallback callback; - if(endCallbacks.Dequeue(callback)) - callback.Execute(); + QueueEnded(); return; } @@ -151,8 +143,6 @@ void UDialogueManager::PlayNextDialogue() leadDialogueTimerId = timerId; leadDialogueProperties = properties; - - dialoguesLock.Unlock(); } void UDialogueManager::OnFirstDialogueInit() // most first dialogue, so widgets and binds don't exist @@ -181,6 +171,15 @@ void UDialogueManager::OnFirstDialogueInit() // most first dialogue, so widgets } } +void UDialogueManager::QueueEnded() +{ + nextDialogues.Pop(); + leadDialogueProperties = nullptr; + FDialogueEndCallback callback; + if(endCallbacks.Dequeue(callback)) + callback.ExecuteIfBound(); +} + void UDialogueManager::SkipDialogue() { if(timers.Num() == 0 || leadDialogueTimerId < 0) @@ -188,8 +187,6 @@ void UDialogueManager::SkipDialogue() timersLock.Lock(); GetWorld()->GetTimerManager().ClearTimer(timers[leadDialogueTimerId]); - timers.RemoveAt(leadDialogueTimerId); - leadDialogueTimerId = -1; timersLock.Unlock(); if(leadDialogueAudio) @@ -226,6 +223,10 @@ void UDialogueManager::BeginDestroy() void UDialogueManager::OnDialogueEnd() { + timersLock.Lock(); + timers.RemoveAt(leadDialogueTimerId); + timersLock.Unlock(); + dialoguesLock.Lock(); FDialogueRow* row = reinterpret_cast(leadDialogueProperties->dialogue.LoadSynchronous()->FindRowUnchecked(leadDialogueProperties->rowName)); @@ -233,24 +234,26 @@ void UDialogueManager::OnDialogueEnd() if(auto WM = AMainGameModeBase::GetWidgetsManager()) WM->HideDialogueWidget(*row); - if(leadDialogueProperties->playMode == EDialoguePlayMode::Sequential - && leadDialogueProperties->rowName.ToString().IsNumeric()) + if(leadDialogueProperties->playMode == EDialoguePlayMode::Sequential && !endCallbacks.IsEmpty()) { leadDialogueProperties->rowName = FName(FString::FromInt(FCString::Atoi(*(leadDialogueProperties->rowName.ToString())) + 1)); - } - - dialoguesLock.Unlock(); - - if(!endCallbacks.IsEmpty()) + dialoguesLock.Unlock(); PlayNextDialogue(); - - dialoguesLock.Lock(); - if(endCallbacks.IsEmpty() && lastPlayer) - { - ACustomPlayerController::GetInput()->RemoveBindingByHandle(inputHandler); - lastPlayer = nullptr; } - dialoguesLock.Unlock(); + else + { + dialoguesLock.Unlock(); + } + + { + FScopeLock lock1(&dialoguesLock); + FScopeLock lock2(&callbacksLock); + if(endCallbacks.IsEmpty() && lastPlayer) + { + ACustomPlayerController::GetInput()->RemoveBindingByHandle(inputHandler); + lastPlayer = nullptr; + } + } } void UDialogueManager::OnInputPress() diff --git a/UnrealProject/Lost_Edge/Source/Lost_Edge/Private/DialogueManager.h b/UnrealProject/Lost_Edge/Source/Lost_Edge/Private/DialogueManager.h index d65a0c7..a564184 100644 --- a/UnrealProject/Lost_Edge/Source/Lost_Edge/Private/DialogueManager.h +++ b/UnrealProject/Lost_Edge/Source/Lost_Edge/Private/DialogueManager.h @@ -90,6 +90,7 @@ protected: private: void PlayNextDialogue(); void OnFirstDialogueInit(); + void QueueEnded(); UFUNCTION() void OnDialogueEnd(); diff --git a/UnrealProject/Lost_Edge/Source/Lost_Edge/Private/Interactable/Interactable.cpp b/UnrealProject/Lost_Edge/Source/Lost_Edge/Private/Interactable/Interactable.cpp index 1b9837b..13d924f 100644 --- a/UnrealProject/Lost_Edge/Source/Lost_Edge/Private/Interactable/Interactable.cpp +++ b/UnrealProject/Lost_Edge/Source/Lost_Edge/Private/Interactable/Interactable.cpp @@ -86,7 +86,10 @@ void AInteractable::BeginPlay() switch(modificatorActivatorTypes & static_cast(EActivatorType::Use)) { case static_cast(EActivatorType::Use): - modificators.Add({ EActivatorType::Use, modificator }); + if(modificators.Contains(EActivatorType::Use)) + modificators[EActivatorType::Use].modificators.Add(modificator); + else + modificators.Add({ EActivatorType::Use, FModificatorsArray{TArray{modificator}} }); break; default: break; @@ -94,7 +97,10 @@ void AInteractable::BeginPlay() switch(modificatorActivatorTypes & static_cast(EActivatorType::Saw)) { case static_cast(EActivatorType::Saw): - modificators.Add({ EActivatorType::Saw, modificator }); + if(modificators.Contains(EActivatorType::Saw)) + modificators[EActivatorType::Saw].modificators.Add(modificator); + else + modificators.Add({ EActivatorType::Saw, FModificatorsArray{TArray{modificator}} }); break; default: break; @@ -149,18 +155,16 @@ void AInteractable::Activate(EActivatorType type) if(!player || modificators.IsEmpty() + || !modificators.Contains(type) || !activationLockers.IsEmpty()) return; if(auto WM = AMainGameModeBase::GetWidgetsManager()) { - for(const auto& modificator : modificators) + for(const auto& modificator : modificators[type].modificators) { - if(static_cast(modificator.Value->GetActivatorTypes()) & static_cast(type)) - { - WM->ShowInteractionHints(modificator.Value); - modificator.Value->Bind(ACustomPlayerController::GetInput()); - } + WM->ShowInteractionHints(modificator); + modificator->Bind(ACustomPlayerController::GetInput()); } } @@ -184,18 +188,16 @@ void AInteractable::Deactivate(EActivatorType type) if(!player || modificators.IsEmpty() + || !modificators.Contains(type) || !activationLockers.IsEmpty()) return; if(auto WM = AMainGameModeBase::GetWidgetsManager()) { - for(const auto& modificator : modificators) + for(const auto& modificator : modificators[type].modificators) { - if(static_cast(modificator.Key) & static_cast(type)) - { - WM->HideInteractionHints(modificator.Value); - modificator.Value->Unbind(); - } + WM->HideInteractionHints(modificator); + modificator->Unbind(); } } @@ -211,3 +213,16 @@ void AInteractable::Deactivate(EActivatorType type) OnDeactivate(type); } + +void AInteractable::Lock() +{ + activationLockers.Empty(); + for(int32 i = 1; i < 255; i <<= 1) + Deactivate(static_cast(i)); + activationLockers.Add(nullptr); +} + +void AInteractable::Unlock() +{ + activationLockers.Empty(); +} diff --git a/UnrealProject/Lost_Edge/Source/Lost_Edge/Private/Interactable/Interactable.h b/UnrealProject/Lost_Edge/Source/Lost_Edge/Private/Interactable/Interactable.h index 6f95095..cea2af8 100644 --- a/UnrealProject/Lost_Edge/Source/Lost_Edge/Private/Interactable/Interactable.h +++ b/UnrealProject/Lost_Edge/Source/Lost_Edge/Private/Interactable/Interactable.h @@ -62,6 +62,12 @@ public: UFUNCTION(BlueprintCallable) void Deactivate(EActivatorType type); + /** Locks any interactions and deactivates active activators if needed until Unlock() is called */ + UFUNCTION(BlueprintCallable) + void Lock(); + UFUNCTION(BlueprintCallable) + void Unlock(); + /** * All modificators that requires (de)activation lock for current interactable. * Used manually by modificators to handle operations which can be continued after physical deactivation. @@ -82,9 +88,14 @@ protected: UPROPERTY(EditAnywhere, BlueprintReadWrite, meta = (Bitmask, BitmaskEnum = "EActivatorType")) int32 activated = 0; + /** TArray cannot be a value of a TMap */ + struct FModificatorsArray + { + TArray modificators; + }; + /** Map of modificators to activator types initialized on BeginPlay */ - UPROPERTY() - TMap modificators; + TMap modificators; TArray collisions; class APlayerBase* player = nullptr; diff --git a/UnrealProject/Lost_Edge/Source/Lost_Edge/Private/Interactable/Modificators/MoveInteractableModificator.cpp b/UnrealProject/Lost_Edge/Source/Lost_Edge/Private/Interactable/Modificators/MoveInteractableModificator.cpp index d60234b..271ced8 100644 --- a/UnrealProject/Lost_Edge/Source/Lost_Edge/Private/Interactable/Modificators/MoveInteractableModificator.cpp +++ b/UnrealProject/Lost_Edge/Source/Lost_Edge/Private/Interactable/Modificators/MoveInteractableModificator.cpp @@ -23,16 +23,21 @@ UMoveInteractableModificator::UMoveInteractableModificator(const FObjectInitiali static ConstructorHelpers::FObjectFinder asset{ TEXT("/Script/EnhancedInput.InputMappingContext'/Game/Input/Interactables/IMC_InteractableMove.IMC_InteractableMove'") }; inputMapping = asset.Object; + PrimaryComponentTick.bCanEverTick = true; + PrimaryComponentTick.bStartWithTickEnabled = false; + PrimaryComponentTick.TickGroup = ETickingGroup::TG_PostUpdateWork; +} + +void UMoveInteractableModificator::OnRegister() +{ + Super::OnRegister(); + actor = Cast(GetOwner()); if(actor) { shape = FCollisionShape::MakeBox(actor->GetComponentsBoundingBox().GetExtent()); primitive = actor->GetComponentByClass(); } - - PrimaryComponentTick.bCanEverTick = true; - PrimaryComponentTick.bStartWithTickEnabled = false; - PrimaryComponentTick.TickGroup = ETickingGroup::TG_PostUpdateWork; } void UMoveInteractableModificator::TickComponent(float DeltaTime, enum ELevelTick TickType, FActorComponentTickFunction* ThisTickFunction) @@ -47,9 +52,6 @@ void UMoveInteractableModificator::Bind_Implementation(class UEnhancedInputCompo if(!input && !inputMapping) return; - if(holding || rotating) - return; - for(auto& mapping : inputMapping->GetMappings()) { if(mapping.Key == EKeys::LeftMouseButton) @@ -90,15 +92,20 @@ void UMoveInteractableModificator::Unbind_Implementation() if(!lastInput || bindindingHandlers.IsEmpty()) return; - if(holding || rotating) - return; - for(auto handle : bindindingHandlers) lastInput->RemoveBindingByHandle(handle); bindindingHandlers.Empty(); SetComponentTickEnabled(false); - actor->Deactivate(GetActivatorTypes()); + if(indicating) + { + indicating = false; + AMainGameModeBase::GetWidgetsManager()->AnimateInteractionHint(this, 0, EInputAnimatedWidgetAnimation::TurnOffIndication); + AMainGameModeBase::GetWidgetsManager()->AnimateInteractionHint(this, 1, EInputAnimatedWidgetAnimation::TurnOffIndication); + } + + if(rotating) + player->UnlockPlayer({ .camera = true }); OnMoveDeactivated.Broadcast(); } @@ -160,15 +167,11 @@ void UMoveInteractableModificator::ProcessState() else { actor->activationLockers.Remove(this); - if(indicating) - { - indicating = false; - AMainGameModeBase::GetWidgetsManager()->AnimateInteractionHint(this, 0, EInputAnimatedWidgetAnimation::TurnOffIndication); - } if((actor->GetActivatedFlags() & static_cast(GetActivatorTypes())) == 0 && !bindindingHandlers.IsEmpty()) { Unbind_Implementation(); + actor->Deactivate(GetActivatorTypes()); } } } @@ -193,8 +196,8 @@ void UMoveInteractableModificator::UpdatePosition() { indicating = true; AMainGameModeBase::GetWidgetsManager()->AnimateInteractionHint(this, 0, EInputAnimatedWidgetAnimation::TurnOnIndication); + AMainGameModeBase::GetWidgetsManager()->AnimateInteractionHint(this, 1, EInputAnimatedWidgetAnimation::TurnOnIndication); } - return; } else { @@ -202,6 +205,7 @@ void UMoveInteractableModificator::UpdatePosition() { indicating = false; AMainGameModeBase::GetWidgetsManager()->AnimateInteractionHint(this, 0, EInputAnimatedWidgetAnimation::TurnOffIndication); + AMainGameModeBase::GetWidgetsManager()->AnimateInteractionHint(this, 1, EInputAnimatedWidgetAnimation::TurnOffIndication); } } @@ -239,10 +243,25 @@ void UMoveInteractableModificator::Rotating(const FInputActionValue& axis) auto v = axis.Get(); auto dir = player->GetCameraDirection(); auto addRot = FRotator{ v.Y * dir.X, v.X, v.Y * dir.Y * -1 }; - auto newRot = (addRot.Quaternion() * actor->GetActorQuat()).Rotator(); - // rotation sweep is unsupported for some reason - // if(MoveIsBlocked(actor->GetActorLocation(), newRot.Quaternion())) - // return; + auto newQuat = addRot.Quaternion() * actor->GetActorQuat(); + auto newRot = newQuat.Rotator(); + + if(MoveIsBlocked(actor->GetActorLocation(), newQuat) && positionUpdateType != PositionUpdateType::Physics) + { + if(!indicating) + { + indicating = true; + AMainGameModeBase::GetWidgetsManager()->AnimateInteractionHint(this, 0, EInputAnimatedWidgetAnimation::TurnOnIndication); + AMainGameModeBase::GetWidgetsManager()->AnimateInteractionHint(this, 1, EInputAnimatedWidgetAnimation::TurnOnIndication); + } + else if(!indicating) + { + indicating = false; + AMainGameModeBase::GetWidgetsManager()->AnimateInteractionHint(this, 0, EInputAnimatedWidgetAnimation::TurnOffIndication); + AMainGameModeBase::GetWidgetsManager()->AnimateInteractionHint(this, 1, EInputAnimatedWidgetAnimation::TurnOffIndication); + } + return; + } if(player->nearScanner->ComponentOverlapComponent(primitive, actor->GetActorLocation(), newRot, {}) || player->feetScanner->ComponentOverlapComponent(primitive, actor->GetActorLocation(), newRot, {})) @@ -254,7 +273,7 @@ void UMoveInteractableModificator::Rotating(const FInputActionValue& axis) player->physicsHandle->SetTargetRotation(newRot); break; default: - actor->SetActorRotation(newRot, ETeleportType::None); + actor->SetActorLocationAndRotation(actor->GetActorLocation(), newQuat, true, nullptr, ETeleportType::None); break; } } diff --git a/UnrealProject/Lost_Edge/Source/Lost_Edge/Private/Interactable/Modificators/MoveInteractableModificator.h b/UnrealProject/Lost_Edge/Source/Lost_Edge/Private/Interactable/Modificators/MoveInteractableModificator.h index d6071a6..fe1caae 100644 --- a/UnrealProject/Lost_Edge/Source/Lost_Edge/Private/Interactable/Modificators/MoveInteractableModificator.h +++ b/UnrealProject/Lost_Edge/Source/Lost_Edge/Private/Interactable/Modificators/MoveInteractableModificator.h @@ -22,7 +22,8 @@ class UMoveInteractableModificator : public UInteractableModificator public: UMoveInteractableModificator(const FObjectInitializer& ObjectInitializer); - void TickComponent(float DeltaTime, enum ELevelTick TickType, FActorComponentTickFunction* ThisTickFunction) override; + virtual void OnRegister() override; + virtual void TickComponent(float DeltaTime, enum ELevelTick TickType, FActorComponentTickFunction* ThisTickFunction) override; void Bind_Implementation(class UEnhancedInputComponent* input) override; void Unbind_Implementation() override; diff --git a/UnrealProject/Lost_Edge/Source/Lost_Edge/Private/Levels/Level3.h b/UnrealProject/Lost_Edge/Source/Lost_Edge/Private/Levels/Level3.h index 57800a2..b69128c 100644 --- a/UnrealProject/Lost_Edge/Source/Lost_Edge/Private/Levels/Level3.h +++ b/UnrealProject/Lost_Edge/Source/Lost_Edge/Private/Levels/Level3.h @@ -6,6 +6,24 @@ #include "Level3.generated.h" +USTRUCT(BlueprintType) +struct FLevel3_State_TechnicalRoom +{ + GENERATED_BODY() + +public: + UPROPERTY(BlueprintReadWrite) + uint8 stage1 = 0; + UPROPERTY(BlueprintReadWrite) + uint8 stage2 = 0; + UPROPERTY(BlueprintReadWrite) + uint8 stage2Box1 = 0; + UPROPERTY(BlueprintReadWrite) + uint8 stage2Box2 = 0; + UPROPERTY(BlueprintReadWrite) + uint8 stage3 = 0; +}; + UCLASS(BlueprintType) class ALevel3 : public ALevelBase { @@ -14,4 +32,6 @@ class ALevel3 : public ALevelBase protected: virtual void BeginPlay() override; + UPROPERTY(BlueprintReadWrite) + FLevel3_State_TechnicalRoom technicalRoomState; }; diff --git a/UnrealProject/Lost_Edge/Source/Lost_Edge/Private/Widgets/WidgetsManager.cpp b/UnrealProject/Lost_Edge/Source/Lost_Edge/Private/Widgets/WidgetsManager.cpp index 95b6a16..4edcf32 100644 --- a/UnrealProject/Lost_Edge/Source/Lost_Edge/Private/Widgets/WidgetsManager.cpp +++ b/UnrealProject/Lost_Edge/Source/Lost_Edge/Private/Widgets/WidgetsManager.cpp @@ -178,7 +178,7 @@ void UWidgetsManager::HideFpsCount() if(!fpsCountWidget) return; - fpsCountWidget->RemoveFromViewport(); + fpsCountWidget->RemoveFromParent(); fpsCountWidget = nullptr; }