diff --git a/Images/Textures/T_Level3_ExperimentalRoom_Floor_Difuse.png b/Images/Textures/T_Level3_ExperimentalRoom_Floor_Difuse.png new file mode 100644 index 0000000..dd6c8a3 Binary files /dev/null and b/Images/Textures/T_Level3_ExperimentalRoom_Floor_Difuse.png differ diff --git a/Images/Textures/T_Level3_ExperimentalRoom_Floor_Normal.png b/Images/Textures/T_Level3_ExperimentalRoom_Floor_Normal.png new file mode 100644 index 0000000..75ce291 Binary files /dev/null and b/Images/Textures/T_Level3_ExperimentalRoom_Floor_Normal.png differ diff --git a/Images/Textures/T_Level3_ExperimentalRoom_Wall_Difuse.png b/Images/Textures/T_Level3_ExperimentalRoom_Wall_Difuse.png new file mode 100644 index 0000000..a100d2c Binary files /dev/null and b/Images/Textures/T_Level3_ExperimentalRoom_Wall_Difuse.png differ diff --git a/Images/Textures/T_Level3_ExperimentalRoom_Wall_Normal.png b/Images/Textures/T_Level3_ExperimentalRoom_Wall_Normal.png new file mode 100644 index 0000000..6bbc9f6 Binary files /dev/null and b/Images/Textures/T_Level3_ExperimentalRoom_Wall_Normal.png differ diff --git a/Images/Textures/T_Mask_Half.png b/Images/Textures/T_Mask_Half.png new file mode 100644 index 0000000..631072d Binary files /dev/null and b/Images/Textures/T_Mask_Half.png differ diff --git a/Models/Constructions/SM_CylinderQuat.blend b/Models/Constructions/SM_CylinderQuat.blend new file mode 100644 index 0000000..c93f022 Binary files /dev/null and b/Models/Constructions/SM_CylinderQuat.blend differ diff --git a/Models/Constructions/SM_CylinderQuat.fbx b/Models/Constructions/SM_CylinderQuat.fbx new file mode 100644 index 0000000..94b1fce Binary files /dev/null and b/Models/Constructions/SM_CylinderQuat.fbx differ diff --git a/UnrealProject/Lost_Edge/Config/DefaultEngine.ini b/UnrealProject/Lost_Edge/Config/DefaultEngine.ini index e75e58f..930c299 100644 --- a/UnrealProject/Lost_Edge/Config/DefaultEngine.ini +++ b/UnrealProject/Lost_Edge/Config/DefaultEngine.ini @@ -147,6 +147,7 @@ ManualIPAddress= +EditProfiles=(Name="OverlapAllDynamic",CustomResponses=((Channel="InteractableTrace",Response=ECR_Overlap),(Channel="Interactable",Response=ECR_Overlap))) +EditProfiles=(Name="CharacterMesh",CustomResponses=((Channel="Interactable",Response=ECR_Ignore))) +EditProfiles=(Name="Spectator",CustomResponses=((Channel="Interactable",Response=ECR_Ignore))) ++EditProfiles=(Name="Trigger",CustomResponses=((Channel="Interactable",Response=ECR_Overlap))) -ProfileRedirects=(OldName="BlockingVolume",NewName="InvisibleWall") -ProfileRedirects=(OldName="InterpActor",NewName="IgnoreOnlyPawn") -ProfileRedirects=(OldName="StaticMeshComponent",NewName="BlockAllDynamic") diff --git a/UnrealProject/Lost_Edge/Content/Audio/Sounds/SW_ElectricZap.uasset b/UnrealProject/Lost_Edge/Content/Audio/Sounds/SW_ElectricZap.uasset index fddbd2c..0ca6d23 100644 --- a/UnrealProject/Lost_Edge/Content/Audio/Sounds/SW_ElectricZap.uasset +++ b/UnrealProject/Lost_Edge/Content/Audio/Sounds/SW_ElectricZap.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0f41d90de6f41a601ea6da91a82d37f20324331f17776c70dab6f5eea7ff5c90 -size 29446 +oid sha256:161d2621a46a236f55835c7e96b85c27192eeee293d0f7890525e3b98e830bdd +size 29790 diff --git a/UnrealProject/Lost_Edge/Content/Blueprints/Decorations/BP_Camera.uasset b/UnrealProject/Lost_Edge/Content/Blueprints/Decorations/BP_Camera.uasset index 118aae0..7dd9efa 100644 --- a/UnrealProject/Lost_Edge/Content/Blueprints/Decorations/BP_Camera.uasset +++ b/UnrealProject/Lost_Edge/Content/Blueprints/Decorations/BP_Camera.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:aea2bcd7798581dc0708fc815e438fcb21626d1eb0015bf204658fb0ad72e685 -size 100944 +oid sha256:36b46ea9b71b16f63f5ebab63ee0c3afb2d62ec3005bc57d01f49118ec877f38 +size 98221 diff --git a/UnrealProject/Lost_Edge/Content/Blueprints/Items/BP_CompanionCube.uasset b/UnrealProject/Lost_Edge/Content/Blueprints/Items/BP_CompanionCube.uasset index ba9951d..4f4cfca 100644 --- a/UnrealProject/Lost_Edge/Content/Blueprints/Items/BP_CompanionCube.uasset +++ b/UnrealProject/Lost_Edge/Content/Blueprints/Items/BP_CompanionCube.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1195d0ee2ffdfd23b58c5b83519c0c26bf91b3df3a623d52411462876b9d9848 -size 25381 +oid sha256:884a7d35ed7ea85c5edd752a678e56d25f23ef02007e3920c0ac6cda2d1a2eb6 +size 25845 diff --git a/UnrealProject/Lost_Edge/Content/Levels/Level_3/Actors/BP_Level3_PortalRoom_PressurePlate.uasset b/UnrealProject/Lost_Edge/Content/Levels/Level_3/Actors/BP_Level3_PortalRoom_PressurePlate.uasset deleted file mode 100644 index ea0f110..0000000 --- a/UnrealProject/Lost_Edge/Content/Levels/Level_3/Actors/BP_Level3_PortalRoom_PressurePlate.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f260d1b3510980ff5d8c2402947509052994140a1f7c32a92f15ddc7dbb53b68 -size 45344 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 deleted file mode 100644 index 00b63dd..0000000 --- a/UnrealProject/Lost_Edge/Content/Levels/Level_3/Actors/BP_Level3_TechnicalRoom_Cable.uasset +++ /dev/null @@ -1,3 +0,0 @@ -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 deleted file mode 100644 index 06302ae..0000000 --- a/UnrealProject/Lost_Edge/Content/Levels/Level_3/Actors/BP_Level3_TechnicalRoom_CableEnd.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:ad05ad5ef4dabc6d24e30f4f59303525d47e7a043403bc12b62a8ca16172b0a4 -size 2956 diff --git a/UnrealProject/Lost_Edge/Content/Levels/Level_3/Actors/ExperimentalRoom/BP_Level3_ExperimentalRoom_CubeMeltBegin.uasset b/UnrealProject/Lost_Edge/Content/Levels/Level_3/Actors/ExperimentalRoom/BP_Level3_ExperimentalRoom_CubeMeltBegin.uasset new file mode 100644 index 0000000..8dff9ed --- /dev/null +++ b/UnrealProject/Lost_Edge/Content/Levels/Level_3/Actors/ExperimentalRoom/BP_Level3_ExperimentalRoom_CubeMeltBegin.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5460dab86ca8a7b482339d764f4bdaf06f38ed6e0156fa274c1b43a083d486bc +size 45059 diff --git a/UnrealProject/Lost_Edge/Content/Levels/Level_3/Actors/ExperimentalRoom/BP_Level3_ExperimentalRoom_CubeMeltEnd.uasset b/UnrealProject/Lost_Edge/Content/Levels/Level_3/Actors/ExperimentalRoom/BP_Level3_ExperimentalRoom_CubeMeltEnd.uasset new file mode 100644 index 0000000..fad5980 --- /dev/null +++ b/UnrealProject/Lost_Edge/Content/Levels/Level_3/Actors/ExperimentalRoom/BP_Level3_ExperimentalRoom_CubeMeltEnd.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:068f52fff46f035c9f6ab8d78864767849b3c4db625015d3b7367ba747ee4a33 +size 45507 diff --git a/UnrealProject/Lost_Edge/Content/Levels/Level_3/Actors/ExperimentalRoom/BP_Level3_ExperimentalRoom_ElevatorBegin.uasset b/UnrealProject/Lost_Edge/Content/Levels/Level_3/Actors/ExperimentalRoom/BP_Level3_ExperimentalRoom_ElevatorBegin.uasset new file mode 100644 index 0000000..b92ada9 --- /dev/null +++ b/UnrealProject/Lost_Edge/Content/Levels/Level_3/Actors/ExperimentalRoom/BP_Level3_ExperimentalRoom_ElevatorBegin.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a11f57873b48b2c212998ec89c315a1ec328c4abcb9e55c8e26bc0bddd36f2e3 +size 45236 diff --git a/UnrealProject/Lost_Edge/Content/Levels/Level_3/Actors/ExperimentalRoom/BP_Level3_ExperimentalRoom_ElevatorEnd.uasset b/UnrealProject/Lost_Edge/Content/Levels/Level_3/Actors/ExperimentalRoom/BP_Level3_ExperimentalRoom_ElevatorEnd.uasset new file mode 100644 index 0000000..fabb7d9 --- /dev/null +++ b/UnrealProject/Lost_Edge/Content/Levels/Level_3/Actors/ExperimentalRoom/BP_Level3_ExperimentalRoom_ElevatorEnd.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6a1bf1cd40829f991cc6d0b347e503b15993c3fbd7546a18a597df47796c3843 +size 97974 diff --git a/UnrealProject/Lost_Edge/Content/Levels/Level_3/Actors/ExperimentalRoom/BP_Level3_ExperimentalRoom_Fail.uasset b/UnrealProject/Lost_Edge/Content/Levels/Level_3/Actors/ExperimentalRoom/BP_Level3_ExperimentalRoom_Fail.uasset new file mode 100644 index 0000000..f651b70 --- /dev/null +++ b/UnrealProject/Lost_Edge/Content/Levels/Level_3/Actors/ExperimentalRoom/BP_Level3_ExperimentalRoom_Fail.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:62c939b0903a78e40aebd7596d2d4dc8dacea365f448560d297facd31427bd2b +size 50171 diff --git a/UnrealProject/Lost_Edge/Content/Levels/Level_3/Actors/ExperimentalRoom/BP_Level3_ExperimentalRoom_Intro.uasset b/UnrealProject/Lost_Edge/Content/Levels/Level_3/Actors/ExperimentalRoom/BP_Level3_ExperimentalRoom_Intro.uasset new file mode 100644 index 0000000..6f343a4 --- /dev/null +++ b/UnrealProject/Lost_Edge/Content/Levels/Level_3/Actors/ExperimentalRoom/BP_Level3_ExperimentalRoom_Intro.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4ef164cb8e85b3e2094b7be108a1c3e35ea5eb141a371b147d57e99f91b78df4 +size 44899 diff --git a/UnrealProject/Lost_Edge/Content/Levels/Level_3/Actors/ExperimentalRoom/BP_Level3_ExperimentalRoom_PressurePlate.uasset b/UnrealProject/Lost_Edge/Content/Levels/Level_3/Actors/ExperimentalRoom/BP_Level3_ExperimentalRoom_PressurePlate.uasset new file mode 100644 index 0000000..668a830 --- /dev/null +++ b/UnrealProject/Lost_Edge/Content/Levels/Level_3/Actors/ExperimentalRoom/BP_Level3_ExperimentalRoom_PressurePlate.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c0cb1c3ab0229a2f88d85720f6a56a075d26e9ebe58edea3d734bece98c67afd +size 75017 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 index 5c2a6c7..1c87303 100644 --- 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 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c6fa0b768356fa10fece7fa3dc0ea4eaff92d2204a5f6d60119e1196ebaf0fac -size 184939 +oid sha256:44895cbdc9b2aef0c35b308d7c7757b71ccf3d0b2fd76dd8417425a990f1ced1 +size 183277 diff --git a/UnrealProject/Lost_Edge/Content/Levels/Level_3/Dialogue/DT_Dialogue_Level3_ExperimentalRoom_ElevatorEnd.uasset b/UnrealProject/Lost_Edge/Content/Levels/Level_3/Dialogue/DT_Dialogue_Level3_ExperimentalRoom_ElevatorEnd.uasset new file mode 100644 index 0000000..c63fcf6 --- /dev/null +++ b/UnrealProject/Lost_Edge/Content/Levels/Level_3/Dialogue/DT_Dialogue_Level3_ExperimentalRoom_ElevatorEnd.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f7919635ec9aa822a7f893c4b21bcf88e1b4f64660f3940f3af1d9d74b5fa1be +size 4021 diff --git a/UnrealProject/Lost_Edge/Content/Levels/Level_3/Dialogue/DT_Dialogue_Level3_ExperimentalRoom_ElevatorStart.uasset b/UnrealProject/Lost_Edge/Content/Levels/Level_3/Dialogue/DT_Dialogue_Level3_ExperimentalRoom_ElevatorStart.uasset new file mode 100644 index 0000000..00d5aa2 --- /dev/null +++ b/UnrealProject/Lost_Edge/Content/Levels/Level_3/Dialogue/DT_Dialogue_Level3_ExperimentalRoom_ElevatorStart.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b1387aaffd64314cda9c551bf95098634b4e6bedb2511620535f43b0793408d7 +size 3264 diff --git a/UnrealProject/Lost_Edge/Content/Levels/Level_3/Dialogue/DT_Dialogue_Level3_ExperimentalRoom_End1.uasset b/UnrealProject/Lost_Edge/Content/Levels/Level_3/Dialogue/DT_Dialogue_Level3_ExperimentalRoom_End1.uasset new file mode 100644 index 0000000..00ea0ca --- /dev/null +++ b/UnrealProject/Lost_Edge/Content/Levels/Level_3/Dialogue/DT_Dialogue_Level3_ExperimentalRoom_End1.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8b939328c4612db60401ce4150e16a935439a29f91642e28c3328522c579f5f3 +size 5344 diff --git a/UnrealProject/Lost_Edge/Content/Levels/Level_3/Dialogue/DT_Dialogue_Level3_ExperimentalRoom_End2.uasset b/UnrealProject/Lost_Edge/Content/Levels/Level_3/Dialogue/DT_Dialogue_Level3_ExperimentalRoom_End2.uasset new file mode 100644 index 0000000..f079afc --- /dev/null +++ b/UnrealProject/Lost_Edge/Content/Levels/Level_3/Dialogue/DT_Dialogue_Level3_ExperimentalRoom_End2.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e94e0bf5f7a96504d347712ffc11dc6060acbeda16fc47085eec5a67dbb147fe +size 3814 diff --git a/UnrealProject/Lost_Edge/Content/Levels/Level_3/Dialogue/DT_Dialogue_Level3_ExperimentalRoom_Fail.uasset b/UnrealProject/Lost_Edge/Content/Levels/Level_3/Dialogue/DT_Dialogue_Level3_ExperimentalRoom_Fail.uasset new file mode 100644 index 0000000..cd09f6c --- /dev/null +++ b/UnrealProject/Lost_Edge/Content/Levels/Level_3/Dialogue/DT_Dialogue_Level3_ExperimentalRoom_Fail.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9de809e90a6a09820855c0892db673716badd03b673260888452b8ffff7c2a27 +size 4250 diff --git a/UnrealProject/Lost_Edge/Content/Levels/Level_3/Dialogue/DT_Dialogue_Level3_ExperimentalRoom_Intro1.uasset b/UnrealProject/Lost_Edge/Content/Levels/Level_3/Dialogue/DT_Dialogue_Level3_ExperimentalRoom_Intro1.uasset new file mode 100644 index 0000000..4ab94d2 --- /dev/null +++ b/UnrealProject/Lost_Edge/Content/Levels/Level_3/Dialogue/DT_Dialogue_Level3_ExperimentalRoom_Intro1.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d00556dd14ef6e467ac7753dcedf1f3b6da73ec1e4af07c1bb9fa1ab9c22e397 +size 7082 diff --git a/UnrealProject/Lost_Edge/Content/Levels/Level_3/Dialogue/DT_Dialogue_Level3_ExperimentalRoom_Intro2.uasset b/UnrealProject/Lost_Edge/Content/Levels/Level_3/Dialogue/DT_Dialogue_Level3_ExperimentalRoom_Intro2.uasset new file mode 100644 index 0000000..6ec0fd7 --- /dev/null +++ b/UnrealProject/Lost_Edge/Content/Levels/Level_3/Dialogue/DT_Dialogue_Level3_ExperimentalRoom_Intro2.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:48789afd4eb9c1397d0aad4240ed7f3cfbdae557b3421d929a24ef8665abcaf8 +size 6140 diff --git a/UnrealProject/Lost_Edge/Content/Levels/Level_3/EventCodes/E_Level3_ExperimentalRoom_Event.uasset b/UnrealProject/Lost_Edge/Content/Levels/Level_3/EventCodes/E_Level3_ExperimentalRoom_Event.uasset new file mode 100644 index 0000000..33ef402 --- /dev/null +++ b/UnrealProject/Lost_Edge/Content/Levels/Level_3/EventCodes/E_Level3_ExperimentalRoom_Event.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d5b7a7e0ad4a2fcd0dbfc69f12639b703352b6116674e1381905bbe5a6149738 +size 2793 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 index 256381b..85ff07d 100644 --- 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 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:fee8e3ed216434fda1bf25e3fc4f95897b89bbf008eae40b1073f8975abbdb91 -size 1839 +oid sha256:92e590b7ca2edc47ac6488e7fa3a0bc110d7aea53524cf1b4ae57cdfc91a445c +size 1958 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 index 6016b7f..a882d4e 100644 --- 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 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:31c08ac04b22c659bf482fdaeedc8751f35cfeb55bdbe788964b5a0846af2ee4 -size 2940 +oid sha256:e329a26c08ef4a2d61baab05570b0ff9004190e4605235a20a0ab0aa0a5a1dd7 +size 2364 diff --git a/UnrealProject/Lost_Edge/Content/Levels/Level_3/GC_Level3_GlassWall.uasset b/UnrealProject/Lost_Edge/Content/Levels/Level_3/GC_Level3_GlassWall.uasset new file mode 100644 index 0000000..b9af41a --- /dev/null +++ b/UnrealProject/Lost_Edge/Content/Levels/Level_3/GC_Level3_GlassWall.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:461afdac0c4c2691fc0c4eb01ca84bf9ccf7822fec5f2d92a74068c66fda136c +size 1619 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 a39b423..d581616 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:20182cc037fa3b2999a7801b2d8015be78ef60d0d2e8158cda72a78b74542a50 -size 1641059 +oid sha256:b58c34ad47811f6e47bb13d073e346c0707be4dbd291e90c5a9c1181240c834f +size 2128936 diff --git a/UnrealProject/Lost_Edge/Content/Levels/Level_3/Materials/ExperimentalRoom/MI_Level3_ExperimentalRoom_Roof.uasset b/UnrealProject/Lost_Edge/Content/Levels/Level_3/Materials/ExperimentalRoom/MI_Level3_ExperimentalRoom_Roof.uasset new file mode 100644 index 0000000..4d3c378 --- /dev/null +++ b/UnrealProject/Lost_Edge/Content/Levels/Level_3/Materials/ExperimentalRoom/MI_Level3_ExperimentalRoom_Roof.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ecd5a7ed6846f12c03a08921c43c01cea4492b193cacfb21fde27a54a37d0374 +size 11135 diff --git a/UnrealProject/Lost_Edge/Content/Levels/Level_3/Materials/ExperimentalRoom/M_Level3_ExperimentalRoom_Floor.uasset b/UnrealProject/Lost_Edge/Content/Levels/Level_3/Materials/ExperimentalRoom/M_Level3_ExperimentalRoom_Floor.uasset new file mode 100644 index 0000000..81a96cc --- /dev/null +++ b/UnrealProject/Lost_Edge/Content/Levels/Level_3/Materials/ExperimentalRoom/M_Level3_ExperimentalRoom_Floor.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0b03628a35fd876799c59db0381acac1d0267253e88845f9024a82f4c3094e05 +size 26063 diff --git a/UnrealProject/Lost_Edge/Content/Levels/Level_3/Materials/ExperimentalRoom/M_Level3_ExperimentalRoom_Floor_Dark.uasset b/UnrealProject/Lost_Edge/Content/Levels/Level_3/Materials/ExperimentalRoom/M_Level3_ExperimentalRoom_Floor_Dark.uasset new file mode 100644 index 0000000..0856e42 --- /dev/null +++ b/UnrealProject/Lost_Edge/Content/Levels/Level_3/Materials/ExperimentalRoom/M_Level3_ExperimentalRoom_Floor_Dark.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1d95769fb3194646f34174929bb31f6d47be53896af374a408fd2afdacbe882b +size 23268 diff --git a/UnrealProject/Lost_Edge/Content/Levels/Level_3/Materials/ExperimentalRoom/M_Level3_ExperimentalRoom_Wall.uasset b/UnrealProject/Lost_Edge/Content/Levels/Level_3/Materials/ExperimentalRoom/M_Level3_ExperimentalRoom_Wall.uasset new file mode 100644 index 0000000..6fe5fdf --- /dev/null +++ b/UnrealProject/Lost_Edge/Content/Levels/Level_3/Materials/ExperimentalRoom/M_Level3_ExperimentalRoom_Wall.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9d0e146fda26f61a500adce673677a6b1328a4d323173976ebf1ec206b0a36d4 +size 27561 diff --git a/UnrealProject/Lost_Edge/Content/Levels/Level_3/Materials/ExperimentalRoom/M_Level3_ExperimentalRoom_Wall_Dark.uasset b/UnrealProject/Lost_Edge/Content/Levels/Level_3/Materials/ExperimentalRoom/M_Level3_ExperimentalRoom_Wall_Dark.uasset new file mode 100644 index 0000000..efff40f --- /dev/null +++ b/UnrealProject/Lost_Edge/Content/Levels/Level_3/Materials/ExperimentalRoom/M_Level3_ExperimentalRoom_Wall_Dark.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:fa498a59e4848147b3c6ee9207c6a7cca9cea826d4fd22c8036f6dd8b32a715e +size 20984 diff --git a/UnrealProject/Lost_Edge/Content/Levels/Level_3/Materials/ExperimentalRoom/Textures/T_Level3_ExperimentalRoom_Floor_Difuse.uasset b/UnrealProject/Lost_Edge/Content/Levels/Level_3/Materials/ExperimentalRoom/Textures/T_Level3_ExperimentalRoom_Floor_Difuse.uasset new file mode 100644 index 0000000..3c7fe30 --- /dev/null +++ b/UnrealProject/Lost_Edge/Content/Levels/Level_3/Materials/ExperimentalRoom/Textures/T_Level3_ExperimentalRoom_Floor_Difuse.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:538c435878c166826a1068c1f1f4380e47550e187cb143da77ced1c9c8812af6 +size 11516 diff --git a/UnrealProject/Lost_Edge/Content/Levels/Level_3/Materials/ExperimentalRoom/Textures/T_Level3_ExperimentalRoom_Floor_Normal.uasset b/UnrealProject/Lost_Edge/Content/Levels/Level_3/Materials/ExperimentalRoom/Textures/T_Level3_ExperimentalRoom_Floor_Normal.uasset new file mode 100644 index 0000000..d6c5076 --- /dev/null +++ b/UnrealProject/Lost_Edge/Content/Levels/Level_3/Materials/ExperimentalRoom/Textures/T_Level3_ExperimentalRoom_Floor_Normal.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:15d167f976c59f3205784b4cdc8f269ff9c9d8a0fbec9792cee2bb60a5ef9149 +size 11732 diff --git a/UnrealProject/Lost_Edge/Content/Levels/Level_3/Materials/ExperimentalRoom/Textures/T_Level3_ExperimentalRoom_Wall_Difuse.uasset b/UnrealProject/Lost_Edge/Content/Levels/Level_3/Materials/ExperimentalRoom/Textures/T_Level3_ExperimentalRoom_Wall_Difuse.uasset new file mode 100644 index 0000000..fe63865 --- /dev/null +++ b/UnrealProject/Lost_Edge/Content/Levels/Level_3/Materials/ExperimentalRoom/Textures/T_Level3_ExperimentalRoom_Wall_Difuse.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:48b96e7d6c76c9a3c9b030f4fefce31c1baf8b2ebc7301693143d29f612b4028 +size 14511 diff --git a/UnrealProject/Lost_Edge/Content/Levels/Level_3/Materials/ExperimentalRoom/Textures/T_Level3_ExperimentalRoom_Wall_Normal.uasset b/UnrealProject/Lost_Edge/Content/Levels/Level_3/Materials/ExperimentalRoom/Textures/T_Level3_ExperimentalRoom_Wall_Normal.uasset new file mode 100644 index 0000000..e38e836 --- /dev/null +++ b/UnrealProject/Lost_Edge/Content/Levels/Level_3/Materials/ExperimentalRoom/Textures/T_Level3_ExperimentalRoom_Wall_Normal.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3d30a86dc7b88ddca95f60dad0a60cf715c56cf5da5bed1f17f5085a498a3847 +size 13476 diff --git a/UnrealProject/Lost_Edge/Content/Levels/Level_3/Materials/M_Frame.uasset b/UnrealProject/Lost_Edge/Content/Levels/Level_3/Materials/M_Frame.uasset deleted file mode 100644 index f49b176..0000000 --- a/UnrealProject/Lost_Edge/Content/Levels/Level_3/Materials/M_Frame.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:4ff424cd94775f5e4f5c1a2eafe1d6e65ecc8f914b8b9f1ac9e867459997692c -size 17974 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 deleted file mode 100644 index 372d46e..0000000 --- a/UnrealProject/Lost_Edge/Content/Levels/Level_3/Materials/M_Level3_TechnicalRoom_Light.uasset +++ /dev/null @@ -1,3 +0,0 @@ -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/MPC_Level3_TechnicalRoomLampsLight.uasset b/UnrealProject/Lost_Edge/Content/Levels/Level_3/Materials/TechnicalRoom/MPC_Level3_TechnicalRoomLampsLight.uasset deleted file mode 100644 index 81c893f..0000000 --- a/UnrealProject/Lost_Edge/Content/Levels/Level_3/Materials/TechnicalRoom/MPC_Level3_TechnicalRoomLampsLight.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:6c352e266d83bf8acf2bfdb00e5043d60581ea93c97283b8af66466c933cd5fd -size 1852 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 deleted file mode 100644 index 63fad53..0000000 --- a/UnrealProject/Lost_Edge/Content/Levels/Level_3/Models/SM_SM_Level3_TechnicalRoom_Stage2_Box1.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e1efae3a4653532a1026accd3380fd7f518b55ba55b2d2f51b45ee9cc38c72e5 -size 1770 diff --git a/UnrealProject/Lost_Edge/Content/Levels/Level_3/Other/GC_Level3_GlassWall.uasset b/UnrealProject/Lost_Edge/Content/Levels/Level_3/Other/GC_Level3_GlassWall.uasset new file mode 100644 index 0000000..80e04a0 --- /dev/null +++ b/UnrealProject/Lost_Edge/Content/Levels/Level_3/Other/GC_Level3_GlassWall.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ed287e2c13d3f4f419f43d5fc0bd2db753b04fe31612ac4775d419e9d200b4ba +size 539757 diff --git a/UnrealProject/Lost_Edge/Content/Levels/Level_3/Sequences/Seq_Level3_ExperimentalRoom_CubeSmelter.uasset b/UnrealProject/Lost_Edge/Content/Levels/Level_3/Sequences/Seq_Level3_ExperimentalRoom_CubeSmelter.uasset new file mode 100644 index 0000000..6d9235a --- /dev/null +++ b/UnrealProject/Lost_Edge/Content/Levels/Level_3/Sequences/Seq_Level3_ExperimentalRoom_CubeSmelter.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:dc0659e58f40a72d12f9d575bd0cc7fcd9179e64d82c24fa944f031400f003e6 +size 18330 diff --git a/UnrealProject/Lost_Edge/Content/Levels/Level_3/Sequences/Seq_Level3_ExperimentalRoom_ElevatorBegin.uasset b/UnrealProject/Lost_Edge/Content/Levels/Level_3/Sequences/Seq_Level3_ExperimentalRoom_ElevatorBegin.uasset new file mode 100644 index 0000000..6596429 --- /dev/null +++ b/UnrealProject/Lost_Edge/Content/Levels/Level_3/Sequences/Seq_Level3_ExperimentalRoom_ElevatorBegin.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0cc222e18a89289428ae40a991b230799d6166f40e28181640e6d74b6d290d3c +size 21554 diff --git a/UnrealProject/Lost_Edge/Content/Levels/Level_3/Sequences/Seq_Level3_ExperimentalRoom_ElevatorEnd.uasset b/UnrealProject/Lost_Edge/Content/Levels/Level_3/Sequences/Seq_Level3_ExperimentalRoom_ElevatorEnd.uasset new file mode 100644 index 0000000..b32be70 --- /dev/null +++ b/UnrealProject/Lost_Edge/Content/Levels/Level_3/Sequences/Seq_Level3_ExperimentalRoom_ElevatorEnd.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:bff27424ba6564096ff9cb9408eeceeb975fb22c7ccdd684895bf8853c885bdb +size 23128 diff --git a/UnrealProject/Lost_Edge/Content/Levels/Level_3/Sequences/Seq_Level3_ExperimentalRoom_End.uasset b/UnrealProject/Lost_Edge/Content/Levels/Level_3/Sequences/Seq_Level3_ExperimentalRoom_End.uasset new file mode 100644 index 0000000..163a99e --- /dev/null +++ b/UnrealProject/Lost_Edge/Content/Levels/Level_3/Sequences/Seq_Level3_ExperimentalRoom_End.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2ba238ff960d2015b2422bfcdf0015c376a49f5d9ded2940d864204aaac21b22 +size 20390 diff --git a/UnrealProject/Lost_Edge/Content/Levels/Level_3/Sequences/Seq_Level3_ExperimentalRoom_Intro1.uasset b/UnrealProject/Lost_Edge/Content/Levels/Level_3/Sequences/Seq_Level3_ExperimentalRoom_Intro1.uasset new file mode 100644 index 0000000..47ef4fb --- /dev/null +++ b/UnrealProject/Lost_Edge/Content/Levels/Level_3/Sequences/Seq_Level3_ExperimentalRoom_Intro1.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a86112aa4a7ddbc04d2cdb3cc57577365eef6b94bd6b6d464cb9ec37624974bb +size 16970 diff --git a/UnrealProject/Lost_Edge/Content/Levels/Level_3/Sequences/Seq_Level3_ExperimentalRoom_Intro2.uasset b/UnrealProject/Lost_Edge/Content/Levels/Level_3/Sequences/Seq_Level3_ExperimentalRoom_Intro2.uasset new file mode 100644 index 0000000..a818013 --- /dev/null +++ b/UnrealProject/Lost_Edge/Content/Levels/Level_3/Sequences/Seq_Level3_ExperimentalRoom_Intro2.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2cf290a80af539cf2b8c0a027ccfe3dc7e9352330df0570935d613ad250711c2 +size 20787 diff --git a/UnrealProject/Lost_Edge/Content/Levels/Level_3/Sequences/Seq_Level3_ExperimentalRoom_Platform.uasset b/UnrealProject/Lost_Edge/Content/Levels/Level_3/Sequences/Seq_Level3_ExperimentalRoom_Platform.uasset new file mode 100644 index 0000000..335b880 --- /dev/null +++ b/UnrealProject/Lost_Edge/Content/Levels/Level_3/Sequences/Seq_Level3_ExperimentalRoom_Platform.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0e47be56b50408fb7910723a2145b0645daa95208e8d05f069c0cc063fc36059 +size 15316 diff --git a/UnrealProject/Lost_Edge/Content/Levels/Level_3/Sequences/Seq_Level3_PuzzlePortal_Platform.uasset b/UnrealProject/Lost_Edge/Content/Levels/Level_3/Sequences/Seq_Level3_PuzzlePortal_Platform.uasset deleted file mode 100644 index 941d61b..0000000 --- a/UnrealProject/Lost_Edge/Content/Levels/Level_3/Sequences/Seq_Level3_PuzzlePortal_Platform.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:6d4498d20d6167ed9b94b6d069f693eca450419fb3de85047d8e5b660fe8282d -size 17354 diff --git a/UnrealProject/Lost_Edge/Content/Levels/Level_4/L_Level4.umap b/UnrealProject/Lost_Edge/Content/Levels/Level_4/L_Level4.umap index 78bf1ea..22c4d0c 100644 --- a/UnrealProject/Lost_Edge/Content/Levels/Level_4/L_Level4.umap +++ b/UnrealProject/Lost_Edge/Content/Levels/Level_4/L_Level4.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2bb6e12c174c8d15ef1d7253c48b5603fafc33bdba222203e4d306f23f222d34 -size 281868 +oid sha256:4b4e3370e13978be2e9d9dfb0164d56c4ddd158bf5f498c603c3a294d54c5b7b +size 359975 diff --git a/UnrealProject/Lost_Edge/Content/MaterialsLibrary/Functions/MF_DirtTexture.uasset b/UnrealProject/Lost_Edge/Content/MaterialsLibrary/Functions/MF_DirtTexture.uasset new file mode 100644 index 0000000..98d9a6b --- /dev/null +++ b/UnrealProject/Lost_Edge/Content/MaterialsLibrary/Functions/MF_DirtTexture.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6a9f8f74c77bd7f9c3d8bdc26a660898ce73bca0009c8daca9259d3da691c40f +size 14976 diff --git a/UnrealProject/Lost_Edge/Content/MaterialsLibrary/Functions/MF_ObjectScaleXYAlignedUV.uasset b/UnrealProject/Lost_Edge/Content/MaterialsLibrary/Functions/MF_ObjectScaleXYAlignedUV.uasset new file mode 100644 index 0000000..5bb7d31 --- /dev/null +++ b/UnrealProject/Lost_Edge/Content/MaterialsLibrary/Functions/MF_ObjectScaleXYAlignedUV.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ae2ad9d7f6e107758af2712546a1b08aeafc798f6a1ff0591f85af90e3eb9323 +size 15589 diff --git a/UnrealProject/Lost_Edge/Content/MaterialsLibrary/Functions/MF_ObjectScaleXZAlignedUV.uasset b/UnrealProject/Lost_Edge/Content/MaterialsLibrary/Functions/MF_ObjectScaleXZAlignedUV.uasset new file mode 100644 index 0000000..1647185 --- /dev/null +++ b/UnrealProject/Lost_Edge/Content/MaterialsLibrary/Functions/MF_ObjectScaleXZAlignedUV.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4eb69d983cb68d3703e81acf99aab505fac58769555f062469f7e66b96fd877c +size 15240 diff --git a/UnrealProject/Lost_Edge/Content/MaterialsLibrary/Functions/MF_ObjectScaleYZAlignedUV.uasset b/UnrealProject/Lost_Edge/Content/MaterialsLibrary/Functions/MF_ObjectScaleYZAlignedUV.uasset new file mode 100644 index 0000000..8e57a35 --- /dev/null +++ b/UnrealProject/Lost_Edge/Content/MaterialsLibrary/Functions/MF_ObjectScaleYZAlignedUV.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d4775d6296a172e08eea7fe9fd1e660a55b0d81520a485acb3f66fff0143daff +size 15240 diff --git a/UnrealProject/Lost_Edge/Content/MaterialsLibrary/Functions/MF_WorldAlignedXYUV.uasset b/UnrealProject/Lost_Edge/Content/MaterialsLibrary/Functions/MF_WorldAlignedXYUV.uasset new file mode 100644 index 0000000..3da46a8 --- /dev/null +++ b/UnrealProject/Lost_Edge/Content/MaterialsLibrary/Functions/MF_WorldAlignedXYUV.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e3c6a7f079d0b7f0c74443d502ab2d644bc1850f51ec30a18722a5958547e889 +size 8823 diff --git a/UnrealProject/Lost_Edge/Content/MaterialsLibrary/Functions/MF_WorldAlignedXZUV.uasset b/UnrealProject/Lost_Edge/Content/MaterialsLibrary/Functions/MF_WorldAlignedXZUV.uasset new file mode 100644 index 0000000..e4971ec --- /dev/null +++ b/UnrealProject/Lost_Edge/Content/MaterialsLibrary/Functions/MF_WorldAlignedXZUV.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9a6c8c47eb848fc100cadaf26f8dcc7900c6339b65a140353c1799ce3ac3b6b3 +size 11060 diff --git a/UnrealProject/Lost_Edge/Content/MaterialsLibrary/M_Glass.uasset b/UnrealProject/Lost_Edge/Content/MaterialsLibrary/M_Glass.uasset index 2b551d9..c9af680 100644 --- a/UnrealProject/Lost_Edge/Content/MaterialsLibrary/M_Glass.uasset +++ b/UnrealProject/Lost_Edge/Content/MaterialsLibrary/M_Glass.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4abebc89d6b2094b19be74fb89273f694e6a212abf20ba14b02adec934488f10 -size 108552 +oid sha256:d9d43290ffba62c3b5e2b58dcc9afb2421ae87199e564404d6fc93ae5e0fa8b4 +size 20287 diff --git a/UnrealProject/Lost_Edge/Content/MaterialsLibrary/TexturesLibrary/Masks/T_Mask_Half.uasset b/UnrealProject/Lost_Edge/Content/MaterialsLibrary/TexturesLibrary/Masks/T_Mask_Half.uasset new file mode 100644 index 0000000..e4edc37 --- /dev/null +++ b/UnrealProject/Lost_Edge/Content/MaterialsLibrary/TexturesLibrary/Masks/T_Mask_Half.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:983fba2d9b8d89d359e02554065fb307c4afc5029a61cff2af335ff776760659 +size 9997 diff --git a/UnrealProject/Lost_Edge/Content/Models/Constructions/SM_CylinderQuat.uasset b/UnrealProject/Lost_Edge/Content/Models/Constructions/SM_CylinderQuat.uasset new file mode 100644 index 0000000..6b2b4f7 --- /dev/null +++ b/UnrealProject/Lost_Edge/Content/Models/Constructions/SM_CylinderQuat.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d60028b74cfb52f9c7466458bcb6cdde97e9e318f20c0134ec5e5d4eb0c2377f +size 56822 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 deleted file mode 100644 index 3efb7fe..0000000 --- a/UnrealProject/Lost_Edge/Content/Models/Decorations/SMA_SecurityCamera/M_Color_White.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:ee32b12d33c770b7c8067c4b7968dec4872cd619c194cf2906253421c9d00a39 -size 1267 diff --git a/UnrealProject/Lost_Edge/Content/UI/Blueprints/MainMenu/Pages/UI_MainMenu_Page_Credits.uasset b/UnrealProject/Lost_Edge/Content/UI/Blueprints/MainMenu/Pages/UI_MainMenu_Page_Credits.uasset index 5f751f0..5a0d2dd 100644 --- a/UnrealProject/Lost_Edge/Content/UI/Blueprints/MainMenu/Pages/UI_MainMenu_Page_Credits.uasset +++ b/UnrealProject/Lost_Edge/Content/UI/Blueprints/MainMenu/Pages/UI_MainMenu_Page_Credits.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f8c71a4d1d9ea92e63402298bd5b7b39804e09290f2a831a56cc0485a77d224b -size 114670 +oid sha256:5caba1dc54b9e1512e7cb5f401024a4de43c402bd3ce1de1ee086f1d95078304 +size 117326 diff --git a/UnrealProject/Lost_Edge/Content/UI/Blueprints/MainMenu/ST_MainMenu_Credits.uasset b/UnrealProject/Lost_Edge/Content/UI/Blueprints/MainMenu/ST_MainMenu_Credits.uasset new file mode 100644 index 0000000..4d43e92 --- /dev/null +++ b/UnrealProject/Lost_Edge/Content/UI/Blueprints/MainMenu/ST_MainMenu_Credits.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:367afa66d927b8d85ad31a3948c7bdd8888a4eb49c48d601d56d2e280072a10b +size 1875 diff --git a/UnrealProject/Lost_Edge/Lost_Edge.uproject b/UnrealProject/Lost_Edge/Lost_Edge.uproject index 1e8016e..bcbf9c6 100644 --- a/UnrealProject/Lost_Edge/Lost_Edge.uproject +++ b/UnrealProject/Lost_Edge/Lost_Edge.uproject @@ -108,10 +108,6 @@ "Name": "ChaosNiagara", "Enabled": false }, - { - "Name": "ChaosEditor", - "Enabled": false - }, { "Name": "ChaosSolverPlugin", "Enabled": false diff --git a/UnrealProject/Lost_Edge/Source/Lost_Edge/Private/DialogueManager.cpp b/UnrealProject/Lost_Edge/Source/Lost_Edge/Private/DialogueManager.cpp index f932034..4aee1c5 100644 --- a/UnrealProject/Lost_Edge/Source/Lost_Edge/Private/DialogueManager.cpp +++ b/UnrealProject/Lost_Edge/Source/Lost_Edge/Private/DialogueManager.cpp @@ -175,6 +175,7 @@ void UDialogueManager::QueueEnded() { nextDialogues.Pop(); leadDialogueProperties = nullptr; + leadDialogueTimerId = -1; FDialogueEndCallback callback; if(endCallbacks.Dequeue(callback)) callback.ExecuteIfBound(); @@ -234,16 +235,21 @@ void UDialogueManager::OnDialogueEnd() if(auto WM = AMainGameModeBase::GetWidgetsManager()) WM->HideDialogueWidget(*row); - if(leadDialogueProperties->playMode == EDialoguePlayMode::Sequential && !endCallbacks.IsEmpty()) + switch(leadDialogueProperties->playMode) { - leadDialogueProperties->rowName = FName(FString::FromInt(FCString::Atoi(*(leadDialogueProperties->rowName.ToString())) + 1)); - dialoguesLock.Unlock(); + case EDialoguePlayMode::Sequential: + leadDialogueProperties->rowName = FName(FString::FromInt(FCString::Atoi(*(leadDialogueProperties->rowName.ToString())) + 1)); + break; + case EDialoguePlayMode::ExactRow: + QueueEnded(); + break; + default: + break; + } + + dialoguesLock.Unlock(); + if(!endCallbacks.IsEmpty()) PlayNextDialogue(); - } - else - { - dialoguesLock.Unlock(); - } { FScopeLock lock1(&dialoguesLock); diff --git a/UnrealProject/Lost_Edge/Source/Lost_Edge/Private/DialogueManager.h b/UnrealProject/Lost_Edge/Source/Lost_Edge/Private/DialogueManager.h index a564184..95acb0a 100644 --- a/UnrealProject/Lost_Edge/Source/Lost_Edge/Private/DialogueManager.h +++ b/UnrealProject/Lost_Edge/Source/Lost_Edge/Private/DialogueManager.h @@ -31,7 +31,7 @@ struct FDialogueRow : public FTableRowBase UPROPERTY(EditAnywhere, BlueprintReadWrite) FString id = ""; - UPROPERTY(EditAnywhere, BlueprintReadWrite) + UPROPERTY(EditAnywhere, BlueprintReadWrite, meta = (MultiLine = "true")) FText text = FText::GetEmpty(); }; 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 b69128c..409b857 100644 --- a/UnrealProject/Lost_Edge/Source/Lost_Edge/Private/Levels/Level3.h +++ b/UnrealProject/Lost_Edge/Source/Lost_Edge/Private/Levels/Level3.h @@ -22,6 +22,20 @@ public: uint8 stage2Box2 = 0; UPROPERTY(BlueprintReadWrite) uint8 stage3 = 0; + UPROPERTY(BlueprintReadWrite) + bool ended = false; +}; + +USTRUCT(BlueprintType) +struct FLevel3_State_ExperimentalRoom +{ + GENERATED_BODY() + +public: + UPROPERTY(BlueprintReadWrite) + uint8 fail = 0; + UPROPERTY(BlueprintReadWrite) + bool ended = false; }; UCLASS(BlueprintType) @@ -34,4 +48,6 @@ protected: UPROPERTY(BlueprintReadWrite) FLevel3_State_TechnicalRoom technicalRoomState; + UPROPERTY(BlueprintReadWrite) + FLevel3_State_ExperimentalRoom experimentalRoomState; }; diff --git a/UnrealProject/Lost_Edge/Source/Lost_Edge/Private/QuestManager.cpp b/UnrealProject/Lost_Edge/Source/Lost_Edge/Private/QuestManager.cpp index 6374f20..4c72c0a 100644 --- a/UnrealProject/Lost_Edge/Source/Lost_Edge/Private/QuestManager.cpp +++ b/UnrealProject/Lost_Edge/Source/Lost_Edge/Private/QuestManager.cpp @@ -7,6 +7,8 @@ void AQuestManager::BeginPlay() { + Super::BeginPlay(); + if(auto gamemode = AMainGameModeBase::Get()) gamemode->questsUpdateDelegate.AddDynamic(this, &AQuestManager::Update); } @@ -15,6 +17,8 @@ void AQuestManager::EndPlay(const EEndPlayReason::Type EndPlayReason) { if(auto gamemode = AMainGameModeBase::Get()) gamemode->questsUpdateDelegate.RemoveDynamic(this, &AQuestManager::Update); + + Super::EndPlay(EndPlayReason); } void AQuestManager::Update(TArray quests)