diff --git a/Images/HeightMaps/Rugged Terrain with Rivers/Readme_HeightMaps.pdf b/Images/HeightMaps/Rugged Terrain with Rivers/Readme_HeightMaps.pdf new file mode 100644 index 0000000..6a5a32a Binary files /dev/null and b/Images/HeightMaps/Rugged Terrain with Rivers/Readme_HeightMaps.pdf differ diff --git a/Images/HeightMaps/Rugged Terrain with Rivers/Rugged Terrain Height Map.png b/Images/HeightMaps/Rugged Terrain with Rivers/Rugged Terrain Height Map.png new file mode 100644 index 0000000..3730446 Binary files /dev/null and b/Images/HeightMaps/Rugged Terrain with Rivers/Rugged Terrain Height Map.png differ diff --git a/Images/Textures/Moss/T_Moss1_Diffuse.png b/Images/Textures/Moss/T_Moss1_Diffuse.png new file mode 100644 index 0000000..5d63efa Binary files /dev/null and b/Images/Textures/Moss/T_Moss1_Diffuse.png differ diff --git a/Images/Textures/Moss/T_Moss1_Normal.png b/Images/Textures/Moss/T_Moss1_Normal.png new file mode 100644 index 0000000..ffa48f6 Binary files /dev/null and b/Images/Textures/Moss/T_Moss1_Normal.png differ diff --git a/Images/Textures/Moss/T_Moss2_Diffuse.png b/Images/Textures/Moss/T_Moss2_Diffuse.png new file mode 100644 index 0000000..882c1ff Binary files /dev/null and b/Images/Textures/Moss/T_Moss2_Diffuse.png differ diff --git a/Images/Textures/Moss/T_Moss2_Normal.png b/Images/Textures/Moss/T_Moss2_Normal.png new file mode 100644 index 0000000..122ca87 Binary files /dev/null and b/Images/Textures/Moss/T_Moss2_Normal.png differ diff --git a/Images/Textures/Moss/T_Moss3_Diffuse.png b/Images/Textures/Moss/T_Moss3_Diffuse.png new file mode 100644 index 0000000..74864b9 Binary files /dev/null and b/Images/Textures/Moss/T_Moss3_Diffuse.png differ diff --git a/Images/Textures/Moss/T_Moss3_Normal.png b/Images/Textures/Moss/T_Moss3_Normal.png new file mode 100644 index 0000000..95906b0 Binary files /dev/null and b/Images/Textures/Moss/T_Moss3_Normal.png differ diff --git a/Images/Textures/Moss/T_Moss4_Diffuse.png b/Images/Textures/Moss/T_Moss4_Diffuse.png new file mode 100644 index 0000000..fa7f254 Binary files /dev/null and b/Images/Textures/Moss/T_Moss4_Diffuse.png differ diff --git a/Images/Textures/Moss/T_Moss4_Normal.png b/Images/Textures/Moss/T_Moss4_Normal.png new file mode 100644 index 0000000..f5965ed Binary files /dev/null and b/Images/Textures/Moss/T_Moss4_Normal.png differ diff --git a/Images/Textures/Moss/source.txt b/Images/Textures/Moss/source.txt new file mode 100644 index 0000000..3d1b715 --- /dev/null +++ b/Images/Textures/Moss/source.txt @@ -0,0 +1,4 @@ +T_Moss1 - https://cc0-textures.com/t/cc0t-moss-001 +T_Moss2 - https://cc0-textures.com/t/cc0t-moss-002 +T_Moss3 - https://cc0-textures.com/t/cc0t-moss-003 +T_Moss4 - https://cc0-textures.com/t/cc0t-moss-004 diff --git a/Images/Textures/T_Cross_Normal.png b/Images/Textures/T_Cross_Normal.png new file mode 100644 index 0000000..a3bb3d3 Binary files /dev/null and b/Images/Textures/T_Cross_Normal.png differ diff --git a/Models/Decorations/SMA_Window.blend b/Models/Decorations/SMA_Window.blend new file mode 100644 index 0000000..53e7a4e Binary files /dev/null and b/Models/Decorations/SMA_Window.blend differ diff --git a/Models/Decorations/SMA_Window.fbx b/Models/Decorations/SMA_Window.fbx new file mode 100644 index 0000000..df4394b Binary files /dev/null and b/Models/Decorations/SMA_Window.fbx differ diff --git a/UnrealProject/Lost_Edge/Config/DefaultEngine.ini b/UnrealProject/Lost_Edge/Config/DefaultEngine.ini index 930c299..a5b7794 100644 --- a/UnrealProject/Lost_Edge/Config/DefaultEngine.ini +++ b/UnrealProject/Lost_Edge/Config/DefaultEngine.ini @@ -158,9 +158,6 @@ ManualIPAddress= +ProfileRedirects=(OldName="StaticMeshComponent",NewName="BlockAllDynamic") +ProfileRedirects=(OldName="SkeletalMeshActor",NewName="PhysicsActor") +ProfileRedirects=(OldName="InvisibleActor",NewName="InvisibleWallDynamic") -+ProfileRedirects=(OldName="AgeOfWarUnitComputer",NewName="AgeOfWarUnitPlayerZone") -+ProfileRedirects=(OldName="AgeOfWarUnit",NewName="AgeOfWarUnitPlayer") -+ProfileRedirects=(OldName="AgeOfWarUnitPlayerZone",NewName="AgeOfWarUnitComputer") -CollisionChannelRedirects=(OldName="Static",NewName="WorldStatic") -CollisionChannelRedirects=(OldName="Dynamic",NewName="WorldDynamic") -CollisionChannelRedirects=(OldName="VehicleMovement",NewName="Vehicle") @@ -215,3 +212,31 @@ Platforms=() [/Script/Engine.AudioSettings] DefaultBaseSoundMix=/Game/Audio/SM_Mixer.SM_Mixer +[/Script/Engine.PhysicsSettings] +PhysicsPrediction=(bEnablePhysicsPrediction=False,bEnablePhysicsHistoryCapture=False,MaxSupportedLatencyPrediction=1000.000000,ResimulationSettings=(bEnableResimulationErrorPositionThreshold=True,ResimulationErrorPositionThreshold=10.000000,bEnableResimulationErrorRotationThreshold=True,ResimulationErrorRotationThreshold=4.000000,bEnableResimulationErrorLinearVelocityThreshold=False,ResimulationErrorLinearVelocityThreshold=5.000000,bEnableResimulationErrorAngularVelocityThreshold=False,ResimulationErrorAngularVelocityThreshold=2.000000)) +PhysicErrorCorrection=(PingExtrapolation=0.100000,PingLimit=100.000000,ErrorPerLinearDifference=1.000000,ErrorPerAngularDifference=1.000000,MaxRestoredStateError=1.000000,MaxLinearHardSnapDistance=400.000000,PositionLerp=0.000000,AngleLerp=0.400000,LinearVelocityCoefficient=100.000000,AngularVelocityCoefficient=10.000000,ErrorAccumulationSeconds=0.500000,ErrorAccumulationDistanceSq=15.000000,ErrorAccumulationSimilarity=100.000000) +DefaultDegreesOfFreedom=Full3D +bSuppressFaceRemapTable=False +bSupportUVFromHitResults=False +bDisableActiveActors=False +bDisableKinematicStaticPairs=False +bDisableKinematicKinematicPairs=False +bDisableCCD=False +AnimPhysicsMinDeltaTime=0.000000 +bSimulateAnimPhysicsAfterReset=False +MinPhysicsDeltaTime=0.000000 +MaxPhysicsDeltaTime=0.033333 +bSubstepping=False +bSubsteppingAsync=False +bTickPhysicsAsync=False +AsyncFixedTimeStepSize=0.033333 +MaxSubstepDeltaTime=0.016667 +MaxSubsteps=6 +SyncSceneSmoothingFactor=0.000000 +InitialAverageFrameRate=0.016667 +PhysXTreeRebuildRate=10 ++PhysicalSurfaces=(Type=SurfaceType1,Name="Grass") +DefaultBroadphaseSettings=(bUseMBPOnClient=False,bUseMBPOnServer=False,bUseMBPOuterBounds=False,MBPBounds=(Min=(X=0.000000,Y=0.000000,Z=0.000000),Max=(X=0.000000,Y=0.000000,Z=0.000000),IsValid=False),MBPOuterBounds=(Min=(X=0.000000,Y=0.000000,Z=0.000000),Max=(X=0.000000,Y=0.000000,Z=0.000000),IsValid=False),MBPNumSubdivs=2) +MinDeltaVelocityForHitEvents=0.000000 +ChaosSettings=(DefaultThreadingModel=TaskGraph,DedicatedThreadTickMode=VariableCappedWithTarget,DedicatedThreadBufferMode=Double) + diff --git a/UnrealProject/Lost_Edge/Content/Audio/Sounds/Clock.uasset b/UnrealProject/Lost_Edge/Content/Audio/Sounds/Clock.uasset deleted file mode 100644 index cb56cd1..0000000 --- a/UnrealProject/Lost_Edge/Content/Audio/Sounds/Clock.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d93939331ddcf16c2e4f3bcfbda4dcfe86ae2f9b6735714949148f9070f1828d -size 44820 diff --git a/UnrealProject/Lost_Edge/Content/Audio/Sounds/Knock.uasset b/UnrealProject/Lost_Edge/Content/Audio/Sounds/Knock.uasset index 3d5bc73..9bac2eb 100644 --- a/UnrealProject/Lost_Edge/Content/Audio/Sounds/Knock.uasset +++ b/UnrealProject/Lost_Edge/Content/Audio/Sounds/Knock.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:765d214c97e7ea5d980099afa50801f62d7df95b40bfdd313a6de11ccd3fa17d -size 72552 +oid sha256:9fe1f29d2b08e8ab4a89d8fd9ca90fee07045422efc18103ceacd81e499a2e10 +size 1459 diff --git a/UnrealProject/Lost_Edge/Content/Audio/Sounds/SA_Default.uasset b/UnrealProject/Lost_Edge/Content/Audio/Sounds/SA_Default.uasset new file mode 100644 index 0000000..660e315 --- /dev/null +++ b/UnrealProject/Lost_Edge/Content/Audio/Sounds/SA_Default.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:17ee2c21fb30f7c3d2406b3fde7f9ed671d2ccdfab64932c05efc444960a184c +size 1603 diff --git a/UnrealProject/Lost_Edge/Content/Audio/Sounds/SW_Clock.uasset b/UnrealProject/Lost_Edge/Content/Audio/Sounds/SW_Clock.uasset new file mode 100644 index 0000000..5d6bdc1 --- /dev/null +++ b/UnrealProject/Lost_Edge/Content/Audio/Sounds/SW_Clock.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3dc59acf3ca2bdc4c95e624f2133356742e664cd7f370b0eedb4914722c4f7f6 +size 45443 diff --git a/UnrealProject/Lost_Edge/Content/Audio/Sounds/SW_Knock.uasset b/UnrealProject/Lost_Edge/Content/Audio/Sounds/SW_Knock.uasset new file mode 100644 index 0000000..5341531 --- /dev/null +++ b/UnrealProject/Lost_Edge/Content/Audio/Sounds/SW_Knock.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8ee7fe7a9eded3f3ae318f1a30cb6feb3721e32334e6898530c388799f6de7ed +size 77786 diff --git a/UnrealProject/Lost_Edge/Content/Blueprints/BP_DirectionPoint.uasset b/UnrealProject/Lost_Edge/Content/Blueprints/BP_DirectionPoint.uasset new file mode 100644 index 0000000..d07fef2 --- /dev/null +++ b/UnrealProject/Lost_Edge/Content/Blueprints/BP_DirectionPoint.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:53dcda9958892a3fee34e37b2971b2555c5a1aded76b2895af39befaa7e3d9d6 +size 26732 diff --git a/UnrealProject/Lost_Edge/Content/Blueprints/BP_InWorlTextLine.uasset b/UnrealProject/Lost_Edge/Content/Blueprints/BP_InWorlTextLine.uasset new file mode 100644 index 0000000..c98bc00 --- /dev/null +++ b/UnrealProject/Lost_Edge/Content/Blueprints/BP_InWorlTextLine.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:dc90497aa1206439959e0847752a4f22be51b20bf8a575516fbfcb2605220aac +size 40946 diff --git a/UnrealProject/Lost_Edge/Content/Blueprints/BP_Pointer.uasset b/UnrealProject/Lost_Edge/Content/Blueprints/BP_Pointer.uasset new file mode 100644 index 0000000..1d4fbe8 --- /dev/null +++ b/UnrealProject/Lost_Edge/Content/Blueprints/BP_Pointer.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c2ee9f121a845318bb606394503807391133a758cbfee0a1fe007c881fbe6cf5 +size 29508 diff --git a/UnrealProject/Lost_Edge/Content/Blueprints/Characters/BP_Player.uasset b/UnrealProject/Lost_Edge/Content/Blueprints/Characters/BP_Player.uasset index 8efa787..ff43b04 100644 --- a/UnrealProject/Lost_Edge/Content/Blueprints/Characters/BP_Player.uasset +++ b/UnrealProject/Lost_Edge/Content/Blueprints/Characters/BP_Player.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:bb3930a1fcc1e0a639ec3e2d880188bb6cfd24b890d976d8e44c58dc80a23d9b -size 465136 +oid sha256:edce730484d91942f257ae29265f7a5fc69f2ff5c0f0a40d9c6fec1ae2437658 +size 439607 diff --git a/UnrealProject/Lost_Edge/Content/Blueprints/Characters/StoryNPC/BP_StoryNPC_AIController.uasset b/UnrealProject/Lost_Edge/Content/Blueprints/Characters/StoryNPC/BP_StoryNPC_AIController.uasset index 361d78d..076b70c 100644 --- a/UnrealProject/Lost_Edge/Content/Blueprints/Characters/StoryNPC/BP_StoryNPC_AIController.uasset +++ b/UnrealProject/Lost_Edge/Content/Blueprints/Characters/StoryNPC/BP_StoryNPC_AIController.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:37e533534e30c749c600ebab75cff1cac44a901c5f901fb9c20957d70336a852 -size 84087 +oid sha256:89ec43584089a3c7b3e6fcc2d66e23a93eaf8ce8df0708a8272334a620a3c71d +size 87445 diff --git a/UnrealProject/Lost_Edge/Content/Blueprints/Decorations/BP_Door.uasset b/UnrealProject/Lost_Edge/Content/Blueprints/Decorations/BP_Door.uasset new file mode 100644 index 0000000..c71f885 --- /dev/null +++ b/UnrealProject/Lost_Edge/Content/Blueprints/Decorations/BP_Door.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8132e943e2e104f176711a6484ebe5bc296b4df515b194db2fcae8c464f4548c +size 164713 diff --git a/UnrealProject/Lost_Edge/Content/Blueprints/Decorations/GrassCapture/BP_GrassCapture.uasset b/UnrealProject/Lost_Edge/Content/Blueprints/Decorations/GrassCapture/BP_GrassCapture.uasset new file mode 100644 index 0000000..9ddc9bb --- /dev/null +++ b/UnrealProject/Lost_Edge/Content/Blueprints/Decorations/GrassCapture/BP_GrassCapture.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6ffbe6ff514028ffd66588cc8632b432636fb2e10ffe0dd451da5a8ec6891e6f +size 129995 diff --git a/UnrealProject/Lost_Edge/Content/Blueprints/Decorations/GrassCapture/MF_GrassCapture_Interaction.uasset b/UnrealProject/Lost_Edge/Content/Blueprints/Decorations/GrassCapture/MF_GrassCapture_Interaction.uasset new file mode 100644 index 0000000..1d0c54e --- /dev/null +++ b/UnrealProject/Lost_Edge/Content/Blueprints/Decorations/GrassCapture/MF_GrassCapture_Interaction.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:55c8b8b70a2f3df0f7a61f81929688b9335e0e6fb24664d04631cf715d4b53d1 +size 58225 diff --git a/UnrealProject/Lost_Edge/Content/Blueprints/Decorations/GrassCapture/MPC_GrassCapture.uasset b/UnrealProject/Lost_Edge/Content/Blueprints/Decorations/GrassCapture/MPC_GrassCapture.uasset new file mode 100644 index 0000000..5a0e929 --- /dev/null +++ b/UnrealProject/Lost_Edge/Content/Blueprints/Decorations/GrassCapture/MPC_GrassCapture.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:830678c4adf4ab273d9c8a625c82814e4286ce35b224f6a9402a99eb751c48b2 +size 2238 diff --git a/UnrealProject/Lost_Edge/Content/Blueprints/Decorations/GrassCapture/M_GrassCapture_Background.uasset b/UnrealProject/Lost_Edge/Content/Blueprints/Decorations/GrassCapture/M_GrassCapture_Background.uasset new file mode 100644 index 0000000..06b2e82 --- /dev/null +++ b/UnrealProject/Lost_Edge/Content/Blueprints/Decorations/GrassCapture/M_GrassCapture_Background.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5d40107858c65f2bf34f90adb3065a827aff11e7171720e576d154641529addd +size 89640 diff --git a/UnrealProject/Lost_Edge/Content/Blueprints/Decorations/GrassCapture/M_GrassCapture_Direction.uasset b/UnrealProject/Lost_Edge/Content/Blueprints/Decorations/GrassCapture/M_GrassCapture_Direction.uasset new file mode 100644 index 0000000..dc358d7 --- /dev/null +++ b/UnrealProject/Lost_Edge/Content/Blueprints/Decorations/GrassCapture/M_GrassCapture_Direction.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e7fc37397b6a73b72a2e5d4b727575858768f3db2d60bce196ca05c07386218b +size 120171 diff --git a/UnrealProject/Lost_Edge/Content/Blueprints/Decorations/GrassCapture/P_GrassCapture_Affector.uasset b/UnrealProject/Lost_Edge/Content/Blueprints/Decorations/GrassCapture/P_GrassCapture_Affector.uasset new file mode 100644 index 0000000..0bad828 --- /dev/null +++ b/UnrealProject/Lost_Edge/Content/Blueprints/Decorations/GrassCapture/P_GrassCapture_Affector.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:21b831255bd94abb4c8c1b073b2a4abeebab0595978fa016b022178e3b088f6c +size 18132 diff --git a/UnrealProject/Lost_Edge/Content/Blueprints/Decorations/GrassCapture/RT_GrassCapture.uasset b/UnrealProject/Lost_Edge/Content/Blueprints/Decorations/GrassCapture/RT_GrassCapture.uasset new file mode 100644 index 0000000..92aefa5 --- /dev/null +++ b/UnrealProject/Lost_Edge/Content/Blueprints/Decorations/GrassCapture/RT_GrassCapture.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b48fc5df89eb89d9743c4509cd0d904bc4b9ee7f999884ea5a80c48f05d1bc4a +size 4650 diff --git a/UnrealProject/Lost_Edge/Content/Blueprints/Minigames/AgeOfWar/BP_Minigame_AgeOfWar.uasset b/UnrealProject/Lost_Edge/Content/Blueprints/Minigames/AgeOfWar/BP_Minigame_AgeOfWar.uasset index 8ae7155..c798ecd 100644 --- a/UnrealProject/Lost_Edge/Content/Blueprints/Minigames/AgeOfWar/BP_Minigame_AgeOfWar.uasset +++ b/UnrealProject/Lost_Edge/Content/Blueprints/Minigames/AgeOfWar/BP_Minigame_AgeOfWar.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5e9165dea307bfecba98443cb3889799bc4f656fc85e226377392c4fd839cea0 -size 496980 +oid sha256:7c180606f9e398f29ad715aa49c40d0fa6be85c224e4ce9a553f7e4c1f8cdb8a +size 502100 diff --git a/UnrealProject/Lost_Edge/Content/Blueprints/Minigames/Fishing/UI_Minigame_Fishing.uasset b/UnrealProject/Lost_Edge/Content/Blueprints/Minigames/Fishing/UI_Minigame_Fishing.uasset index 3f55ec9..64273b1 100644 --- a/UnrealProject/Lost_Edge/Content/Blueprints/Minigames/Fishing/UI_Minigame_Fishing.uasset +++ b/UnrealProject/Lost_Edge/Content/Blueprints/Minigames/Fishing/UI_Minigame_Fishing.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e93cb8b3d14817ca9d141c35aafa937b8e2a6a14acb2fb0d0f1ffc9972637257 -size 482940 +oid sha256:5fe93b7f9bef4e844607c3792a1fde97f196f0a088dc179952d713d3c876ff28 +size 520047 diff --git a/UnrealProject/Lost_Edge/Content/Blueprints/Minigames/RythmClick/UIC_Minigame_RythmClickButton.uasset b/UnrealProject/Lost_Edge/Content/Blueprints/Minigames/RythmClick/UIC_Minigame_RythmClickButton.uasset index 5676198..281a090 100644 --- a/UnrealProject/Lost_Edge/Content/Blueprints/Minigames/RythmClick/UIC_Minigame_RythmClickButton.uasset +++ b/UnrealProject/Lost_Edge/Content/Blueprints/Minigames/RythmClick/UIC_Minigame_RythmClickButton.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c4c26bafad40de3929846af130903d034716218aad1d9a58cf76eead2f88e6e0 -size 244416 +oid sha256:91a8c156a892ef9a03a76da66d4c332c2e7fa19aace2b3767d2f30b9e8d65503 +size 272051 diff --git a/UnrealProject/Lost_Edge/Content/Blueprints/Minigames/RythmClick/UI_Minigame_RythmClickCanvas.uasset b/UnrealProject/Lost_Edge/Content/Blueprints/Minigames/RythmClick/UI_Minigame_RythmClickCanvas.uasset index f14d0ae..40ea817 100644 --- a/UnrealProject/Lost_Edge/Content/Blueprints/Minigames/RythmClick/UI_Minigame_RythmClickCanvas.uasset +++ b/UnrealProject/Lost_Edge/Content/Blueprints/Minigames/RythmClick/UI_Minigame_RythmClickCanvas.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3770033eabb585fd3c125c92d180c677642c11e4d8268dc2588082d7020daefd -size 164680 +oid sha256:f545dd5a4e914e277643b6015f4caaad5a78892f9a19a51b795fb57a27d09922 +size 205361 diff --git a/UnrealProject/Lost_Edge/Content/Foliages/F_Grass.uasset b/UnrealProject/Lost_Edge/Content/Foliages/F_Grass.uasset deleted file mode 100644 index 284fe25..0000000 --- a/UnrealProject/Lost_Edge/Content/Foliages/F_Grass.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:68033bc2bc7d78aa60b55679ff3b806a478ac539ee37baf8369dc3e3809f977e -size 100012 diff --git a/UnrealProject/Lost_Edge/Content/Foliages/F_GrassMultiLevel1.uasset b/UnrealProject/Lost_Edge/Content/Foliages/F_GrassMultiLevel1.uasset deleted file mode 100644 index 4bacb4b..0000000 --- a/UnrealProject/Lost_Edge/Content/Foliages/F_GrassMultiLevel1.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:18f4f242e6260f98b912688ab5ca9a552b4e0a15f01ad2aed801b7a1bee07cef -size 10405 diff --git a/UnrealProject/Lost_Edge/Content/Foliages/F_GrassMultiLevel2.uasset b/UnrealProject/Lost_Edge/Content/Foliages/F_GrassMultiLevel2.uasset deleted file mode 100644 index da99daa..0000000 --- a/UnrealProject/Lost_Edge/Content/Foliages/F_GrassMultiLevel2.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:210ec03c54a3bbfc48dd4505d35730366561a4b5b7d3a5c414031c3c1636bc7a -size 102223 diff --git a/UnrealProject/Lost_Edge/Content/Foliages/F_GrassMultiTest.uasset b/UnrealProject/Lost_Edge/Content/Foliages/F_GrassMultiTest.uasset deleted file mode 100644 index 85e6304..0000000 --- a/UnrealProject/Lost_Edge/Content/Foliages/F_GrassMultiTest.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:7ac828067ec2a7e42cd91b35fa0b1e99906b450bfe0a1d926a51cae1b58819c3 -size 99005 diff --git a/UnrealProject/Lost_Edge/Content/Foliages/F_SpruceA.uasset b/UnrealProject/Lost_Edge/Content/Foliages/F_SpruceA.uasset index 9723b65..4349b2d 100644 --- a/UnrealProject/Lost_Edge/Content/Foliages/F_SpruceA.uasset +++ b/UnrealProject/Lost_Edge/Content/Foliages/F_SpruceA.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f1b5b5d0f1db2bd034303a88449e3dbd8cab7ff2e3ef40fc4be1711b57d6e882 -size 98943 +oid sha256:bd271bfcc9c893aff83be8960e2866ac2b33c5d1c09d22fdd17a971ee6b7d008 +size 7004 diff --git a/UnrealProject/Lost_Edge/Content/Foliages/F_SpruceB.uasset b/UnrealProject/Lost_Edge/Content/Foliages/F_SpruceB.uasset index e0f4d81..212e010 100644 --- a/UnrealProject/Lost_Edge/Content/Foliages/F_SpruceB.uasset +++ b/UnrealProject/Lost_Edge/Content/Foliages/F_SpruceB.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:690786da722e9d3da2229069e0a32cf7ef3cf4a97bf2785dad39b88f171cffe1 -size 97302 +oid sha256:9874cb841533a8efce81472795ae7ee06f34d90f32a63dc73cba8ae27562a6f6 +size 6634 diff --git a/UnrealProject/Lost_Edge/Content/Input/Actions/IA_CutsceneSkip.uasset b/UnrealProject/Lost_Edge/Content/Input/Actions/IA_CutsceneSkip.uasset index 6ec1083..8bae4b1 100644 --- a/UnrealProject/Lost_Edge/Content/Input/Actions/IA_CutsceneSkip.uasset +++ b/UnrealProject/Lost_Edge/Content/Input/Actions/IA_CutsceneSkip.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5530cb6a960c071aefacc3a54818c7a20fda963bc5726cdd2f2af57394c2ee9e -size 2182 +oid sha256:d21c4fa2464323a0debd2267e5c7ab3412a93045f251b49a7c827f7a9187d15c +size 2186 diff --git a/UnrealProject/Lost_Edge/Content/Input/Actions/IA_DialogueSkip.uasset b/UnrealProject/Lost_Edge/Content/Input/Actions/IA_DialogueSkip.uasset index 4a5137a..adb58a9 100644 --- a/UnrealProject/Lost_Edge/Content/Input/Actions/IA_DialogueSkip.uasset +++ b/UnrealProject/Lost_Edge/Content/Input/Actions/IA_DialogueSkip.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4ef85bdcad6aa0ab3dfd52f6bd547809fd5fced6a3f4674801d891b81594f3e4 -size 2185 +oid sha256:d30765f060e61baf10e6ab02ad9432a899a243969362faf80fb7e0fa8c975509 +size 2189 diff --git a/UnrealProject/Lost_Edge/Content/Input/Actions/IA_FlyUpDown.uasset b/UnrealProject/Lost_Edge/Content/Input/Actions/IA_FlyUpDown.uasset index b4473ba..9e0c0aa 100644 --- a/UnrealProject/Lost_Edge/Content/Input/Actions/IA_FlyUpDown.uasset +++ b/UnrealProject/Lost_Edge/Content/Input/Actions/IA_FlyUpDown.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:66c4ec62162ec4e2fe7ac84ad1887dfb7178a6803ff580c53cbd867762c0594e -size 1653 +oid sha256:abf0ce5459df213cf024eb92b4c47a565ab25953c8d57ffd9cafc0ddfc5e32e2 +size 1657 diff --git a/UnrealProject/Lost_Edge/Content/Input/Actions/IA_Interact.uasset b/UnrealProject/Lost_Edge/Content/Input/Actions/IA_Interact.uasset index 0b447b7..da68d08 100644 --- a/UnrealProject/Lost_Edge/Content/Input/Actions/IA_Interact.uasset +++ b/UnrealProject/Lost_Edge/Content/Input/Actions/IA_Interact.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e1722277cfa6fca66dc8f537dfba31de8c55cb9f20e994047add951c052076cc -size 1756 +oid sha256:3dbd402389d50a5a6f8fc1e79ba4cd641c3ae4b4d7dfe89fa6f59f2c47dd9fbe +size 1760 diff --git a/UnrealProject/Lost_Edge/Content/Input/Actions/IA_Journal.uasset b/UnrealProject/Lost_Edge/Content/Input/Actions/IA_Journal.uasset index 8ecaa63..b125049 100644 --- a/UnrealProject/Lost_Edge/Content/Input/Actions/IA_Journal.uasset +++ b/UnrealProject/Lost_Edge/Content/Input/Actions/IA_Journal.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:217b10c8af280f0b7ae1d066801af1d21cb20d8a0b318e0d1db7f57af890747d -size 1751 +oid sha256:04583f087a1a1d62103c820ba64ef02046de5989fe73d6a4ba7cb7c1b0b99c44 +size 1755 diff --git a/UnrealProject/Lost_Edge/Content/Input/Actions/IA_Jump.uasset b/UnrealProject/Lost_Edge/Content/Input/Actions/IA_Jump.uasset index b3eba99..25ad634 100644 --- a/UnrealProject/Lost_Edge/Content/Input/Actions/IA_Jump.uasset +++ b/UnrealProject/Lost_Edge/Content/Input/Actions/IA_Jump.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6e69357b4ac2dab5f8eb40c3677504d18222fcca8b1fb9b98bcc0fb7c6737509 -size 1736 +oid sha256:60d20825d0f617b20f62655512f43a50fc4ddc699f3d84dc87fdc75fd744ab19 +size 1740 diff --git a/UnrealProject/Lost_Edge/Content/Input/Actions/IA_Look.uasset b/UnrealProject/Lost_Edge/Content/Input/Actions/IA_Look.uasset index 19ebc62..e25d24b 100644 --- a/UnrealProject/Lost_Edge/Content/Input/Actions/IA_Look.uasset +++ b/UnrealProject/Lost_Edge/Content/Input/Actions/IA_Look.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f994ec5b3f852e302b3511d03be04245502a689090235896c518227e7d5aa234 -size 1628 +oid sha256:fa95537e8d6ca9fe99b36128fa0386192ee707479c0cdf652ffcfb815a81bad6 +size 1632 diff --git a/UnrealProject/Lost_Edge/Content/Input/Actions/IA_Move.uasset b/UnrealProject/Lost_Edge/Content/Input/Actions/IA_Move.uasset index 5a73650..4fb14e4 100644 --- a/UnrealProject/Lost_Edge/Content/Input/Actions/IA_Move.uasset +++ b/UnrealProject/Lost_Edge/Content/Input/Actions/IA_Move.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1d9e126debb3f10f36f1a9bfe99323a0e0b42ba4553fa518dae537723a19c186 -size 1628 +oid sha256:42a74425562841b04f9c9a193e38e6883b8932ce7d5efc9a5b4c9b3d2ba04796 +size 1632 diff --git a/UnrealProject/Lost_Edge/Content/Input/Actions/IA_OpenMenu.uasset b/UnrealProject/Lost_Edge/Content/Input/Actions/IA_OpenMenu.uasset index 70aba1b..1c9ec45 100644 --- a/UnrealProject/Lost_Edge/Content/Input/Actions/IA_OpenMenu.uasset +++ b/UnrealProject/Lost_Edge/Content/Input/Actions/IA_OpenMenu.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:82aeffed04fc214c4627cef694e4ead022d9454235c6777eee4785b0cd539bc1 -size 1756 +oid sha256:7307aa0e167c8675ff50adae812d1b3acec7323887089d4e3056e70b97a4aab4 +size 1956 diff --git a/UnrealProject/Lost_Edge/Content/Input/Actions/IA_Run.uasset b/UnrealProject/Lost_Edge/Content/Input/Actions/IA_Run.uasset index ed3ae1c..7da73dc 100644 --- a/UnrealProject/Lost_Edge/Content/Input/Actions/IA_Run.uasset +++ b/UnrealProject/Lost_Edge/Content/Input/Actions/IA_Run.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4a629651e43282ce96fc5b46bbd68a7df70307a692e7fbefff4a26382de019ce -size 1728 +oid sha256:fd8605c2d040dc70de732ec1f6a30469a8c01ebe19c2f02e3b088e97d5482db7 +size 1732 diff --git a/UnrealProject/Lost_Edge/Content/Input/Actions/IA_ShowInventory.uasset b/UnrealProject/Lost_Edge/Content/Input/Actions/IA_ShowInventory.uasset index 1d2eed8..69e4ac6 100644 --- a/UnrealProject/Lost_Edge/Content/Input/Actions/IA_ShowInventory.uasset +++ b/UnrealProject/Lost_Edge/Content/Input/Actions/IA_ShowInventory.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:76c27401f5b67464a3757392f6fce308311fc696656d83739a1823edb25597a6 -size 1781 +oid sha256:3e3e8cb60eb6f6f5e794c47f0e1f056227a1cd0a514e653a7aea80e71f46846d +size 1785 diff --git a/UnrealProject/Lost_Edge/Content/Input/Actions/IA_TurnCameraMode.uasset b/UnrealProject/Lost_Edge/Content/Input/Actions/IA_TurnCameraMode.uasset index 383a9bb..d1bb179 100644 --- a/UnrealProject/Lost_Edge/Content/Input/Actions/IA_TurnCameraMode.uasset +++ b/UnrealProject/Lost_Edge/Content/Input/Actions/IA_TurnCameraMode.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:40e8bd4517fde97bc15a53587f9ce41c7ef122e58b0259fead93c28c28265ce4 -size 1786 +oid sha256:459a1016d64fcb39f791fb64e1604208e3da111254ef8cffaf0f0572c825e3aa +size 1790 diff --git a/UnrealProject/Lost_Edge/Content/Input/IMC_Player.uasset b/UnrealProject/Lost_Edge/Content/Input/IMC_Player.uasset index a7a917f..7f34987 100644 --- a/UnrealProject/Lost_Edge/Content/Input/IMC_Player.uasset +++ b/UnrealProject/Lost_Edge/Content/Input/IMC_Player.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9313d9630c641cbc49cb64f35aa1d0618e5275cd4f67cc19a1974ec165891475 -size 12332 +oid sha256:edb11121467c4cdfcdcb1c91fe1c1acd50769c28a3ea7185ce66b0821435f863 +size 12644 diff --git a/UnrealProject/Lost_Edge/Content/Input/Interactables/Actions/IA_InteractableActivate.uasset b/UnrealProject/Lost_Edge/Content/Input/Interactables/Actions/IA_InteractableActivate.uasset index d775865..97bc973 100644 --- a/UnrealProject/Lost_Edge/Content/Input/Interactables/Actions/IA_InteractableActivate.uasset +++ b/UnrealProject/Lost_Edge/Content/Input/Interactables/Actions/IA_InteractableActivate.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1b9a86065bc5d032ee723d28748a99f96d3fc9531f717cff27ea2a8db31e7b8b -size 2183 +oid sha256:07a133bbc2a564949780189838fc5345f0f82bcb6d6ed3dcbf1572ea5872fd86 +size 2187 diff --git a/UnrealProject/Lost_Edge/Content/Input/Interactables/Actions/IA_InteractableActivateMouse.uasset b/UnrealProject/Lost_Edge/Content/Input/Interactables/Actions/IA_InteractableActivateMouse.uasset new file mode 100644 index 0000000..93a8dc2 --- /dev/null +++ b/UnrealProject/Lost_Edge/Content/Input/Interactables/Actions/IA_InteractableActivateMouse.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:82a80695274cd92a4e5ce81a409b39a5a4590a84583a7fbc85d0a667c2b4cf1e +size 2222 diff --git a/UnrealProject/Lost_Edge/Content/Input/Interactables/Actions/IA_InteractableInventoryFirst.uasset b/UnrealProject/Lost_Edge/Content/Input/Interactables/Actions/IA_InteractableInventoryFirst.uasset index 71cea09..0f70147 100644 --- a/UnrealProject/Lost_Edge/Content/Input/Interactables/Actions/IA_InteractableInventoryFirst.uasset +++ b/UnrealProject/Lost_Edge/Content/Input/Interactables/Actions/IA_InteractableInventoryFirst.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3d2770dc2e2f2da9eb97cb659b4d12335422d859255e59cf495038ca053a82f6 -size 1966 +oid sha256:df004895b1029415d3a878f905ac58c5e2dd0083f7d2fa448c53d0d7ca89959f +size 1970 diff --git a/UnrealProject/Lost_Edge/Content/Input/Interactables/Actions/IA_InteractableInventorySecond.uasset b/UnrealProject/Lost_Edge/Content/Input/Interactables/Actions/IA_InteractableInventorySecond.uasset index a34a237..12c0136 100644 --- a/UnrealProject/Lost_Edge/Content/Input/Interactables/Actions/IA_InteractableInventorySecond.uasset +++ b/UnrealProject/Lost_Edge/Content/Input/Interactables/Actions/IA_InteractableInventorySecond.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:824587d5943e4903e019ebfbca62481fcc9fb89604bb2b3f9e6a324ac3dbf8bf -size 1971 +oid sha256:ced810ae5495b11f7ece11b323e656b9f17670eb8fd0164bf983b89113ccf57f +size 1975 diff --git a/UnrealProject/Lost_Edge/Content/Input/Interactables/Actions/IA_InteractableMoveActivateL.uasset b/UnrealProject/Lost_Edge/Content/Input/Interactables/Actions/IA_InteractableMoveActivateL.uasset index 857f45a..4e4afa8 100644 --- a/UnrealProject/Lost_Edge/Content/Input/Interactables/Actions/IA_InteractableMoveActivateL.uasset +++ b/UnrealProject/Lost_Edge/Content/Input/Interactables/Actions/IA_InteractableMoveActivateL.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9d4703cb24d6799dc45a9ab193e76ad6730a203a52df299a2cf8e6bbf8c5301e -size 2275 +oid sha256:a00286f4770c61675197cbad52bd4d5e373c477a5b6ee5de6483ece27ecce4b9 +size 2279 diff --git a/UnrealProject/Lost_Edge/Content/Input/Interactables/Actions/IA_InteractableMoveActivateR.uasset b/UnrealProject/Lost_Edge/Content/Input/Interactables/Actions/IA_InteractableMoveActivateR.uasset index e5ad176..ead52fa 100644 --- a/UnrealProject/Lost_Edge/Content/Input/Interactables/Actions/IA_InteractableMoveActivateR.uasset +++ b/UnrealProject/Lost_Edge/Content/Input/Interactables/Actions/IA_InteractableMoveActivateR.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:98aded222662fad54bc858139ff387e4a14ea76b66648b44bbe7b934a06228f3 -size 2221 +oid sha256:f11417059c71b1cf954758c511a944c197e14a2cd434532daa9ee68e88c29dc7 +size 2225 diff --git a/UnrealProject/Lost_Edge/Content/Input/Interactables/Actions/IA_InteractableMoveRotate.uasset b/UnrealProject/Lost_Edge/Content/Input/Interactables/Actions/IA_InteractableMoveRotate.uasset index b8d026d..bf32918 100644 --- a/UnrealProject/Lost_Edge/Content/Input/Interactables/Actions/IA_InteractableMoveRotate.uasset +++ b/UnrealProject/Lost_Edge/Content/Input/Interactables/Actions/IA_InteractableMoveRotate.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3330a7e28e4c3d7d470f2dfbfd0831561de7c025833d90cce36127b2f4b9663d -size 1838 +oid sha256:b25125d5866c3817d63ffde92b4453ab1bbb03d98097e2d9908828233ea5a748 +size 1842 diff --git a/UnrealProject/Lost_Edge/Content/Input/Interactables/Actions/IA_InteractableMoveZoom.uasset b/UnrealProject/Lost_Edge/Content/Input/Interactables/Actions/IA_InteractableMoveZoom.uasset index fe54309..9a06b14 100644 --- a/UnrealProject/Lost_Edge/Content/Input/Interactables/Actions/IA_InteractableMoveZoom.uasset +++ b/UnrealProject/Lost_Edge/Content/Input/Interactables/Actions/IA_InteractableMoveZoom.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0fcff130b0ee695e29975591155c6f6fcf247443e8023da1450c85de0f20a06a -size 2077 +oid sha256:d2a86645c83a5e52c464cfea0dc66270eb1c42f3f743a6ca31f20b01085fd0e4 +size 2081 diff --git a/UnrealProject/Lost_Edge/Content/Input/Interactables/IMC_InteractableActivateMouse.uasset b/UnrealProject/Lost_Edge/Content/Input/Interactables/IMC_InteractableActivateMouse.uasset new file mode 100644 index 0000000..c0f1aa9 --- /dev/null +++ b/UnrealProject/Lost_Edge/Content/Input/Interactables/IMC_InteractableActivateMouse.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b534a8ca7f5f00ffde6edc8c02056134aa6630a7ba5bc73ea5db6a3396c11f5b +size 2973 diff --git a/UnrealProject/Lost_Edge/Content/Input/Minigame/Actions/IA_Minigame_CrossyRoad_Left.uasset b/UnrealProject/Lost_Edge/Content/Input/Minigame/Actions/IA_Minigame_CrossyRoad_Left.uasset index 9d3175f..80ff4f5 100644 --- a/UnrealProject/Lost_Edge/Content/Input/Minigame/Actions/IA_Minigame_CrossyRoad_Left.uasset +++ b/UnrealProject/Lost_Edge/Content/Input/Minigame/Actions/IA_Minigame_CrossyRoad_Left.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e253faa3ef2ab7961a7ceb28376f922c7cbef52a0813210bf7778f2a8156c837 -size 2198 +oid sha256:60eb8af1a78220604da8ec81fb68972732b856a3734dfd0458e1e634b44c3363 +size 2202 diff --git a/UnrealProject/Lost_Edge/Content/Input/Minigame/Actions/IA_Minigame_CrossyRoad_Right.uasset b/UnrealProject/Lost_Edge/Content/Input/Minigame/Actions/IA_Minigame_CrossyRoad_Right.uasset index 9f84d6c..7f10d07 100644 --- a/UnrealProject/Lost_Edge/Content/Input/Minigame/Actions/IA_Minigame_CrossyRoad_Right.uasset +++ b/UnrealProject/Lost_Edge/Content/Input/Minigame/Actions/IA_Minigame_CrossyRoad_Right.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7950564e498b3241940d4146daffd56ca1c6a6e8eb1cb7d63e35524a959fac63 -size 2207 +oid sha256:e7489ca4dce05fd4f0aa58bbfb3979780ddbb11f883b9b1cb342173ece706075 +size 2211 diff --git a/UnrealProject/Lost_Edge/Content/Input/Minigame/Actions/IA_Minigame_CrossyRoad_Up.uasset b/UnrealProject/Lost_Edge/Content/Input/Minigame/Actions/IA_Minigame_CrossyRoad_Up.uasset index e5f6221..3e0599e 100644 --- a/UnrealProject/Lost_Edge/Content/Input/Minigame/Actions/IA_Minigame_CrossyRoad_Up.uasset +++ b/UnrealProject/Lost_Edge/Content/Input/Minigame/Actions/IA_Minigame_CrossyRoad_Up.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2bf73ac7c3ca9d199a3dadb839dee41103d7d13a00352f5d2a2ab85cc3634ff0 -size 2180 +oid sha256:acd4663f628a2865eaf051c0fc8848b0531ef55328fcf5f347ce2c2f6ea905f1 +size 2184 diff --git a/UnrealProject/Lost_Edge/Content/Input/Minigame/Actions/IA_Minigame_Fishing.uasset b/UnrealProject/Lost_Edge/Content/Input/Minigame/Actions/IA_Minigame_Fishing.uasset index f706d0d..bcd6904 100644 --- a/UnrealProject/Lost_Edge/Content/Input/Minigame/Actions/IA_Minigame_Fishing.uasset +++ b/UnrealProject/Lost_Edge/Content/Input/Minigame/Actions/IA_Minigame_Fishing.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9ddc9b3965c079552707497e4a675e9f9738be4f5db504495e6dc61b9a3496f5 -size 1811 +oid sha256:3eb09c39483c54bf80f74fb2da8a144bcf802d0b59b3c85bb74ebf4f4c16bf42 +size 1815 diff --git a/UnrealProject/Lost_Edge/Content/Input/Minigame/Actions/IA_Minigame_SubwaySurf_Down.uasset b/UnrealProject/Lost_Edge/Content/Input/Minigame/Actions/IA_Minigame_SubwaySurf_Down.uasset index 5a929bb..d0bf14d 100644 --- a/UnrealProject/Lost_Edge/Content/Input/Minigame/Actions/IA_Minigame_SubwaySurf_Down.uasset +++ b/UnrealProject/Lost_Edge/Content/Input/Minigame/Actions/IA_Minigame_SubwaySurf_Down.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5e6ed511eb9eace0733c6df09838c1884f295f55c3dff4a1cb7e732dc8e639f5 -size 2198 +oid sha256:ade0110138dce853233d6c9c2703dd0db8d0117a830f4bd1bcaaf0da2dc793cf +size 2202 diff --git a/UnrealProject/Lost_Edge/Content/Input/Minigame/Actions/IA_Minigame_SubwaySurf_Left.uasset b/UnrealProject/Lost_Edge/Content/Input/Minigame/Actions/IA_Minigame_SubwaySurf_Left.uasset index 6dd562b..924d28e 100644 --- a/UnrealProject/Lost_Edge/Content/Input/Minigame/Actions/IA_Minigame_SubwaySurf_Left.uasset +++ b/UnrealProject/Lost_Edge/Content/Input/Minigame/Actions/IA_Minigame_SubwaySurf_Left.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:103696c1f13750af29a532a4dd858559b28e35a284cc2dbfb6e85e7674d4b8c8 -size 2198 +oid sha256:9240d92bc421be18b5c20dabe093714e13a5bcf962b19526d910e388295c1495 +size 2202 diff --git a/UnrealProject/Lost_Edge/Content/Input/Minigame/Actions/IA_Minigame_SubwaySurf_Right.uasset b/UnrealProject/Lost_Edge/Content/Input/Minigame/Actions/IA_Minigame_SubwaySurf_Right.uasset index 0e97a76..058415e 100644 --- a/UnrealProject/Lost_Edge/Content/Input/Minigame/Actions/IA_Minigame_SubwaySurf_Right.uasset +++ b/UnrealProject/Lost_Edge/Content/Input/Minigame/Actions/IA_Minigame_SubwaySurf_Right.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:63fb621e476a618d72cebbcc9c979ff22178cf9eb5e2a66ed5f454907aa65c95 -size 2207 +oid sha256:f50b1f36dbc50edf44adc29de8b80ad06ccec267b581c65fff361c8e3c016174 +size 2211 diff --git a/UnrealProject/Lost_Edge/Content/Input/Minigame/Actions/IA_Minigame_SubwaySurf_Up.uasset b/UnrealProject/Lost_Edge/Content/Input/Minigame/Actions/IA_Minigame_SubwaySurf_Up.uasset index 3234765..7fb47ef 100644 --- a/UnrealProject/Lost_Edge/Content/Input/Minigame/Actions/IA_Minigame_SubwaySurf_Up.uasset +++ b/UnrealProject/Lost_Edge/Content/Input/Minigame/Actions/IA_Minigame_SubwaySurf_Up.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:28890a90a260fab0a3e6abeca24b7ee0637536d220ecd7aa2fcd6bbc17e2620b -size 2180 +oid sha256:4dd612c7a674ba76a00dc8b5ba1051e3141e7b1d0f75092c2fb6ca45b4731c86 +size 2184 diff --git a/UnrealProject/Lost_Edge/Content/Levels/Level_1/Blueprints/BP_Level1Restart.uasset b/UnrealProject/Lost_Edge/Content/Levels/Level_1/Blueprints/BP_Level1Restart.uasset index 0ee8c48..aa887c9 100644 --- a/UnrealProject/Lost_Edge/Content/Levels/Level_1/Blueprints/BP_Level1Restart.uasset +++ b/UnrealProject/Lost_Edge/Content/Levels/Level_1/Blueprints/BP_Level1Restart.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:fdfb7ddf763a2e21c3dafd11af7fa47b40efd31eca5c08f24baa7188d0acfbcf -size 127289 +oid sha256:e33dd1ef9363ff65695c309e02bdd8bcb2b6ee31389d3f8fe4837411efdb9909 +size 124748 diff --git a/UnrealProject/Lost_Edge/Content/Levels/Level_1/Blueprints/BP_doorS.uasset b/UnrealProject/Lost_Edge/Content/Levels/Level_1/Blueprints/BP_doorS.uasset index 1fff9c8..cb8f75f 100644 --- a/UnrealProject/Lost_Edge/Content/Levels/Level_1/Blueprints/BP_doorS.uasset +++ b/UnrealProject/Lost_Edge/Content/Levels/Level_1/Blueprints/BP_doorS.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0743fde364fc0924a40264c138ac4128b97109d4708d109e31ed6a5e490854e0 -size 121452 +oid sha256:ae06f77163414444b719ae2f5c15dde00238a136ae555b86eb435b684a33ac69 +size 122261 diff --git a/UnrealProject/Lost_Edge/Content/Levels/Level_1/L_Level1.umap b/UnrealProject/Lost_Edge/Content/Levels/Level_1/L_Level1.umap index 7404240..2938b70 100644 --- a/UnrealProject/Lost_Edge/Content/Levels/Level_1/L_Level1.umap +++ b/UnrealProject/Lost_Edge/Content/Levels/Level_1/L_Level1.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:21be15e4b1667d5e09bc25af0dbbf836b2bf001c564b789af5a866ed91998af3 -size 531399102 +oid sha256:f69c6ed4bc6903242d58271db2900acf72bb727af25731f8c375b81d8f6b9aaa +size 388196375 diff --git a/UnrealProject/Lost_Edge/Content/Levels/Level_1/Materials/MI_GrassLOD0Level1.uasset b/UnrealProject/Lost_Edge/Content/Levels/Level_1/Materials/MI_GrassLOD0Level1.uasset deleted file mode 100644 index c1cc68c..0000000 --- a/UnrealProject/Lost_Edge/Content/Levels/Level_1/Materials/MI_GrassLOD0Level1.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:582ec124241962a25880bd38590965c4ff662bbd3bef78ba18401bebbbdd2312 -size 151498 diff --git a/UnrealProject/Lost_Edge/Content/Levels/Level_1/Materials/MI_GrassLOD1Level1.uasset b/UnrealProject/Lost_Edge/Content/Levels/Level_1/Materials/MI_GrassLOD1Level1.uasset deleted file mode 100644 index d81ae2f..0000000 --- a/UnrealProject/Lost_Edge/Content/Levels/Level_1/Materials/MI_GrassLOD1Level1.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:659927541590f685eae349e046bbb8e9326e965c5600f96261d31c21836668e3 -size 161210 diff --git a/UnrealProject/Lost_Edge/Content/Levels/Level_1/Materials/MI_GrassLOD2Level1.uasset b/UnrealProject/Lost_Edge/Content/Levels/Level_1/Materials/MI_GrassLOD2Level1.uasset deleted file mode 100644 index 7a6aa93..0000000 --- a/UnrealProject/Lost_Edge/Content/Levels/Level_1/Materials/MI_GrassLOD2Level1.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:4898397db91f8816068fb3931d6944f5e63af8c56446eda5178cc27bc05650d2 -size 150565 diff --git a/UnrealProject/Lost_Edge/Content/Levels/Level_1/Materials/MI_GrassLOD3Level1.uasset b/UnrealProject/Lost_Edge/Content/Levels/Level_1/Materials/MI_GrassLOD3Level1.uasset deleted file mode 100644 index 688b9e1..0000000 --- a/UnrealProject/Lost_Edge/Content/Levels/Level_1/Materials/MI_GrassLOD3Level1.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:b5d1ebd96193dce3b535a068a082747a6c3316d12f67c2751ba21ca49b661a99 -size 164693 diff --git a/UnrealProject/Lost_Edge/Content/Levels/Level_1/Materials/MI_GrassLOD4Level1.uasset b/UnrealProject/Lost_Edge/Content/Levels/Level_1/Materials/MI_GrassLOD4Level1.uasset deleted file mode 100644 index 2276df9..0000000 --- a/UnrealProject/Lost_Edge/Content/Levels/Level_1/Materials/MI_GrassLOD4Level1.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:c23b19cdfb69d7031c7035cc21f9f42c301e499f42f50e7d736a4c1c7978f5e2 -size 125774 diff --git a/UnrealProject/Lost_Edge/Content/Levels/Level_1/Materials/MI_GrassLOD5Level1.uasset b/UnrealProject/Lost_Edge/Content/Levels/Level_1/Materials/MI_GrassLOD5Level1.uasset deleted file mode 100644 index 66b1de2..0000000 --- a/UnrealProject/Lost_Edge/Content/Levels/Level_1/Materials/MI_GrassLOD5Level1.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:b88f9fe7478a908dac3cb4724366249f907b2affd91c89e17400d43f7cdc670e -size 94029 diff --git a/UnrealProject/Lost_Edge/Content/Levels/Level_1/Materials/M_MonsterBodyLevel1Scene4.uasset b/UnrealProject/Lost_Edge/Content/Levels/Level_1/Materials/M_MonsterBodyLevel1Scene4.uasset index 57e6732..cecad2d 100644 --- a/UnrealProject/Lost_Edge/Content/Levels/Level_1/Materials/M_MonsterBodyLevel1Scene4.uasset +++ b/UnrealProject/Lost_Edge/Content/Levels/Level_1/Materials/M_MonsterBodyLevel1Scene4.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:094913fd5b91b8b50ef7bcdc96d1371f22e80a685d2623c5f9b794d4eb687e57 -size 13817 +oid sha256:8ad57f1ac1ed19dfeaf9ce2bc9bdf0384e96472d4338fda622d3bb80de376e9c +size 14217 diff --git a/UnrealProject/Lost_Edge/Content/Levels/Level_2/Blueprints/BP_Level2_BookSort.uasset b/UnrealProject/Lost_Edge/Content/Levels/Level_2/Blueprints/BP_Level2_BookSort.uasset new file mode 100644 index 0000000..d25ea1d --- /dev/null +++ b/UnrealProject/Lost_Edge/Content/Levels/Level_2/Blueprints/BP_Level2_BookSort.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:36085a3586a973c56154e0d2cbf501881d5fb06536339bc8777e920a1398c916 +size 46861 diff --git a/UnrealProject/Lost_Edge/Content/Levels/Level_2/Blueprints/BP_Level2_CrossyRoad.uasset b/UnrealProject/Lost_Edge/Content/Levels/Level_2/Blueprints/BP_Level2_CrossyRoad.uasset new file mode 100644 index 0000000..30f2c96 --- /dev/null +++ b/UnrealProject/Lost_Edge/Content/Levels/Level_2/Blueprints/BP_Level2_CrossyRoad.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:24308c269d2bb8bf24633f0f48dd47af70dbe36b52bc998ad5230ddc1e81209f +size 45304 diff --git a/UnrealProject/Lost_Edge/Content/Levels/Level_2/Blueprints/BP_Level2_Fishing.uasset b/UnrealProject/Lost_Edge/Content/Levels/Level_2/Blueprints/BP_Level2_Fishing.uasset new file mode 100644 index 0000000..d1b4a73 --- /dev/null +++ b/UnrealProject/Lost_Edge/Content/Levels/Level_2/Blueprints/BP_Level2_Fishing.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:10a78bf7b0222a49340536000ccdf32154453055c3e2590d340d772db21cd26d +size 45515 diff --git a/UnrealProject/Lost_Edge/Content/Levels/Level_2/Blueprints/BP_Level2_MortisDoor.uasset b/UnrealProject/Lost_Edge/Content/Levels/Level_2/Blueprints/BP_Level2_MortisDoor.uasset new file mode 100644 index 0000000..78aa356 --- /dev/null +++ b/UnrealProject/Lost_Edge/Content/Levels/Level_2/Blueprints/BP_Level2_MortisDoor.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:bba77c66472596a1b8b10da9acc588444235cc6dd8ed8bb1246df126b2a73a36 +size 60128 diff --git a/UnrealProject/Lost_Edge/Content/Levels/Level_2/Blueprints/BP_Level2_SubwaySurf.uasset b/UnrealProject/Lost_Edge/Content/Levels/Level_2/Blueprints/BP_Level2_SubwaySurf.uasset new file mode 100644 index 0000000..cc85291 --- /dev/null +++ b/UnrealProject/Lost_Edge/Content/Levels/Level_2/Blueprints/BP_Level2_SubwaySurf.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:18e200002e2e02e052a6ff31c283f5147dcb3ad5ccf4453593dee411ef2ab7b1 +size 45765 diff --git a/UnrealProject/Lost_Edge/Content/Levels/Level_2/Blueprints/BP_Level2_Telescope.uasset b/UnrealProject/Lost_Edge/Content/Levels/Level_2/Blueprints/BP_Level2_Telescope.uasset new file mode 100644 index 0000000..4649227 --- /dev/null +++ b/UnrealProject/Lost_Edge/Content/Levels/Level_2/Blueprints/BP_Level2_Telescope.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:cd0a1b74bb4391f57d9eaa8c907cefee1102d644a2d67789e9593214635c515d +size 45934 diff --git a/UnrealProject/Lost_Edge/Content/Levels/Level_2/Blueprints/BP_Level2_Tree.uasset b/UnrealProject/Lost_Edge/Content/Levels/Level_2/Blueprints/BP_Level2_Tree.uasset new file mode 100644 index 0000000..bf91fa6 --- /dev/null +++ b/UnrealProject/Lost_Edge/Content/Levels/Level_2/Blueprints/BP_Level2_Tree.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:242e7b3d8a80a16a9f5b74f93a28d5dcbd2ccf14fb0821f5cb4f396242a6a511 +size 45071 diff --git a/UnrealProject/Lost_Edge/Content/Levels/Level_2/Blueprints/SM_Level2_CrossyRoad.uasset b/UnrealProject/Lost_Edge/Content/Levels/Level_2/Blueprints/SM_Level2_CrossyRoad.uasset new file mode 100644 index 0000000..dee35f6 --- /dev/null +++ b/UnrealProject/Lost_Edge/Content/Levels/Level_2/Blueprints/SM_Level2_CrossyRoad.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:32e2f4e2718431ebfc6c7ed89715683f574777bc643abdde224fc103775008f2 +size 2774 diff --git a/UnrealProject/Lost_Edge/Content/Levels/Level_2/Blueprints/SM_Level2_Fishing.uasset b/UnrealProject/Lost_Edge/Content/Levels/Level_2/Blueprints/SM_Level2_Fishing.uasset index b3ec20f..ad307b3 100644 --- a/UnrealProject/Lost_Edge/Content/Levels/Level_2/Blueprints/SM_Level2_Fishing.uasset +++ b/UnrealProject/Lost_Edge/Content/Levels/Level_2/Blueprints/SM_Level2_Fishing.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:325894a616e56d222a7a0780aabfc759d297a571343980b4e71026679db03b6e -size 39775 +oid sha256:d6745bf6fcfa3161cdf15ad4b308f9bc008a1db07d4a5c4b64b81be71c75f4c4 +size 2705 diff --git a/UnrealProject/Lost_Edge/Content/Levels/Level_2/Blueprints/SM_Level2_RythmClick.uasset b/UnrealProject/Lost_Edge/Content/Levels/Level_2/Blueprints/SM_Level2_RythmClick.uasset index 810ff4b..a696415 100644 --- a/UnrealProject/Lost_Edge/Content/Levels/Level_2/Blueprints/SM_Level2_RythmClick.uasset +++ b/UnrealProject/Lost_Edge/Content/Levels/Level_2/Blueprints/SM_Level2_RythmClick.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:88417c8d2e4441ee72f025489a39dc1d2a2056164afd18ce7524648e3ae05b5c -size 40188 +oid sha256:6407b0d7ae05d0ce97e676bc9acbba5c107dc948c59a700753b4c9474e3398c7 +size 2702 diff --git a/UnrealProject/Lost_Edge/Content/Levels/Level_2/Blueprints/SM_Level2_SubwaySurf.uasset b/UnrealProject/Lost_Edge/Content/Levels/Level_2/Blueprints/SM_Level2_SubwaySurf.uasset index ea8d756..9b05d81 100644 --- a/UnrealProject/Lost_Edge/Content/Levels/Level_2/Blueprints/SM_Level2_SubwaySurf.uasset +++ b/UnrealProject/Lost_Edge/Content/Levels/Level_2/Blueprints/SM_Level2_SubwaySurf.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:92a53e8ca0d092295a2c54447aa723a10a918c028e49487517b48decb8b0d03e -size 39918 +oid sha256:c599d34d32f5f5fa8c40795f5a2b5a60330037923dfbac602ada2b604d1e36e2 +size 2774 diff --git a/UnrealProject/Lost_Edge/Content/Levels/Level_2/Blueprints/SM_Level2_Tree.uasset b/UnrealProject/Lost_Edge/Content/Levels/Level_2/Blueprints/SM_Level2_Tree.uasset new file mode 100644 index 0000000..ba5cab0 --- /dev/null +++ b/UnrealProject/Lost_Edge/Content/Levels/Level_2/Blueprints/SM_Level2_Tree.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:15131c28c4abd3d64ce0547e1f00df38864c1a39899c7f8fe46d1a052d27cf9d +size 2636 diff --git a/UnrealProject/Lost_Edge/Content/Levels/Level_2/Blueprints/SM_Level4_CrossyRoad.uasset b/UnrealProject/Lost_Edge/Content/Levels/Level_2/Blueprints/SM_Level4_CrossyRoad.uasset deleted file mode 100644 index 7b6f960..0000000 --- a/UnrealProject/Lost_Edge/Content/Levels/Level_2/Blueprints/SM_Level4_CrossyRoad.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:0eb8570aec2192cd748fd4a9ed044c126f8bf43b03f46953ceae44e8fee58d07 -size 39944 diff --git a/UnrealProject/Lost_Edge/Content/Levels/Level_2/Dialogue/DT_Dialogue_Level2_BookSort.uasset b/UnrealProject/Lost_Edge/Content/Levels/Level_2/Dialogue/DT_Dialogue_Level2_BookSort.uasset new file mode 100644 index 0000000..72a3f9c --- /dev/null +++ b/UnrealProject/Lost_Edge/Content/Levels/Level_2/Dialogue/DT_Dialogue_Level2_BookSort.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e10a2d1e1d8596dd6ad19db7378b7c4bb89839c8f0ee439e698fd3b66549db4b +size 9973 diff --git a/UnrealProject/Lost_Edge/Content/Levels/Level_2/Dialogue/DT_Dialogue_Level2_End.uasset b/UnrealProject/Lost_Edge/Content/Levels/Level_2/Dialogue/DT_Dialogue_Level2_End.uasset new file mode 100644 index 0000000..92c12ef --- /dev/null +++ b/UnrealProject/Lost_Edge/Content/Levels/Level_2/Dialogue/DT_Dialogue_Level2_End.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:04bd5972716ea65eaa5a36952ea524312c395abaaf37b7cac89be44c2909c82f +size 13084 diff --git a/UnrealProject/Lost_Edge/Content/Levels/Level_2/Dialogue/DT_Dialogue_Level2_Interactables.uasset b/UnrealProject/Lost_Edge/Content/Levels/Level_2/Dialogue/DT_Dialogue_Level2_Interactables.uasset new file mode 100644 index 0000000..7ad61e5 --- /dev/null +++ b/UnrealProject/Lost_Edge/Content/Levels/Level_2/Dialogue/DT_Dialogue_Level2_Interactables.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:866ab3018053c1487896021bbfe9d6929160753e0d0917e0d398d56ae29cbf9c +size 4178 diff --git a/UnrealProject/Lost_Edge/Content/Levels/Level_2/Dialogue/DT_Dialogue_Level2_Minigames.uasset b/UnrealProject/Lost_Edge/Content/Levels/Level_2/Dialogue/DT_Dialogue_Level2_Minigames.uasset new file mode 100644 index 0000000..9e6bc27 --- /dev/null +++ b/UnrealProject/Lost_Edge/Content/Levels/Level_2/Dialogue/DT_Dialogue_Level2_Minigames.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e98316ca1d85895130ddea032ae74c5d3c7f37a0cf7ae624d7b8663617354d87 +size 4746 diff --git a/UnrealProject/Lost_Edge/Content/Levels/Level_2/Dialogue/DT_Dialogue_Level2_Sister_Begin.uasset b/UnrealProject/Lost_Edge/Content/Levels/Level_2/Dialogue/DT_Dialogue_Level2_Sister_Begin.uasset new file mode 100644 index 0000000..de38e5f --- /dev/null +++ b/UnrealProject/Lost_Edge/Content/Levels/Level_2/Dialogue/DT_Dialogue_Level2_Sister_Begin.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:13505fc66f26d464718b72600021b510cb01467fffe31221e1f1f52d5053afd7 +size 9556 diff --git a/UnrealProject/Lost_Edge/Content/Levels/Level_2/Dialogue/DT_Dialogue_Level2_UpgradeBegin.uasset b/UnrealProject/Lost_Edge/Content/Levels/Level_2/Dialogue/DT_Dialogue_Level2_UpgradeBegin.uasset new file mode 100644 index 0000000..e98f381 --- /dev/null +++ b/UnrealProject/Lost_Edge/Content/Levels/Level_2/Dialogue/DT_Dialogue_Level2_UpgradeBegin.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:29edabedba869d865119a69d5944b8f96fa47cd51ab6dc953ff8df722f778098 +size 7611 diff --git a/UnrealProject/Lost_Edge/Content/Levels/Level_2/Dialogue/DT_Dialogue_Level2_UpgradeEnd.uasset b/UnrealProject/Lost_Edge/Content/Levels/Level_2/Dialogue/DT_Dialogue_Level2_UpgradeEnd.uasset new file mode 100644 index 0000000..57dd9f0 --- /dev/null +++ b/UnrealProject/Lost_Edge/Content/Levels/Level_2/Dialogue/DT_Dialogue_Level2_UpgradeEnd.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9c728f4550bfd86e4b90e21a1ca6478c42fa07d376c6b13fa37ad53b04b2b11f +size 3497 diff --git a/UnrealProject/Lost_Edge/Content/Levels/Level_2/E_Level2_Event.uasset b/UnrealProject/Lost_Edge/Content/Levels/Level_2/E_Level2_Event.uasset new file mode 100644 index 0000000..826aa4c --- /dev/null +++ b/UnrealProject/Lost_Edge/Content/Levels/Level_2/E_Level2_Event.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:263c1b2cb2b92d59fae8941ea1f05b9c4e83edb7c578def57a185f4e636f5615 +size 2662 diff --git a/UnrealProject/Lost_Edge/Content/Levels/Level_2/Grass/SM_Level2_GrassGenerator_0.uasset b/UnrealProject/Lost_Edge/Content/Levels/Level_2/Grass/SM_Level2_GrassGenerator_0.uasset new file mode 100644 index 0000000..3d82099 --- /dev/null +++ b/UnrealProject/Lost_Edge/Content/Levels/Level_2/Grass/SM_Level2_GrassGenerator_0.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:35387fe5f7f2c0a7b039c5ac9c8bfbaf38da317cff550fd8f42adff1551e925e +size 3887768 diff --git a/UnrealProject/Lost_Edge/Content/Levels/Level_2/Grass/SM_Level2_GrassGenerator_1.uasset b/UnrealProject/Lost_Edge/Content/Levels/Level_2/Grass/SM_Level2_GrassGenerator_1.uasset new file mode 100644 index 0000000..e39b821 --- /dev/null +++ b/UnrealProject/Lost_Edge/Content/Levels/Level_2/Grass/SM_Level2_GrassGenerator_1.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b631acd668ab2f6dbdcb0f9f67bddff5f8f804455daf53370478635fd24adf95 +size 3961485 diff --git a/UnrealProject/Lost_Edge/Content/Levels/Level_2/Grass/SM_Level2_GrassGenerator_2.uasset b/UnrealProject/Lost_Edge/Content/Levels/Level_2/Grass/SM_Level2_GrassGenerator_2.uasset new file mode 100644 index 0000000..eb0ea23 --- /dev/null +++ b/UnrealProject/Lost_Edge/Content/Levels/Level_2/Grass/SM_Level2_GrassGenerator_2.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e4a91d6e0c5b2089d4cc8ad66c65f0b4260827337c9a183516299c85e1d26dda +size 776627 diff --git a/UnrealProject/Lost_Edge/Content/Levels/Level_2/Grass/SM_Level2_GrassGenerator_3.uasset b/UnrealProject/Lost_Edge/Content/Levels/Level_2/Grass/SM_Level2_GrassGenerator_3.uasset new file mode 100644 index 0000000..2971faa --- /dev/null +++ b/UnrealProject/Lost_Edge/Content/Levels/Level_2/Grass/SM_Level2_GrassGenerator_3.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a99029db2e6cd18d33c0f2abe6d1f85d0ebaf1913659619b353e733261fa1113 +size 8440057 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 454b64d..a4a37a3 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:fd33c41401adb7b2a6bcf7ab487d8281e0f645837a76b9b1ba0cc24b20cdd712 -size 79189415 +oid sha256:f53ae615db812cb4b817a33e6e51651690b0288ff1febda9b8e319324fc35b28 +size 38750125 diff --git a/UnrealProject/Lost_Edge/Content/Levels/Level_2/L_Level2_BuiltData.uasset b/UnrealProject/Lost_Edge/Content/Levels/Level_2/L_Level2_BuiltData.uasset deleted file mode 100644 index 688cb81..0000000 --- a/UnrealProject/Lost_Edge/Content/Levels/Level_2/L_Level2_BuiltData.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:aac6bfa4ce635de35affda8063abd8dd442e6e6cbcee65388844680fa996eb36 -size 2775337 diff --git a/UnrealProject/Lost_Edge/Content/Levels/Level_2/Materials/MI_WindowCurtainLevel2.uasset b/UnrealProject/Lost_Edge/Content/Levels/Level_2/Materials/MI_WindowCurtainLevel2.uasset index 2e04d0d..fc2c271 100644 --- a/UnrealProject/Lost_Edge/Content/Levels/Level_2/Materials/MI_WindowCurtainLevel2.uasset +++ b/UnrealProject/Lost_Edge/Content/Levels/Level_2/Materials/MI_WindowCurtainLevel2.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0172a482e70372fe16dd12f08f575259659588bc3da8de993f28ef8ef93eaffc -size 97191 +oid sha256:922bd2f00b13c5fd0704213d5dd07b17ded1fa9c24e9acffafea456f796653bc +size 8727 diff --git a/UnrealProject/Lost_Edge/Content/Levels/Level_2/Materials/M_BadPillow2.uasset b/UnrealProject/Lost_Edge/Content/Levels/Level_2/Materials/M_BadPillow2.uasset index 5dacb77..9223adc 100644 --- a/UnrealProject/Lost_Edge/Content/Levels/Level_2/Materials/M_BadPillow2.uasset +++ b/UnrealProject/Lost_Edge/Content/Levels/Level_2/Materials/M_BadPillow2.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2c0b08df96801bc0e639be156555a64b92a1feeacf7497c68abdecc1370618af -size 94315 +oid sha256:d989b0fc0f47a54460fff5113d939e39ed726a872859ed1f6f69a3a0e384f04e +size 94764 diff --git a/UnrealProject/Lost_Edge/Content/Levels/Level_2/Materials/M_ChairSoftSeat.uasset b/UnrealProject/Lost_Edge/Content/Levels/Level_2/Materials/M_ChairSoftSeat.uasset new file mode 100644 index 0000000..1989fb9 --- /dev/null +++ b/UnrealProject/Lost_Edge/Content/Levels/Level_2/Materials/M_ChairSoftSeat.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:78c5e13484418c7be88e061f809393ebc7197fcb620be080d8590c44d868509f +size 16897 diff --git a/UnrealProject/Lost_Edge/Content/Levels/Level_2/Materials/M_HouseRoofBig2.uasset b/UnrealProject/Lost_Edge/Content/Levels/Level_2/Materials/M_HouseRoofBig2.uasset index 34e6660..fd6b038 100644 --- a/UnrealProject/Lost_Edge/Content/Levels/Level_2/Materials/M_HouseRoofBig2.uasset +++ b/UnrealProject/Lost_Edge/Content/Levels/Level_2/Materials/M_HouseRoofBig2.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:850b1d4e7eb80ca0784c8f600fb33e6ef357bc8395e0c36b019f125073cae747 -size 15624 +oid sha256:b2411076c571a25b468fbc736831c8931fde73a833969ee9f91d676414363584 +size 23189 diff --git a/UnrealProject/Lost_Edge/Content/Levels/Level_2/Materials/M_HouseWall2.uasset b/UnrealProject/Lost_Edge/Content/Levels/Level_2/Materials/M_HouseWall2.uasset deleted file mode 100644 index 4ab9d22..0000000 --- a/UnrealProject/Lost_Edge/Content/Levels/Level_2/Materials/M_HouseWall2.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:260073a9991685912564e23e9b604d463c7bc9f48e91c63c103ded05e02086f6 -size 16485 diff --git a/UnrealProject/Lost_Edge/Content/Levels/Level_2/Models/BP_Level2_BookSort.uasset b/UnrealProject/Lost_Edge/Content/Levels/Level_2/Models/BP_Level2_BookSort.uasset new file mode 100644 index 0000000..4e8702a --- /dev/null +++ b/UnrealProject/Lost_Edge/Content/Levels/Level_2/Models/BP_Level2_BookSort.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:fc587237887a0734c19a2094a4e9eae925dcc0fa4cf9a3c8fb63a81622b03559 +size 329835 diff --git a/UnrealProject/Lost_Edge/Content/Levels/Level_2/Models/SM_Level2_Telescope.uasset b/UnrealProject/Lost_Edge/Content/Levels/Level_2/Models/SM_Level2_Telescope.uasset new file mode 100644 index 0000000..53096c8 --- /dev/null +++ b/UnrealProject/Lost_Edge/Content/Levels/Level_2/Models/SM_Level2_Telescope.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c259e70a31587f3319fe3928b042b99e7cbb10c09bebb04a1a11dc77ca4c0586 +size 124615 diff --git a/UnrealProject/Lost_Edge/Content/Levels/Level_2/Sequencers/OnBeginPlay/Seq_Level2_clock.uasset b/UnrealProject/Lost_Edge/Content/Levels/Level_2/Sequencers/OnBeginPlay/Seq_Level2_clock.uasset index 8a84320..fc142ac 100644 --- a/UnrealProject/Lost_Edge/Content/Levels/Level_2/Sequencers/OnBeginPlay/Seq_Level2_clock.uasset +++ b/UnrealProject/Lost_Edge/Content/Levels/Level_2/Sequencers/OnBeginPlay/Seq_Level2_clock.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4ac33c94b4d95a148eef58c88f71dea3d546e2a64abfb3fe7d9e908d07a576c5 -size 124708 +oid sha256:00cfb56b207c7e65f0ab88c55b6823a521004da053d74c560d8f7bfc21c648bc +size 62422 diff --git a/UnrealProject/Lost_Edge/Content/Levels/Level_2/Sequencers/Seq_Level2_CarolRun.uasset b/UnrealProject/Lost_Edge/Content/Levels/Level_2/Sequencers/Seq_Level2_CarolRun.uasset deleted file mode 100644 index 8287d72..0000000 --- a/UnrealProject/Lost_Edge/Content/Levels/Level_2/Sequencers/Seq_Level2_CarolRun.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:475a6ab757f62db8bede39d573a3f130e561b59f11653b688d86348534b92364 -size 137395 diff --git a/UnrealProject/Lost_Edge/Content/Levels/Level_2/Sequencers/Seq_Level2_FromField.uasset b/UnrealProject/Lost_Edge/Content/Levels/Level_2/Sequencers/Seq_Level2_FromField.uasset deleted file mode 100644 index 6d16984..0000000 --- a/UnrealProject/Lost_Edge/Content/Levels/Level_2/Sequencers/Seq_Level2_FromField.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:a2e568a6f1d590920191ef9863a034c4c98ad38d05fdf1ad8a1082d520fc7465 -size 142617 diff --git a/UnrealProject/Lost_Edge/Content/Levels/Level_2/Sequencers/Seq_Level2_MortisDoor.uasset b/UnrealProject/Lost_Edge/Content/Levels/Level_2/Sequencers/Seq_Level2_MortisDoor.uasset deleted file mode 100644 index 1ab87a8..0000000 --- a/UnrealProject/Lost_Edge/Content/Levels/Level_2/Sequencers/Seq_Level2_MortisDoor.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:1aef6a94af801105c6fa5cec896d75bd2947dc54f3f82f9888233e9b342f0e28 -size 90505 diff --git a/UnrealProject/Lost_Edge/Content/Levels/Level_2/Sequencers/Seq_Level2_SkillSelect.uasset b/UnrealProject/Lost_Edge/Content/Levels/Level_2/Sequencers/Seq_Level2_SkillSelect.uasset new file mode 100644 index 0000000..677c0cd --- /dev/null +++ b/UnrealProject/Lost_Edge/Content/Levels/Level_2/Sequencers/Seq_Level2_SkillSelect.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b48b3ab3e8cdb2b36cd836a60d614e9270e47af457925e4ea68b7cef4c985331 +size 22858 diff --git a/UnrealProject/Lost_Edge/Content/Levels/Level_2/Sequencers/Seq_Level2_TreeFall.uasset b/UnrealProject/Lost_Edge/Content/Levels/Level_2/Sequencers/Seq_Level2_TreeFall.uasset new file mode 100644 index 0000000..09286f0 --- /dev/null +++ b/UnrealProject/Lost_Edge/Content/Levels/Level_2/Sequencers/Seq_Level2_TreeFall.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9c8aa7448e4ea8b080a66b1ade509e6a959ce474f7a663fff5a2e33cc5d5f6ea +size 45361 diff --git a/UnrealProject/Lost_Edge/Content/Levels/Level_2/Sequencers/Seq_Level2_begin.uasset b/UnrealProject/Lost_Edge/Content/Levels/Level_2/Sequencers/Seq_Level2_begin.uasset index a22272d..62548f0 100644 --- a/UnrealProject/Lost_Edge/Content/Levels/Level_2/Sequencers/Seq_Level2_begin.uasset +++ b/UnrealProject/Lost_Edge/Content/Levels/Level_2/Sequencers/Seq_Level2_begin.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f38da3cbb533d75b113b0c1a5784f5b5268fa67a8849fb0515cb52b3ce874d45 -size 79671 +oid sha256:9fdd9272cfb4a2c9703b1801cc2fe7fa3e6aa0c2f59cbfd50aa3d72224cf0333 +size 19001 diff --git a/UnrealProject/Lost_Edge/Content/Levels/Level_2/Sequencers/Seq_Level2_menu.uasset b/UnrealProject/Lost_Edge/Content/Levels/Level_2/Sequencers/Seq_Level2_menu.uasset deleted file mode 100644 index c2fb31c..0000000 --- a/UnrealProject/Lost_Edge/Content/Levels/Level_2/Sequencers/Seq_Level2_menu.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:edc3cd0ddb9afbab7d5e3d9a1fc61a0f891d59958068716f8025229146e6ab7d -size 93075 diff --git a/UnrealProject/Lost_Edge/Content/Levels/Test/Grass/SM_Test_GrassGenerator_2.uasset b/UnrealProject/Lost_Edge/Content/Levels/Test/Grass/SM_Test_GrassGenerator_2.uasset new file mode 100644 index 0000000..2e602b4 --- /dev/null +++ b/UnrealProject/Lost_Edge/Content/Levels/Test/Grass/SM_Test_GrassGenerator_2.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:35087985c5902dbcb7b27e6bf2aac1c74118e2bf09ffd5534e7b5732b9a9d877 +size 727677 diff --git a/UnrealProject/Lost_Edge/Content/Levels/Test/L_Test.umap b/UnrealProject/Lost_Edge/Content/Levels/Test/L_Test.umap index 195fb6d..974e0a5 100644 --- a/UnrealProject/Lost_Edge/Content/Levels/Test/L_Test.umap +++ b/UnrealProject/Lost_Edge/Content/Levels/Test/L_Test.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5ae18e49507e25df07e4f6f8f9b3ba957592b161778c540f8731bb3598507848 -size 2614719 +oid sha256:f837d379aaf571ee1273fc5c3fec1e173cdd18659443cb4298934eb1ad17157b +size 2906609 diff --git a/UnrealProject/Lost_Edge/Content/Levels/Test/Materials/MI_GrassLOD0_Test.uasset b/UnrealProject/Lost_Edge/Content/Levels/Test/Materials/MI_GrassLOD0_Test.uasset deleted file mode 100644 index aee097d..0000000 --- a/UnrealProject/Lost_Edge/Content/Levels/Test/Materials/MI_GrassLOD0_Test.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:74bea6c6a601291d5232d5498f9a746a7f7354a0db5b6d3c2e2e431e937c6cbc -size 160189 diff --git a/UnrealProject/Lost_Edge/Content/Levels/Test/Materials/MI_GrassLOD1_Test.uasset b/UnrealProject/Lost_Edge/Content/Levels/Test/Materials/MI_GrassLOD1_Test.uasset deleted file mode 100644 index 2dc7287..0000000 --- a/UnrealProject/Lost_Edge/Content/Levels/Test/Materials/MI_GrassLOD1_Test.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:18916abd5f386d90387c7d5c630281979ee4a12b91ae7055b310a91e653294c8 -size 159941 diff --git a/UnrealProject/Lost_Edge/Content/Levels/Test/Materials/MI_GrassLOD2_Test.uasset b/UnrealProject/Lost_Edge/Content/Levels/Test/Materials/MI_GrassLOD2_Test.uasset deleted file mode 100644 index 12f3450..0000000 --- a/UnrealProject/Lost_Edge/Content/Levels/Test/Materials/MI_GrassLOD2_Test.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:ab32f019050c0cad7b7e87ca3164fa9a71a5a3ab5e653f6524fd97184d21ffd0 -size 162838 diff --git a/UnrealProject/Lost_Edge/Content/Levels/Test/Materials/MI_GrassLOD3_Test.uasset b/UnrealProject/Lost_Edge/Content/Levels/Test/Materials/MI_GrassLOD3_Test.uasset deleted file mode 100644 index 8d807b6..0000000 --- a/UnrealProject/Lost_Edge/Content/Levels/Test/Materials/MI_GrassLOD3_Test.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:13608535d9eaf0465fd026a4c64cb7631492b42a7d1aad9c943035c6dc43a2e3 -size 167963 diff --git a/UnrealProject/Lost_Edge/Content/Levels/Test/Materials/M_GrassLOD4_Test.uasset b/UnrealProject/Lost_Edge/Content/Levels/Test/Materials/M_GrassLOD4_Test.uasset deleted file mode 100644 index 4fadd96..0000000 --- a/UnrealProject/Lost_Edge/Content/Levels/Test/Materials/M_GrassLOD4_Test.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:953d16cb3b6c9d5ba7936e644f775c96bc4f20455001661b253427deebcbc88b -size 112792 diff --git a/UnrealProject/Lost_Edge/Content/Levels/Test/Materials/M_GrassLOD5_Test.uasset b/UnrealProject/Lost_Edge/Content/Levels/Test/Materials/M_GrassLOD5_Test.uasset deleted file mode 100644 index 89ec2d8..0000000 --- a/UnrealProject/Lost_Edge/Content/Levels/Test/Materials/M_GrassLOD5_Test.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:22395ad365644b49ceb08c91f662a83dda4054493d33cc478d0575cab17de747 -size 112125 diff --git a/UnrealProject/Lost_Edge/Content/MaterialsLibrary/Functions/MF_WorldAlignedXZUV.uasset b/UnrealProject/Lost_Edge/Content/MaterialsLibrary/Functions/MF_WorldAlignedXZUV.uasset index e4971ec..35c92eb 100644 --- a/UnrealProject/Lost_Edge/Content/MaterialsLibrary/Functions/MF_WorldAlignedXZUV.uasset +++ b/UnrealProject/Lost_Edge/Content/MaterialsLibrary/Functions/MF_WorldAlignedXZUV.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9a6c8c47eb848fc100cadaf26f8dcc7900c6339b65a140353c1799ce3ac3b6b3 +oid sha256:626f094d863e8cc8ebead6aa545eaa77eb06555c3b7f39ebd3e050b48000c165 size 11060 diff --git a/UnrealProject/Lost_Edge/Content/MaterialsLibrary/Functions/MF_WorldAlignedYZUV.uasset b/UnrealProject/Lost_Edge/Content/MaterialsLibrary/Functions/MF_WorldAlignedYZUV.uasset new file mode 100644 index 0000000..8abebc5 --- /dev/null +++ b/UnrealProject/Lost_Edge/Content/MaterialsLibrary/Functions/MF_WorldAlignedYZUV.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0aeb55fd1b2b060c2eb9be743cfe8bf89b07e1ce8d217169e6b2718a73c7a97f +size 10452 diff --git a/UnrealProject/Lost_Edge/Content/MaterialsLibrary/Landscapes/LandLayers/LL_Grass.uasset b/UnrealProject/Lost_Edge/Content/MaterialsLibrary/Landscapes/LandLayers/LL_Grass.uasset index a62e27b..cbf8e04 100644 --- a/UnrealProject/Lost_Edge/Content/MaterialsLibrary/Landscapes/LandLayers/LL_Grass.uasset +++ b/UnrealProject/Lost_Edge/Content/MaterialsLibrary/Landscapes/LandLayers/LL_Grass.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b6435f5368443944a218ff58a9e261b47f4f2082e30e8313549acbdfbc1d2d95 -size 1594 +oid sha256:7004e092b596aca11425e825be11dac5a72ab9dbdeaa590f5795d871ab28979a +size 1875 diff --git a/UnrealProject/Lost_Edge/Content/MaterialsLibrary/Landscapes/M_Landscape.uasset b/UnrealProject/Lost_Edge/Content/MaterialsLibrary/Landscapes/M_Landscape.uasset index e4e85c4..9a15492 100644 --- a/UnrealProject/Lost_Edge/Content/MaterialsLibrary/Landscapes/M_Landscape.uasset +++ b/UnrealProject/Lost_Edge/Content/MaterialsLibrary/Landscapes/M_Landscape.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:84dd2b28d3810d3b1e7bfe91763f9b2a0fab8436b942faa1f3471fab3b3de3c5 -size 73659 +oid sha256:ef73c33d36bf33642f5cb8e87a646abd32f0aa071f0c8e7f94dae7880320d87e +size 78463 diff --git a/UnrealProject/Lost_Edge/Content/MaterialsLibrary/MI_WallXDark.uasset b/UnrealProject/Lost_Edge/Content/MaterialsLibrary/MI_WallXDark.uasset new file mode 100644 index 0000000..c49d4c0 --- /dev/null +++ b/UnrealProject/Lost_Edge/Content/MaterialsLibrary/MI_WallXDark.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:041b0e4933e567fd060809dd9dd36f7a4fe22d4b8e6c65e16c860e95e655de63 +size 17849 diff --git a/UnrealProject/Lost_Edge/Content/MaterialsLibrary/MI_WallXLight.uasset b/UnrealProject/Lost_Edge/Content/MaterialsLibrary/MI_WallXLight.uasset new file mode 100644 index 0000000..3ad8921 --- /dev/null +++ b/UnrealProject/Lost_Edge/Content/MaterialsLibrary/MI_WallXLight.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:eb6233b3db2c194cdf667a00b2d8d1194ffb18bf1d98180b7b16739da9a61167 +size 12513 diff --git a/UnrealProject/Lost_Edge/Content/MaterialsLibrary/MI_WallY.uasset b/UnrealProject/Lost_Edge/Content/MaterialsLibrary/MI_WallY.uasset new file mode 100644 index 0000000..1d5b0d3 --- /dev/null +++ b/UnrealProject/Lost_Edge/Content/MaterialsLibrary/MI_WallY.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:97d4aec579716f3139a1514e0494a9d34ce497a2fbb2c03e4449ea71ef7191d4 +size 15251 diff --git a/UnrealProject/Lost_Edge/Content/MaterialsLibrary/MI_WallYDark.uasset b/UnrealProject/Lost_Edge/Content/MaterialsLibrary/MI_WallYDark.uasset new file mode 100644 index 0000000..13e9473 --- /dev/null +++ b/UnrealProject/Lost_Edge/Content/MaterialsLibrary/MI_WallYDark.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c5277e7f84df69cddf32976a528bc6a9643e3f8639eccfe3d11a4484d1ef710a +size 17704 diff --git a/UnrealProject/Lost_Edge/Content/MaterialsLibrary/M_Grass.uasset b/UnrealProject/Lost_Edge/Content/MaterialsLibrary/M_Grass.uasset new file mode 100644 index 0000000..1ef7e36 --- /dev/null +++ b/UnrealProject/Lost_Edge/Content/MaterialsLibrary/M_Grass.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5b8a2d2175b1b0a69d64ea19b6be60173a8ee0ebe9d86ca11052c3329fb751b3 +size 27739 diff --git a/UnrealProject/Lost_Edge/Content/MaterialsLibrary/M_InvisibleBarrier.uasset b/UnrealProject/Lost_Edge/Content/MaterialsLibrary/M_InvisibleBarrier.uasset new file mode 100644 index 0000000..85c4bd2 --- /dev/null +++ b/UnrealProject/Lost_Edge/Content/MaterialsLibrary/M_InvisibleBarrier.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:bc47253f975626ce5764dc6ada15b350c1045945c1639895adc1314bf821d899 +size 23890 diff --git a/UnrealProject/Lost_Edge/Content/MaterialsLibrary/M_Metal.uasset b/UnrealProject/Lost_Edge/Content/MaterialsLibrary/M_Metal.uasset new file mode 100644 index 0000000..d867442 --- /dev/null +++ b/UnrealProject/Lost_Edge/Content/MaterialsLibrary/M_Metal.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1f02ccaf34ec50fbc977ac85f6b00a0d89296c082a557dec5d27a2960743f6aa +size 118726 diff --git a/UnrealProject/Lost_Edge/Content/MaterialsLibrary/M_Moss1.uasset b/UnrealProject/Lost_Edge/Content/MaterialsLibrary/M_Moss1.uasset new file mode 100644 index 0000000..ea095de --- /dev/null +++ b/UnrealProject/Lost_Edge/Content/MaterialsLibrary/M_Moss1.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:62c76b9c9677b41c6547429855901899ae8be24cea06de08498a9b62ae57b3c2 +size 29689 diff --git a/UnrealProject/Lost_Edge/Content/MaterialsLibrary/M_Moss2.uasset b/UnrealProject/Lost_Edge/Content/MaterialsLibrary/M_Moss2.uasset new file mode 100644 index 0000000..7d9c72b --- /dev/null +++ b/UnrealProject/Lost_Edge/Content/MaterialsLibrary/M_Moss2.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a6b7d7b9b4396685b92ec93c89ba3e3f00a4689026d2d9f5dfafaf4686feab50 +size 24872 diff --git a/UnrealProject/Lost_Edge/Content/MaterialsLibrary/M_Moss3.uasset b/UnrealProject/Lost_Edge/Content/MaterialsLibrary/M_Moss3.uasset new file mode 100644 index 0000000..b927eb8 --- /dev/null +++ b/UnrealProject/Lost_Edge/Content/MaterialsLibrary/M_Moss3.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b543f5e7a1773e3e3ba5e3a53cf7c6be6388422a11c71d84f2ae317b3353fba6 +size 25518 diff --git a/UnrealProject/Lost_Edge/Content/MaterialsLibrary/M_Moss4.uasset b/UnrealProject/Lost_Edge/Content/MaterialsLibrary/M_Moss4.uasset new file mode 100644 index 0000000..e9dd8a6 --- /dev/null +++ b/UnrealProject/Lost_Edge/Content/MaterialsLibrary/M_Moss4.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2bbdef4dca4eb91b380d5c1e258169abe352359a86dc102871364d6597c0b9c5 +size 22445 diff --git a/UnrealProject/Lost_Edge/Content/MaterialsLibrary/M_Pointer.uasset b/UnrealProject/Lost_Edge/Content/MaterialsLibrary/M_Pointer.uasset index abeb4f8..738cd38 100644 --- a/UnrealProject/Lost_Edge/Content/MaterialsLibrary/M_Pointer.uasset +++ b/UnrealProject/Lost_Edge/Content/MaterialsLibrary/M_Pointer.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5cc75ab8fa55789319e6aaff01f3c7f7e16d68c185609bb7068108dae3f3754f -size 100708 +oid sha256:7d964db4c4dd83f8ee6364a99b12195bd5d6214bf3cd8f9c2f3a338b8a3314bb +size 28116 diff --git a/UnrealProject/Lost_Edge/Content/MaterialsLibrary/M_WallX.uasset b/UnrealProject/Lost_Edge/Content/MaterialsLibrary/M_WallX.uasset new file mode 100644 index 0000000..30162c9 --- /dev/null +++ b/UnrealProject/Lost_Edge/Content/MaterialsLibrary/M_WallX.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5d49c047327fbfda51012aa9011a9de23e64324656c6a94257808c725d4f37c0 +size 33462 diff --git a/UnrealProject/Lost_Edge/Content/MaterialsLibrary/M_Window.uasset b/UnrealProject/Lost_Edge/Content/MaterialsLibrary/M_Window.uasset new file mode 100644 index 0000000..2f01622 --- /dev/null +++ b/UnrealProject/Lost_Edge/Content/MaterialsLibrary/M_Window.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7cddf213732ad67b8553983b61e0aae87c7961da2d6b8822ee63232df7142449 +size 22944 diff --git a/UnrealProject/Lost_Edge/Content/MaterialsLibrary/M_Wood.uasset b/UnrealProject/Lost_Edge/Content/MaterialsLibrary/M_Wood.uasset new file mode 100644 index 0000000..c5a0469 --- /dev/null +++ b/UnrealProject/Lost_Edge/Content/MaterialsLibrary/M_Wood.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:62a8727c077f848dd52ad4abc0e82a19c60bce9961b7eaba385ad1f18f494784 +size 115710 diff --git a/UnrealProject/Lost_Edge/Content/MaterialsLibrary/PhysMaterials/PM_Default.uasset b/UnrealProject/Lost_Edge/Content/MaterialsLibrary/PhysMaterials/PM_Default.uasset new file mode 100644 index 0000000..987c7e5 --- /dev/null +++ b/UnrealProject/Lost_Edge/Content/MaterialsLibrary/PhysMaterials/PM_Default.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:afc1ff5935321a49540697b288ff788ca4553aa7f5168e0ef1a33a46b52a09e9 +size 1321 diff --git a/UnrealProject/Lost_Edge/Content/MaterialsLibrary/PhysMaterials/PM_Grass.uasset b/UnrealProject/Lost_Edge/Content/MaterialsLibrary/PhysMaterials/PM_Grass.uasset new file mode 100644 index 0000000..703225d --- /dev/null +++ b/UnrealProject/Lost_Edge/Content/MaterialsLibrary/PhysMaterials/PM_Grass.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f0b72a30bfeb313a5964769aaf04df35ea953675adc38e021105172823c324d4 +size 1455 diff --git a/UnrealProject/Lost_Edge/Content/MaterialsLibrary/TexturesLibrary/Moss/T_Moss1_Diffuse.uasset b/UnrealProject/Lost_Edge/Content/MaterialsLibrary/TexturesLibrary/Moss/T_Moss1_Diffuse.uasset new file mode 100644 index 0000000..c3cf188 --- /dev/null +++ b/UnrealProject/Lost_Edge/Content/MaterialsLibrary/TexturesLibrary/Moss/T_Moss1_Diffuse.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:243485f9c09fe39ac13e55787736ef6cdc75c17181ee92adbddeecd973caa046 +size 787958 diff --git a/UnrealProject/Lost_Edge/Content/MaterialsLibrary/TexturesLibrary/Moss/T_Moss1_Normal.uasset b/UnrealProject/Lost_Edge/Content/MaterialsLibrary/TexturesLibrary/Moss/T_Moss1_Normal.uasset new file mode 100644 index 0000000..64f23bb --- /dev/null +++ b/UnrealProject/Lost_Edge/Content/MaterialsLibrary/TexturesLibrary/Moss/T_Moss1_Normal.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:774f6ac7bf3e09cff5716efd252933ddad1ff51af2c73010f2dbfd9a1a6f9fc6 +size 795234 diff --git a/UnrealProject/Lost_Edge/Content/MaterialsLibrary/TexturesLibrary/Moss/T_Moss2_Diffuse.uasset b/UnrealProject/Lost_Edge/Content/MaterialsLibrary/TexturesLibrary/Moss/T_Moss2_Diffuse.uasset new file mode 100644 index 0000000..9375615 --- /dev/null +++ b/UnrealProject/Lost_Edge/Content/MaterialsLibrary/TexturesLibrary/Moss/T_Moss2_Diffuse.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a5c911e3f91bb396318a165d00e25055bcb916c30ab40cc9c3743ab46911a7a9 +size 617005 diff --git a/UnrealProject/Lost_Edge/Content/MaterialsLibrary/TexturesLibrary/Moss/T_Moss2_Normal.uasset b/UnrealProject/Lost_Edge/Content/MaterialsLibrary/TexturesLibrary/Moss/T_Moss2_Normal.uasset new file mode 100644 index 0000000..399878d --- /dev/null +++ b/UnrealProject/Lost_Edge/Content/MaterialsLibrary/TexturesLibrary/Moss/T_Moss2_Normal.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6dccce8cc153e88b5c7d33ca195c35c9d20651b136300cda08f55d0fe8736669 +size 728728 diff --git a/UnrealProject/Lost_Edge/Content/MaterialsLibrary/TexturesLibrary/Moss/T_Moss3_Diffuse.uasset b/UnrealProject/Lost_Edge/Content/MaterialsLibrary/TexturesLibrary/Moss/T_Moss3_Diffuse.uasset new file mode 100644 index 0000000..62a479b --- /dev/null +++ b/UnrealProject/Lost_Edge/Content/MaterialsLibrary/TexturesLibrary/Moss/T_Moss3_Diffuse.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:acd298d96ff63cf28ac27a51e2c05f2dc650a619a1bc3a3993a0ed3cde46f680 +size 623932 diff --git a/UnrealProject/Lost_Edge/Content/MaterialsLibrary/TexturesLibrary/Moss/T_Moss3_Normal.uasset b/UnrealProject/Lost_Edge/Content/MaterialsLibrary/TexturesLibrary/Moss/T_Moss3_Normal.uasset new file mode 100644 index 0000000..d3fbc6d --- /dev/null +++ b/UnrealProject/Lost_Edge/Content/MaterialsLibrary/TexturesLibrary/Moss/T_Moss3_Normal.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:668701f2bfb715198675636212877e13cf9c4fa7c7dd2cda3c7f3bfacea15e4e +size 765242 diff --git a/UnrealProject/Lost_Edge/Content/MaterialsLibrary/TexturesLibrary/Moss/T_Moss4_Diffuse.uasset b/UnrealProject/Lost_Edge/Content/MaterialsLibrary/TexturesLibrary/Moss/T_Moss4_Diffuse.uasset new file mode 100644 index 0000000..a9c602f --- /dev/null +++ b/UnrealProject/Lost_Edge/Content/MaterialsLibrary/TexturesLibrary/Moss/T_Moss4_Diffuse.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:cd015e48e8876b2aa66b809a31f50696feb1fe06392633fe99e255674f00b17d +size 570477 diff --git a/UnrealProject/Lost_Edge/Content/MaterialsLibrary/TexturesLibrary/Moss/T_Moss4_Normal.uasset b/UnrealProject/Lost_Edge/Content/MaterialsLibrary/TexturesLibrary/Moss/T_Moss4_Normal.uasset new file mode 100644 index 0000000..92089fc --- /dev/null +++ b/UnrealProject/Lost_Edge/Content/MaterialsLibrary/TexturesLibrary/Moss/T_Moss4_Normal.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8e08afbf0b59d994428c9f5a5b989058b3a27219c6890b92f4100b018ecf04b0 +size 676703 diff --git a/UnrealProject/Lost_Edge/Content/MaterialsLibrary/TexturesLibrary/T_Cross_Normal.uasset b/UnrealProject/Lost_Edge/Content/MaterialsLibrary/TexturesLibrary/T_Cross_Normal.uasset new file mode 100644 index 0000000..58689ac --- /dev/null +++ b/UnrealProject/Lost_Edge/Content/MaterialsLibrary/TexturesLibrary/T_Cross_Normal.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:facd6194137a566dee8078a564357fc5f028a4aa71da7f52348fb7ae8591d1e5 +size 12222 diff --git a/UnrealProject/Lost_Edge/Content/Misc/Interactables/ST_Interactables_Modificators_CommonDescriptions.uasset b/UnrealProject/Lost_Edge/Content/Misc/Interactables/ST_Interactables_Modificators_CommonDescriptions.uasset new file mode 100644 index 0000000..8594274 --- /dev/null +++ b/UnrealProject/Lost_Edge/Content/Misc/Interactables/ST_Interactables_Modificators_CommonDescriptions.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ea7c2dcbc53d4207b99ae1ee02fc286bb451006cecec2b3776e43efad41bf74d +size 1763 diff --git a/UnrealProject/Lost_Edge/Content/Models/Decorations/Materials/MI_ClockGlass.uasset b/UnrealProject/Lost_Edge/Content/Models/Decorations/Materials/MI_ClockGlass.uasset index 02b63fb..770de1a 100644 --- a/UnrealProject/Lost_Edge/Content/Models/Decorations/Materials/MI_ClockGlass.uasset +++ b/UnrealProject/Lost_Edge/Content/Models/Decorations/Materials/MI_ClockGlass.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4d6032189a2021517dc0411b878686657dd2ad78ae847b89b9a98470d62c9133 -size 11108 +oid sha256:88e51352481301810087c77d390351e5fb83f9cfec172b39f1cc2e8906a1db48 +size 8910 diff --git a/UnrealProject/Lost_Edge/Content/Models/Decorations/Materials/M_BarelWood.uasset b/UnrealProject/Lost_Edge/Content/Models/Decorations/Materials/M_BarelWood.uasset deleted file mode 100644 index 4d08ce2..0000000 --- a/UnrealProject/Lost_Edge/Content/Models/Decorations/Materials/M_BarelWood.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d2482b9b6a671c469bfd8f80a7c7ef5d754816b266e4f63fce65621aecdd118f -size 113228 diff --git a/UnrealProject/Lost_Edge/Content/Models/Decorations/Materials/M_BarrelRings.uasset b/UnrealProject/Lost_Edge/Content/Models/Decorations/Materials/M_BarrelRings.uasset deleted file mode 100644 index 9676b97..0000000 --- a/UnrealProject/Lost_Edge/Content/Models/Decorations/Materials/M_BarrelRings.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:5f5c0c36598a801c028e59c155a24423c81de57947c9d0fc238778e895a703cc -size 116237 diff --git a/UnrealProject/Lost_Edge/Content/Models/Decorations/Materials/M_WindowCurtain.uasset b/UnrealProject/Lost_Edge/Content/Models/Decorations/Materials/M_WindowCurtain.uasset deleted file mode 100644 index e2e70d6..0000000 --- a/UnrealProject/Lost_Edge/Content/Models/Decorations/Materials/M_WindowCurtain.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:fe24b861ef80d09174f3efcbef702bbee2a66591ce86dbc42402d714647e8ee5 -size 88935 diff --git a/UnrealProject/Lost_Edge/Content/Models/Decorations/Materials/M_WindowCurtainRing.uasset b/UnrealProject/Lost_Edge/Content/Models/Decorations/Materials/M_WindowCurtainRing.uasset deleted file mode 100644 index 9470f7c..0000000 --- a/UnrealProject/Lost_Edge/Content/Models/Decorations/Materials/M_WindowCurtainRing.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:003127bbf72651972ce4a61e8cb30f98e8d4ae1c3909fd955824af4dada30aa1 -size 98092 diff --git a/UnrealProject/Lost_Edge/Content/Models/Decorations/Materials/M_WindowFrame.uasset b/UnrealProject/Lost_Edge/Content/Models/Decorations/Materials/M_WindowFrame.uasset deleted file mode 100644 index aedfb8b..0000000 --- a/UnrealProject/Lost_Edge/Content/Models/Decorations/Materials/M_WindowFrame.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:a199042806633e9e06a93b2d5b48a3b175221376f0e038674fb805c7350067e3 -size 99788 diff --git a/UnrealProject/Lost_Edge/Content/Models/Decorations/SMA_Window/Materials/M_WindowCurtain.uasset b/UnrealProject/Lost_Edge/Content/Models/Decorations/SMA_Window/Materials/M_WindowCurtain.uasset new file mode 100644 index 0000000..9e17589 --- /dev/null +++ b/UnrealProject/Lost_Edge/Content/Models/Decorations/SMA_Window/Materials/M_WindowCurtain.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:eafd67aaa6003a045123f7f0281fc05d98d32d0278d98eead812d1b484aec577 +size 13742 diff --git a/UnrealProject/Lost_Edge/Content/Models/Decorations/SMA_Window/Materials/M_WindowCurtainRing.uasset b/UnrealProject/Lost_Edge/Content/Models/Decorations/SMA_Window/Materials/M_WindowCurtainRing.uasset new file mode 100644 index 0000000..30ee9a1 --- /dev/null +++ b/UnrealProject/Lost_Edge/Content/Models/Decorations/SMA_Window/Materials/M_WindowCurtainRing.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:fe2ae60b42b02f6c89b25ee3b31956198ee0e8c822276348f4d61620772ac04a +size 100814 diff --git a/UnrealProject/Lost_Edge/Content/Models/Decorations/SMA_Window/Materials/M_WindowFrame.uasset b/UnrealProject/Lost_Edge/Content/Models/Decorations/SMA_Window/Materials/M_WindowFrame.uasset new file mode 100644 index 0000000..571f453 --- /dev/null +++ b/UnrealProject/Lost_Edge/Content/Models/Decorations/SMA_Window/Materials/M_WindowFrame.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e24f3fac1f2ed516ec6033984e8cedc236d58b37f337ffea6a9a5f6483398b02 +size 102409 diff --git a/UnrealProject/Lost_Edge/Content/Models/Decorations/SMA_Window/Misc/PA_CurtainDynamic_Curtain.uasset b/UnrealProject/Lost_Edge/Content/Models/Decorations/SMA_Window/Misc/PA_CurtainDynamic_Curtain.uasset new file mode 100644 index 0000000..cfa2232 --- /dev/null +++ b/UnrealProject/Lost_Edge/Content/Models/Decorations/SMA_Window/Misc/PA_CurtainDynamic_Curtain.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:89ed818a011adb18b6e64c56f5e245ca97ba2b21534a88b1c26ec15c50b9f874 +size 9341 diff --git a/UnrealProject/Lost_Edge/Content/Models/Decorations/SMA_Window/Misc/SK_CurtainDynamic_Curtain.uasset b/UnrealProject/Lost_Edge/Content/Models/Decorations/SMA_Window/Misc/SK_CurtainDynamic_Curtain.uasset new file mode 100644 index 0000000..6534b78 --- /dev/null +++ b/UnrealProject/Lost_Edge/Content/Models/Decorations/SMA_Window/Misc/SK_CurtainDynamic_Curtain.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3b7bfe09511a010b674503c946ad1d6a0606802ecff6aef1cf4efa611b92c272 +size 8547 diff --git a/UnrealProject/Lost_Edge/Content/Models/Decorations/SMA_Window/SKM_CurtainDynamic_Curtain.uasset b/UnrealProject/Lost_Edge/Content/Models/Decorations/SMA_Window/SKM_CurtainDynamic_Curtain.uasset new file mode 100644 index 0000000..a8f00cc --- /dev/null +++ b/UnrealProject/Lost_Edge/Content/Models/Decorations/SMA_Window/SKM_CurtainDynamic_Curtain.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0b1286dbc3bd7e137eeb5cacde59a4d7288ac8ea5f6541be08933cdb33a5c63a +size 959332 diff --git a/UnrealProject/Lost_Edge/Content/Models/Decorations/SMA_Window/SM_Curtain.uasset b/UnrealProject/Lost_Edge/Content/Models/Decorations/SMA_Window/SM_Curtain.uasset deleted file mode 100644 index 569cf57..0000000 --- a/UnrealProject/Lost_Edge/Content/Models/Decorations/SMA_Window/SM_Curtain.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e1db2b4ec367e3a2937a8b4650ddcf96f74d036fef57c4febacf96e46d3b8303 -size 89900 diff --git a/UnrealProject/Lost_Edge/Content/Models/Decorations/SMA_Window/SM_CurtainDynamicPinned.uasset b/UnrealProject/Lost_Edge/Content/Models/Decorations/SMA_Window/SM_CurtainDynamicPinned.uasset new file mode 100644 index 0000000..cb6aff0 --- /dev/null +++ b/UnrealProject/Lost_Edge/Content/Models/Decorations/SMA_Window/SM_CurtainDynamicPinned.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7025f2eacc18f7611975d4025a5ad409a58813ddee88f50a4db07c62bd524871 +size 100829 diff --git a/UnrealProject/Lost_Edge/Content/Models/Decorations/SMA_Window/SM_CurtainDynamic_Plank.uasset b/UnrealProject/Lost_Edge/Content/Models/Decorations/SMA_Window/SM_CurtainDynamic_Plank.uasset new file mode 100644 index 0000000..dc5f6e3 --- /dev/null +++ b/UnrealProject/Lost_Edge/Content/Models/Decorations/SMA_Window/SM_CurtainDynamic_Plank.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:74ac5ef1095cee83fc4d5ecb2016dbe90f9b2019312469d276340d8a526ba613 +size 57127 diff --git a/UnrealProject/Lost_Edge/Content/Models/Decorations/SMA_Window/SM_CurtainStatic.uasset b/UnrealProject/Lost_Edge/Content/Models/Decorations/SMA_Window/SM_CurtainStatic.uasset new file mode 100644 index 0000000..4e72076 --- /dev/null +++ b/UnrealProject/Lost_Edge/Content/Models/Decorations/SMA_Window/SM_CurtainStatic.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:39b2679e8cfa8d03c120e953987c911b88f5930e9bc28bc3a0668541bb5e539f +size 60469 diff --git a/UnrealProject/Lost_Edge/Content/Models/Decorations/SMA_Window/SM_WindowCurtainDynamicPinned.uasset b/UnrealProject/Lost_Edge/Content/Models/Decorations/SMA_Window/SM_WindowCurtainDynamicPinned.uasset deleted file mode 100644 index a8e8b74..0000000 --- a/UnrealProject/Lost_Edge/Content/Models/Decorations/SMA_Window/SM_WindowCurtainDynamicPinned.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:ddfb9dd9d0eec235a2a18864c166e874f4ed4dd0a05763988e6384851a96645c -size 139328 diff --git a/UnrealProject/Lost_Edge/Content/Models/Decorations/SMA_Window/SM_WindowDouble.uasset b/UnrealProject/Lost_Edge/Content/Models/Decorations/SMA_Window/SM_WindowDouble.uasset index d8d9b77..479a89f 100644 --- a/UnrealProject/Lost_Edge/Content/Models/Decorations/SMA_Window/SM_WindowDouble.uasset +++ b/UnrealProject/Lost_Edge/Content/Models/Decorations/SMA_Window/SM_WindowDouble.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e112322f40d16555b1594410f8553321689f4a417c4f934d2c06807ccb41677c -size 99688 +oid sha256:b014b21e8a8b493b6867dc2d1df7dbe6391724fccf2a2d5e24237ec541d70af5 +size 63583 diff --git a/UnrealProject/Lost_Edge/Content/Models/Decorations/SMA_Window/SM_WindowFull.uasset b/UnrealProject/Lost_Edge/Content/Models/Decorations/SMA_Window/SM_WindowFull.uasset index bf89f78..c52d7e7 100644 --- a/UnrealProject/Lost_Edge/Content/Models/Decorations/SMA_Window/SM_WindowFull.uasset +++ b/UnrealProject/Lost_Edge/Content/Models/Decorations/SMA_Window/SM_WindowFull.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:84737e1c7c7532b8e82a38f84f1b9c49d7019a44277cfd90defd6bf20b0b4445 -size 100341 +oid sha256:f2e4bfca9d7c512f2fd7e0cd0ef8a0ed29ce072782662d52518ae0a1240d9fa8 +size 63214 diff --git a/UnrealProject/Lost_Edge/Content/Models/Decorations/SMA_Window/SM_WindowQuatro.uasset b/UnrealProject/Lost_Edge/Content/Models/Decorations/SMA_Window/SM_WindowQuatro.uasset index 6ee01ea..94abd32 100644 --- a/UnrealProject/Lost_Edge/Content/Models/Decorations/SMA_Window/SM_WindowQuatro.uasset +++ b/UnrealProject/Lost_Edge/Content/Models/Decorations/SMA_Window/SM_WindowQuatro.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4bb71bfd852b49be62bc319140a67502e785841f7ba85381c02227daa4679363 -size 101100 +oid sha256:0c03920cc1ca9a4730914277558a88fd995ac43943f5713c35d12fb46e8f7815 +size 64087 diff --git a/UnrealProject/Lost_Edge/Content/Models/Decorations/SM_Barrel.uasset b/UnrealProject/Lost_Edge/Content/Models/Decorations/SM_Barrel.uasset index d86dfae..6da0a85 100644 --- a/UnrealProject/Lost_Edge/Content/Models/Decorations/SM_Barrel.uasset +++ b/UnrealProject/Lost_Edge/Content/Models/Decorations/SM_Barrel.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9570bf70c0b1b5bff1513d2df921d062199a20a9aeaf8357204ef87c5a533279 -size 138021 +oid sha256:6434a8ea758bf8f6eee23365b4ebdba239c6fe552d9388f0a4adab7b98b280ae +size 135892 diff --git a/UnrealProject/Lost_Edge/Content/Models/Marketplace/LPGenericPropsSet02/README.txt b/UnrealProject/Lost_Edge/Content/Models/Marketplace/LPGenericPropsSet02/README.md similarity index 100% rename from UnrealProject/Lost_Edge/Content/Models/Marketplace/LPGenericPropsSet02/README.txt rename to UnrealProject/Lost_Edge/Content/Models/Marketplace/LPGenericPropsSet02/README.md diff --git a/UnrealProject/Lost_Edge/Content/Models/Marketplace/LowPolyFences/README.md b/UnrealProject/Lost_Edge/Content/Models/Marketplace/LowPolyFences/README.md new file mode 100644 index 0000000..c131928 --- /dev/null +++ b/UnrealProject/Lost_Edge/Content/Models/Marketplace/LowPolyFences/README.md @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e4642ad9a31b239c98b2b4c09b54228f0c904ec8d4ad21cb29b12f4355587764 +size 65 diff --git a/UnrealProject/Lost_Edge/Content/Models/Marketplace/LowPolyFences/SM_Fence.uasset b/UnrealProject/Lost_Edge/Content/Models/Marketplace/LowPolyFences/SM_Fence.uasset new file mode 100644 index 0000000..cfb76ca --- /dev/null +++ b/UnrealProject/Lost_Edge/Content/Models/Marketplace/LowPolyFences/SM_Fence.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d1078f9b6ce27f73f2bf3de13336a06aff5a381739e99711c36062bfd9e61582 +size 57967 diff --git a/UnrealProject/Lost_Edge/Content/Models/Marketplace/LowPolyFences/SM_Fence_Broken1.uasset b/UnrealProject/Lost_Edge/Content/Models/Marketplace/LowPolyFences/SM_Fence_Broken1.uasset new file mode 100644 index 0000000..edbf386 --- /dev/null +++ b/UnrealProject/Lost_Edge/Content/Models/Marketplace/LowPolyFences/SM_Fence_Broken1.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:aee2015aa8b6d7d5ba6a8705ce382cd42cb4ca052ee4fe6e333e63b97c859cbc +size 59065 diff --git a/UnrealProject/Lost_Edge/Content/Models/Marketplace/LowPolyFences/SM_Fence_Broken1_Segment.uasset b/UnrealProject/Lost_Edge/Content/Models/Marketplace/LowPolyFences/SM_Fence_Broken1_Segment.uasset new file mode 100644 index 0000000..ab84f00 --- /dev/null +++ b/UnrealProject/Lost_Edge/Content/Models/Marketplace/LowPolyFences/SM_Fence_Broken1_Segment.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:34283980ea1550849cc039b3ea1bc251a234c78c9c666f4c732b68f54fba37f0 +size 58426 diff --git a/UnrealProject/Lost_Edge/Content/Models/Marketplace/LowPolyFences/SM_Fence_Broken2.uasset b/UnrealProject/Lost_Edge/Content/Models/Marketplace/LowPolyFences/SM_Fence_Broken2.uasset new file mode 100644 index 0000000..a3cd0e8 --- /dev/null +++ b/UnrealProject/Lost_Edge/Content/Models/Marketplace/LowPolyFences/SM_Fence_Broken2.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:721e6b01722df9cb62c0ae465e65174a681df1365de4c41a7e6669f784c5c743 +size 58492 diff --git a/UnrealProject/Lost_Edge/Content/Models/Marketplace/LowPolyFences/SM_Fence_Broken2_Segment.uasset b/UnrealProject/Lost_Edge/Content/Models/Marketplace/LowPolyFences/SM_Fence_Broken2_Segment.uasset new file mode 100644 index 0000000..f1ff313 --- /dev/null +++ b/UnrealProject/Lost_Edge/Content/Models/Marketplace/LowPolyFences/SM_Fence_Broken2_Segment.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:235665137613c5c8d5375f77fc57d4ed3902cb0767ac8ae7156697250d0e36ae +size 58456 diff --git a/UnrealProject/Lost_Edge/Content/Models/Marketplace/LowPolyFences/SM_Fence_Metal.uasset b/UnrealProject/Lost_Edge/Content/Models/Marketplace/LowPolyFences/SM_Fence_Metal.uasset new file mode 100644 index 0000000..ecaf9ae --- /dev/null +++ b/UnrealProject/Lost_Edge/Content/Models/Marketplace/LowPolyFences/SM_Fence_Metal.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0aa4eb4c1fd32f7af31ad99043489f881e6ac2fca72f88a43bc691d8d844f3c7 +size 63837 diff --git a/UnrealProject/Lost_Edge/Content/Models/Marketplace/LowPolyFences/SM_Fence_Metal_Segment.uasset b/UnrealProject/Lost_Edge/Content/Models/Marketplace/LowPolyFences/SM_Fence_Metal_Segment.uasset new file mode 100644 index 0000000..bacb3bf --- /dev/null +++ b/UnrealProject/Lost_Edge/Content/Models/Marketplace/LowPolyFences/SM_Fence_Metal_Segment.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a13faaf53d87f3489d47d1b39fc967a5b02baabb528c9bee7984e085c6bdaa8d +size 62753 diff --git a/UnrealProject/Lost_Edge/Content/Models/Marketplace/LowPolyFences/SM_Fence_Segment.uasset b/UnrealProject/Lost_Edge/Content/Models/Marketplace/LowPolyFences/SM_Fence_Segment.uasset new file mode 100644 index 0000000..0da8f45 --- /dev/null +++ b/UnrealProject/Lost_Edge/Content/Models/Marketplace/LowPolyFences/SM_Fence_Segment.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:476204cacbaa4fec94515224b6ce7e3f116f4196a584ee100b6a4f0218551f84 +size 58769 diff --git a/UnrealProject/Lost_Edge/Content/Models/Marketplace/LowPolyFences/SM_Lamp.uasset b/UnrealProject/Lost_Edge/Content/Models/Marketplace/LowPolyFences/SM_Lamp.uasset new file mode 100644 index 0000000..ea9bc5c --- /dev/null +++ b/UnrealProject/Lost_Edge/Content/Models/Marketplace/LowPolyFences/SM_Lamp.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4d2ae627fea3230b2636bd3d23016e1193f2ed5b54445522c39086f6d2972314 +size 60534 diff --git a/UnrealProject/Lost_Edge/Content/Models/Marketplace/LowPolyFences/SM_Lamp_Chain.uasset b/UnrealProject/Lost_Edge/Content/Models/Marketplace/LowPolyFences/SM_Lamp_Chain.uasset new file mode 100644 index 0000000..588b9a4 --- /dev/null +++ b/UnrealProject/Lost_Edge/Content/Models/Marketplace/LowPolyFences/SM_Lamp_Chain.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:696c96797f9c42e198221c6eb0f9424f6b23607fceb17bb3ef6528e6cb72c9f7 +size 58792 diff --git a/UnrealProject/Lost_Edge/Content/Models/Marketplace/LowPolyFences/SM_Lamp_Pole.uasset b/UnrealProject/Lost_Edge/Content/Models/Marketplace/LowPolyFences/SM_Lamp_Pole.uasset new file mode 100644 index 0000000..73f975e --- /dev/null +++ b/UnrealProject/Lost_Edge/Content/Models/Marketplace/LowPolyFences/SM_Lamp_Pole.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ad7b97cb4666746af465c0166949ce53626a9d9bcc28d42fc6ae1f40e890b6d5 +size 60911 diff --git a/UnrealProject/Lost_Edge/Content/Models/Marketplace/LowPolyOffice/README.md b/UnrealProject/Lost_Edge/Content/Models/Marketplace/LowPolyOffice/README.md new file mode 100644 index 0000000..0255782 --- /dev/null +++ b/UnrealProject/Lost_Edge/Content/Models/Marketplace/LowPolyOffice/README.md @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:339fb387af2348ff0516a2224dff49f99b6da37ecb839182fe68903a073f2144 +size 65 diff --git a/UnrealProject/Lost_Edge/Content/Models/Nature/Grass/BP_GrassCapture.uasset b/UnrealProject/Lost_Edge/Content/Models/Nature/Grass/BP_GrassCapture.uasset deleted file mode 100644 index 3a54d70..0000000 --- a/UnrealProject/Lost_Edge/Content/Models/Nature/Grass/BP_GrassCapture.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:67d1a1f8596b3c53d1b3dd7ec2932742c74b69cc98de474ae419929899bdf810 -size 105621 diff --git a/UnrealProject/Lost_Edge/Content/Models/Nature/Grass/MF_GrassMaskUV.uasset b/UnrealProject/Lost_Edge/Content/Models/Nature/Grass/MF_GrassMaskUV.uasset deleted file mode 100644 index 8d9aab9..0000000 --- a/UnrealProject/Lost_Edge/Content/Models/Nature/Grass/MF_GrassMaskUV.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:23c5413f66df688a2c427eb81dd15bec0710f9dab1f0638f29d445af8b620d03 -size 100038 diff --git a/UnrealProject/Lost_Edge/Content/Models/Nature/Grass/MF_GrassProjection.uasset b/UnrealProject/Lost_Edge/Content/Models/Nature/Grass/MF_GrassProjection.uasset deleted file mode 100644 index bb38e69..0000000 --- a/UnrealProject/Lost_Edge/Content/Models/Nature/Grass/MF_GrassProjection.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:b2a0eb371a6472e0dc75b6c1b12dec55540e7f03d2acbd904d4ba656e3e7dbae -size 39149 diff --git a/UnrealProject/Lost_Edge/Content/Models/Nature/Grass/MH_GrassBackground.uasset b/UnrealProject/Lost_Edge/Content/Models/Nature/Grass/MH_GrassBackground.uasset deleted file mode 100644 index ba6649b..0000000 --- a/UnrealProject/Lost_Edge/Content/Models/Nature/Grass/MH_GrassBackground.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:c2552d564d6ea644653539622dc7f1a2752f7d5d7e8ed6bae03a2cd4051a484a -size 86941 diff --git a/UnrealProject/Lost_Edge/Content/Models/Nature/Grass/MH_GrassDirection.uasset b/UnrealProject/Lost_Edge/Content/Models/Nature/Grass/MH_GrassDirection.uasset deleted file mode 100644 index eabff1c..0000000 --- a/UnrealProject/Lost_Edge/Content/Models/Nature/Grass/MH_GrassDirection.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:a241d15058a6e19fc2e5afe0c19e41cde1344dd7fd58f960b6f0416910e812d5 -size 117719 diff --git a/UnrealProject/Lost_Edge/Content/Models/Nature/Grass/MPC_Grass.uasset b/UnrealProject/Lost_Edge/Content/Models/Nature/Grass/MPC_Grass.uasset deleted file mode 100644 index 65f7ad0..0000000 --- a/UnrealProject/Lost_Edge/Content/Models/Nature/Grass/MPC_Grass.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:95b94bde7e979e7cca58be439b81d3e5b599af4882b3e0178700cb00137780a6 -size 1987 diff --git a/UnrealProject/Lost_Edge/Content/Models/Nature/Grass/Materials/MI_GrassLOD0.uasset b/UnrealProject/Lost_Edge/Content/Models/Nature/Grass/Materials/MI_GrassLOD0.uasset deleted file mode 100644 index 535d323..0000000 --- a/UnrealProject/Lost_Edge/Content/Models/Nature/Grass/Materials/MI_GrassLOD0.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:265c1b64763a25e23c273d1c007a136a11b643ee6a435035041a37790706b784 -size 164167 diff --git a/UnrealProject/Lost_Edge/Content/Models/Nature/Grass/Materials/MI_GrassLOD0Scalling.uasset b/UnrealProject/Lost_Edge/Content/Models/Nature/Grass/Materials/MI_GrassLOD0Scalling.uasset deleted file mode 100644 index 5aad8fc..0000000 --- a/UnrealProject/Lost_Edge/Content/Models/Nature/Grass/Materials/MI_GrassLOD0Scalling.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:bc7c5271619bee8c08073469ae1bc24cc2dbc019b2830f047f49ba50fef528d7 -size 114318 diff --git a/UnrealProject/Lost_Edge/Content/Models/Nature/Grass/Materials/MI_GrassLOD0X.uasset b/UnrealProject/Lost_Edge/Content/Models/Nature/Grass/Materials/MI_GrassLOD0X.uasset deleted file mode 100644 index c9a86c7..0000000 --- a/UnrealProject/Lost_Edge/Content/Models/Nature/Grass/Materials/MI_GrassLOD0X.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:12a643890a5608135e3a0ec1b65db397ddd7853c17138e85d224dc0a1247cdc2 -size 167657 diff --git a/UnrealProject/Lost_Edge/Content/Models/Nature/Grass/Materials/MI_GrassLOD1.uasset b/UnrealProject/Lost_Edge/Content/Models/Nature/Grass/Materials/MI_GrassLOD1.uasset deleted file mode 100644 index 58225c5..0000000 --- a/UnrealProject/Lost_Edge/Content/Models/Nature/Grass/Materials/MI_GrassLOD1.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:c79135c46f7468e04d7ea38dc5a8bef9521a0d6e9fb519278c7b534fbe862abc -size 163546 diff --git a/UnrealProject/Lost_Edge/Content/Models/Nature/Grass/Materials/MI_GrassLOD2X.uasset b/UnrealProject/Lost_Edge/Content/Models/Nature/Grass/Materials/MI_GrassLOD2X.uasset deleted file mode 100644 index c8c078f..0000000 --- a/UnrealProject/Lost_Edge/Content/Models/Nature/Grass/Materials/MI_GrassLOD2X.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:ef89216286515a35a849dac0599a2439d9b209356216f55b92e11e50df547249 -size 170565 diff --git a/UnrealProject/Lost_Edge/Content/Models/Nature/Grass/Materials/MI_GrassLOD3.uasset b/UnrealProject/Lost_Edge/Content/Models/Nature/Grass/Materials/MI_GrassLOD3.uasset deleted file mode 100644 index 5a419d2..0000000 --- a/UnrealProject/Lost_Edge/Content/Models/Nature/Grass/Materials/MI_GrassLOD3.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:aa94f42e7c354e7554d456bf269e9b80cfb3d1260bd7dacd4b45e285896101ed -size 113301 diff --git a/UnrealProject/Lost_Edge/Content/Models/Nature/Grass/Materials/MI_GrassMultiLOD2.uasset b/UnrealProject/Lost_Edge/Content/Models/Nature/Grass/Materials/MI_GrassMultiLOD2.uasset deleted file mode 100644 index 3005cf7..0000000 --- a/UnrealProject/Lost_Edge/Content/Models/Nature/Grass/Materials/MI_GrassMultiLOD2.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:517650954a747b715eeb1642dffd20b06900130152fa0b0145e43f7116a92046 -size 164362 diff --git a/UnrealProject/Lost_Edge/Content/Models/Nature/Grass/Materials/M_GrassLOD0.uasset b/UnrealProject/Lost_Edge/Content/Models/Nature/Grass/Materials/M_GrassLOD0.uasset deleted file mode 100644 index 182d71d..0000000 --- a/UnrealProject/Lost_Edge/Content/Models/Nature/Grass/Materials/M_GrassLOD0.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:7732acfae6c5311419c6ac88fa3ff105ecc4e8bf6a476629cd30ab87c0a0b14b -size 69653 diff --git a/UnrealProject/Lost_Edge/Content/Models/Nature/Grass/Materials/M_GrassLOD4.uasset b/UnrealProject/Lost_Edge/Content/Models/Nature/Grass/Materials/M_GrassLOD4.uasset deleted file mode 100644 index 64c5cd6..0000000 --- a/UnrealProject/Lost_Edge/Content/Models/Nature/Grass/Materials/M_GrassLOD4.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:b3b52387e03f9a9dcc8836e695e1686f922d3df7d7503982fae935fac1947ba8 -size 159239 diff --git a/UnrealProject/Lost_Edge/Content/Models/Nature/Grass/Materials/M_GrassLOD8.uasset b/UnrealProject/Lost_Edge/Content/Models/Nature/Grass/Materials/M_GrassLOD8.uasset deleted file mode 100644 index 4f385c9..0000000 --- a/UnrealProject/Lost_Edge/Content/Models/Nature/Grass/Materials/M_GrassLOD8.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:344217464a1e6510a7bd6ceb1bc1b9ab35f270ae755411e3098c3fd965ea804d -size 15531 diff --git a/UnrealProject/Lost_Edge/Content/Models/Nature/Grass/P_GrassAffector.uasset b/UnrealProject/Lost_Edge/Content/Models/Nature/Grass/P_GrassAffector.uasset deleted file mode 100644 index 0d6c46f..0000000 --- a/UnrealProject/Lost_Edge/Content/Models/Nature/Grass/P_GrassAffector.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:a09d162a2a7a3cda264e88b1cf2db01fc92f5ac092406fd0c2cf704caa7b3dbf -size 17517 diff --git a/UnrealProject/Lost_Edge/Content/Models/Nature/Grass/RD2D_Grass.uasset b/UnrealProject/Lost_Edge/Content/Models/Nature/Grass/RD2D_Grass.uasset deleted file mode 100644 index 63d9603..0000000 --- a/UnrealProject/Lost_Edge/Content/Models/Nature/Grass/RD2D_Grass.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f19a4a38549b9e349089d9b20e8dabd51d9e9a29216e01cdadede966d4a7bbcd -size 3654 diff --git a/UnrealProject/Lost_Edge/Content/Models/Nature/Grass/SM_Grass.uasset b/UnrealProject/Lost_Edge/Content/Models/Nature/Grass/SM_Grass.uasset deleted file mode 100644 index 02b60af..0000000 --- a/UnrealProject/Lost_Edge/Content/Models/Nature/Grass/SM_Grass.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:28f299a593057c9414be924b2721441dbdc42cf2c638a5474f3f7905c8a42a23 -size 113083 diff --git a/UnrealProject/Lost_Edge/Content/Models/Nature/Grass/SM_GrassMulti.uasset b/UnrealProject/Lost_Edge/Content/Models/Nature/Grass/SM_GrassMulti.uasset deleted file mode 100644 index ee79f16..0000000 --- a/UnrealProject/Lost_Edge/Content/Models/Nature/Grass/SM_GrassMulti.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:901c063cbb70b66a2ebf813780291631b00df26c91a1621ae7547d774db9546b -size 144551 diff --git a/UnrealProject/Lost_Edge/Content/Models/Nature/Grass/SM_GrassMultiShort.uasset b/UnrealProject/Lost_Edge/Content/Models/Nature/Grass/SM_GrassMultiShort.uasset deleted file mode 100644 index 8a7a6f4..0000000 --- a/UnrealProject/Lost_Edge/Content/Models/Nature/Grass/SM_GrassMultiShort.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:2f5ca6269fb59a0c041c82d36cee58bca1f5a40a7813ffcdb23ea2139649d00a -size 141012 diff --git a/UnrealProject/Lost_Edge/Content/Models/Nature/Grass/Textures/T_Grass256x384.uasset b/UnrealProject/Lost_Edge/Content/Models/Nature/Grass/Textures/T_Grass256x384.uasset deleted file mode 100644 index 8325cd5..0000000 --- a/UnrealProject/Lost_Edge/Content/Models/Nature/Grass/Textures/T_Grass256x384.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:de6d93061cffdec66bdfca8fd6dac7c7edf5e83a0fd4135e8da0f622c1ffb684 -size 108619 diff --git a/UnrealProject/Lost_Edge/Content/Models/Nature/Grass/Textures/T_Grass384x576.uasset b/UnrealProject/Lost_Edge/Content/Models/Nature/Grass/Textures/T_Grass384x576.uasset deleted file mode 100644 index 9348b76..0000000 --- a/UnrealProject/Lost_Edge/Content/Models/Nature/Grass/Textures/T_Grass384x576.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:18b587dc3860066563c6550b42ee16fa38e6b5a253d3f36a00b5e9a3a88eeca3 -size 180952 diff --git a/UnrealProject/Lost_Edge/Content/Models/Nature/Grass/Textures/T_Grass512x768.uasset b/UnrealProject/Lost_Edge/Content/Models/Nature/Grass/Textures/T_Grass512x768.uasset deleted file mode 100644 index 461228d..0000000 --- a/UnrealProject/Lost_Edge/Content/Models/Nature/Grass/Textures/T_Grass512x768.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f5e1a64a2b62bcb2082cb01123a9af3875062a69cacd05aab54c319bf9470f1e -size 284493 diff --git a/UnrealProject/Lost_Edge/Content/Models/Nature/Grass/Textures/T_Grass64x96.uasset b/UnrealProject/Lost_Edge/Content/Models/Nature/Grass/Textures/T_Grass64x96.uasset deleted file mode 100644 index 6b7d4ea..0000000 --- a/UnrealProject/Lost_Edge/Content/Models/Nature/Grass/Textures/T_Grass64x96.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:51a3dd682206b50e1f073f9562d42f1ea166769f59c9b198ce69358bf9393730 -size 15787 diff --git a/UnrealProject/Lost_Edge/Content/Models/Nature/Trees/SM_OakB.uasset b/UnrealProject/Lost_Edge/Content/Models/Nature/Trees/SM_OakB.uasset index 1b9abad..b83e371 100644 --- a/UnrealProject/Lost_Edge/Content/Models/Nature/Trees/SM_OakB.uasset +++ b/UnrealProject/Lost_Edge/Content/Models/Nature/Trees/SM_OakB.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3b9dc8c6a6840002038c25d239620e647745f7b64a25f672653f9b38487b4abc -size 124484 +oid sha256:11c85a8fb472eda0d04325d99b0715e11ee9ba9807a8053290803c378602bd1b +size 126106 diff --git a/UnrealProject/Lost_Edge/Content/Models/Nature/Trees/SM_SpruceA.uasset b/UnrealProject/Lost_Edge/Content/Models/Nature/Trees/SM_SpruceA.uasset index 19b0f93..fdecd2f 100644 --- a/UnrealProject/Lost_Edge/Content/Models/Nature/Trees/SM_SpruceA.uasset +++ b/UnrealProject/Lost_Edge/Content/Models/Nature/Trees/SM_SpruceA.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e37f5a2a5b947389e1e9176a7cd80ca970d6833f5b62182924a7ab802d7bc5e0 -size 126439 +oid sha256:a88b4d3d0578b5e0e03bcbd3fc49eb20c45a65009491d3fe0aa2ef09cf27ce87 +size 128601 diff --git a/UnrealProject/Lost_Edge/Content/Models/Nature/Trees/SM_SpruceB.uasset b/UnrealProject/Lost_Edge/Content/Models/Nature/Trees/SM_SpruceB.uasset index 7b58b90..13f60d0 100644 --- a/UnrealProject/Lost_Edge/Content/Models/Nature/Trees/SM_SpruceB.uasset +++ b/UnrealProject/Lost_Edge/Content/Models/Nature/Trees/SM_SpruceB.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:403bf2b16ecbfa48d93ca31faacf1b9966b3d1c79e08551cb030d59abc05b90f -size 124668 +oid sha256:66e425fbdad9b1970a990d3b4ed308c2965f21e9fa9bae1dfd545a24fd296363 +size 126847 diff --git a/UnrealProject/Lost_Edge/Content/UI/Blueprints/Interactables/UI_InteractableHint.uasset b/UnrealProject/Lost_Edge/Content/UI/Blueprints/Interactables/UI_InteractableHint.uasset index a18cba0..4d4094a 100644 --- a/UnrealProject/Lost_Edge/Content/UI/Blueprints/Interactables/UI_InteractableHint.uasset +++ b/UnrealProject/Lost_Edge/Content/UI/Blueprints/Interactables/UI_InteractableHint.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b8c59fa3a410a2f58a077e4af87d7e0486ff1567de8aba5a01e8cc7490dfa8b6 -size 304195 +oid sha256:12c568a32d174235ca8f69bb88895e386784238d65913aaf4e1b8fc7f0ca4abe +size 426340 diff --git a/UnrealProject/Lost_Edge/Content/UI/Blueprints/MainMenu/Pages/UI_MainMenu_Page_Home.uasset b/UnrealProject/Lost_Edge/Content/UI/Blueprints/MainMenu/Pages/UI_MainMenu_Page_Home.uasset index ecaeb54..d6cc9f0 100644 --- a/UnrealProject/Lost_Edge/Content/UI/Blueprints/MainMenu/Pages/UI_MainMenu_Page_Home.uasset +++ b/UnrealProject/Lost_Edge/Content/UI/Blueprints/MainMenu/Pages/UI_MainMenu_Page_Home.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0d1ab4322892e42ca4e2998d6887415a81d6ed99ad7a65ef4611e75a57a72001 -size 132734 +oid sha256:3b32af64f58e111f0510ad254359fabc311a3b658325d9a67e5681fd08ce757f +size 130008 diff --git a/UnrealProject/Lost_Edge/Content/UI/Blueprints/UI_CutsceneSkip.uasset b/UnrealProject/Lost_Edge/Content/UI/Blueprints/UI_CutsceneSkip.uasset index 099e55e..2b47b5a 100644 --- a/UnrealProject/Lost_Edge/Content/UI/Blueprints/UI_CutsceneSkip.uasset +++ b/UnrealProject/Lost_Edge/Content/UI/Blueprints/UI_CutsceneSkip.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:68bd5a3b38faf7e08411ef5882bcb4afcb9330e6ece0e1087d38d6c083216b6c -size 102434 +oid sha256:1593e8c6d047caf9a6d150cd1ee3169cfdb72bebe74a7ee7b53e434ce4a2f589 +size 128443 diff --git a/UnrealProject/Lost_Edge/Content/UI/Blueprints/UI_TextLine.uasset b/UnrealProject/Lost_Edge/Content/UI/Blueprints/UI_TextLine.uasset new file mode 100644 index 0000000..533a265 --- /dev/null +++ b/UnrealProject/Lost_Edge/Content/UI/Blueprints/UI_TextLine.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:434c240eec1737cac4b8c0558550a8ca59fb478c03710fb3acbd01ffc4b3526d +size 39490 diff --git a/UnrealProject/Lost_Edge/Lost_Edge.uproject b/UnrealProject/Lost_Edge/Lost_Edge.uproject index bcbf9c6..12e3b2c 100644 --- a/UnrealProject/Lost_Edge/Lost_Edge.uproject +++ b/UnrealProject/Lost_Edge/Lost_Edge.uproject @@ -100,10 +100,6 @@ "Name": "ChaosClothEditor", "Enabled": false }, - { - "Name": "ChaosCloth", - "Enabled": false - }, { "Name": "ChaosNiagara", "Enabled": false @@ -359,6 +355,14 @@ { "Name": "FMODStudioNiagara", "Enabled": true + }, + { + "Name": "ChaosClothAsset", + "Enabled": true + }, + { + "Name": "ChaosClothAssetEditor", + "Enabled": true } ], "TargetPlatforms": [ diff --git a/UnrealProject/Lost_Edge/Plugins/FMODStudio/Source/FMODStudio/FMODStudio.Build.cs b/UnrealProject/Lost_Edge/Plugins/FMODStudio/Source/FMODStudio/FMODStudio.Build.cs index 254a232..49a12d6 100644 --- a/UnrealProject/Lost_Edge/Plugins/FMODStudio/Source/FMODStudio/FMODStudio.Build.cs +++ b/UnrealProject/Lost_Edge/Plugins/FMODStudio/Source/FMODStudio/FMODStudio.Build.cs @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c674399659f92e6e09329193723847caec233d700c87e35e459f1658a60bc848 -size 11781 +oid sha256:a2ceca7d34685f1e3ffb03d56b91e7db14e362464e6170f2339e2aaef990b3f9 +size 11654 diff --git a/UnrealProject/Lost_Edge/Plugins/FMODStudio/Source/FMODStudioEditor/FMODStudioEditor.Build.cs b/UnrealProject/Lost_Edge/Plugins/FMODStudio/Source/FMODStudioEditor/FMODStudioEditor.Build.cs index 14a250d..280838b 100644 --- a/UnrealProject/Lost_Edge/Plugins/FMODStudio/Source/FMODStudioEditor/FMODStudioEditor.Build.cs +++ b/UnrealProject/Lost_Edge/Plugins/FMODStudio/Source/FMODStudioEditor/FMODStudioEditor.Build.cs @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:03b6b60b8adebb499596de1f267437aa2e9119cf97d80fc4b6bb00bec8afec8f -size 2018 +oid sha256:d84ce1c9b70ad8ea489e47222b233d0c6a85a13ed6b4c1fb5517116bef715cf7 +size 2080 diff --git a/UnrealProject/Lost_Edge/Plugins/FMODStudioNiagara/Source/FMODStudioNiagara/FMODStudioNiagara.Build.cs b/UnrealProject/Lost_Edge/Plugins/FMODStudioNiagara/Source/FMODStudioNiagara/FMODStudioNiagara.Build.cs index 418f6b8..8c80cd9 100644 --- a/UnrealProject/Lost_Edge/Plugins/FMODStudioNiagara/Source/FMODStudioNiagara/FMODStudioNiagara.Build.cs +++ b/UnrealProject/Lost_Edge/Plugins/FMODStudioNiagara/Source/FMODStudioNiagara/FMODStudioNiagara.Build.cs @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:06200c96a2370c4e3f41b739852ce5c68837ed55a2a061b4a8effebbd96c0a56 -size 954 +oid sha256:792b181d212d99a6a0e39a69b9aa1e0bd59979f0f2281db8ab553e37e3928bfe +size 1005 diff --git a/UnrealProject/Lost_Edge/Plugins/FlatNodes/Source/FlatNodes/FlatNodes.Build.cs b/UnrealProject/Lost_Edge/Plugins/FlatNodes/Source/FlatNodes/FlatNodes.Build.cs index 962f517..871a008 100644 --- a/UnrealProject/Lost_Edge/Plugins/FlatNodes/Source/FlatNodes/FlatNodes.Build.cs +++ b/UnrealProject/Lost_Edge/Plugins/FlatNodes/Source/FlatNodes/FlatNodes.Build.cs @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b05aa5d7de23273a0075a96388ae1e091b2b38901032dc3adb39cdfa0ea13334 -size 1155 +oid sha256:8c1bd1f012d230b98824baacf4c223f7535e5bcd7256cbb9a04085d9c95f7550 +size 1457 diff --git a/UnrealProject/Lost_Edge/Source/Lost_Edge/Lost_Edge.Build.cs b/UnrealProject/Lost_Edge/Source/Lost_Edge/Lost_Edge.Build.cs index b5287de..40b6071 100644 --- a/UnrealProject/Lost_Edge/Source/Lost_Edge/Lost_Edge.Build.cs +++ b/UnrealProject/Lost_Edge/Source/Lost_Edge/Lost_Edge.Build.cs @@ -7,11 +7,18 @@ public class Lost_Edge : ModuleRules public Lost_Edge(ReadOnlyTargetRules Target) : base(Target) { PCHUsage = PCHUsageMode.UseExplicitOrSharedPCHs; + //MinCpuArchX64 = MinimumCpuArchitectureX64.AVX2; PublicDependencyModuleNames.AddRange(new string[] { "Core", "CoreUObject", "Engine", "InputCore", "OpenCV" }); PrivateDependencyModuleNames.AddRange(new string[] { "EnhancedInput", "UMG", "RHI", "RenderCore", "Lost_EdgeShaders", "PakFile", //"TextureCompressor", - "LevelSequence", "MovieScene", "HTTP", "Json", "ApplicationCore" }); // "Slate", "SlateCore" + "LevelSequence", "MovieScene", "HTTP", "Json", "ApplicationCore", "ProceduralMeshComponent", "Landscape", }); // "Slate", "SlateCore" + + if (Target.bBuildEditor) + { + PrivateDependencyModuleNames.AddRange(new string[] { "UnrealEd", "LevelEditor", + "MeshDescription", "StaticMeshDescription", "AssetRegistry" }); + } // UE_LOG(LogTemp, Log, TEXT("capture: %s"), (capture ? TEXT("true") : TEXT("false"))); // GEngine->AddOnScreenDebugMessage(-1, 5.0f, FColor::Yellow, TEXT("1")); diff --git a/UnrealProject/Lost_Edge/Source/Lost_Edge/Private/CommonFunctions.cpp b/UnrealProject/Lost_Edge/Source/Lost_Edge/Private/CommonFunctions.cpp index 58bc6c2..ee18efe 100644 --- a/UnrealProject/Lost_Edge/Source/Lost_Edge/Private/CommonFunctions.cpp +++ b/UnrealProject/Lost_Edge/Source/Lost_Edge/Private/CommonFunctions.cpp @@ -19,6 +19,15 @@ bool UCommonFunctions::IsNonGameObject(UObject* object) return false; } +bool UCommonFunctions::InEditor() +{ +#if WITH_EDITOR + return true; +#else + return false; +#endif +} + FText UCommonFunctions::GetKeyDisplayName(FKey key) { if(key == EKeys::MouseWheelAxis) @@ -49,6 +58,16 @@ void UCommonFunctions::DestroyActorRecursively(AActor* actor) actor->Destroy(); } +void UCommonFunctions::SetActorHiddenInGameRecursively(AActor* actor, bool newHidden) +{ + TArray childs; + actor->GetAttachedActors(childs, true, true); + + for(auto child : childs) + child->SetActorHiddenInGame(newHidden); + actor->SetActorHiddenInGame(newHidden); +} + TArray UCommonFunctions::GetRandomIntArray(int32 size, int32 min, int32 max) { if(size <= 0) @@ -176,6 +195,11 @@ bool UCommonFunctions::ColorEquals(const FColor a, const FColor b) return a == b; } +bool UCommonFunctions::FloatIsZero(const float a) +{ + return a > -UE_KINDA_SMALL_NUMBER && a < UE_KINDA_SMALL_NUMBER; +} + uint8& UCommonFunctions::ByteIncerement(uint8& var) { return ++var; diff --git a/UnrealProject/Lost_Edge/Source/Lost_Edge/Private/CommonFunctions.h b/UnrealProject/Lost_Edge/Source/Lost_Edge/Private/CommonFunctions.h index 54e3474..01cc6a5 100644 --- a/UnrealProject/Lost_Edge/Source/Lost_Edge/Private/CommonFunctions.h +++ b/UnrealProject/Lost_Edge/Source/Lost_Edge/Private/CommonFunctions.h @@ -40,6 +40,9 @@ public: /** Returns true if the object is UE class template (used for copy/archetype/meta system but not on the level) */ UFUNCTION(BlueprintPure) static bool IsNonGameObject(class UObject* object); + /** Returns true if the game is in the editor */ + UFUNCTION(BlueprintPure) + static bool InEditor(); /** "Overload" of the built-in keys translator (to not build own engine copy) */ UFUNCTION(BlueprintPure) @@ -51,6 +54,9 @@ public: /** Recursively destroy actor and all its childs (the default Destroy doesn't have consistent behavior) */ UFUNCTION(BlueprintCallable, Category = Actor) static void DestroyActorRecursively(class AActor* actor); + /** Recursively set actor hidden in game and all its childs (the default SetActorHidenInGame() hides only on called actor) */ + UFUNCTION(BlueprintCallable, Category = Actor) + static void SetActorHiddenInGameRecursively(AActor* actor, bool newHidden); @@ -94,6 +100,8 @@ public: UFUNCTION(BlueprintCallable, Category = "Byte|Operators", meta = (DisplayName = "Increment", CompactNodeTitle = "++")) static UPARAM(ref) uint8& ByteIncerement(UPARAM(ref) uint8& var); + UFUNCTION(BlueprintPure, Category = "Float|Operators", meta = (DisplayName = "IsZero", CompactNodeTitle = "== 0")) + static bool FloatIsZero(const float a); UFUNCTION(BlueprintPure, Category = String) diff --git a/UnrealProject/Lost_Edge/Source/Lost_Edge/Private/CustomPlayerController.cpp b/UnrealProject/Lost_Edge/Source/Lost_Edge/Private/CustomPlayerController.cpp index cc00e34..0516539 100644 --- a/UnrealProject/Lost_Edge/Source/Lost_Edge/Private/CustomPlayerController.cpp +++ b/UnrealProject/Lost_Edge/Source/Lost_Edge/Private/CustomPlayerController.cpp @@ -18,7 +18,7 @@ TSet> ACustomPlayerController::contextsBefo void ACustomPlayerController::AppendInputContext(TSoftObjectPtr context) { - if(!context.IsValid()) + if(context.IsNull() || contexts.Contains(context) || contextsBeforeInit.Contains(context)) return; if(!UCustomGameInstance::Get()) //game settings not initialized yet diff --git a/UnrealProject/Lost_Edge/Source/Lost_Edge/Private/CutsceneManager.cpp b/UnrealProject/Lost_Edge/Source/Lost_Edge/Private/CutsceneManager.cpp index 469ce13..076716b 100644 --- a/UnrealProject/Lost_Edge/Source/Lost_Edge/Private/CutsceneManager.cpp +++ b/UnrealProject/Lost_Edge/Source/Lost_Edge/Private/CutsceneManager.cpp @@ -67,14 +67,17 @@ void UCutsceneManager::SkipSequence() sequencePlayer->GoToEndAndStop(); } -void UCutsceneManager::ClearQueue() +void UCutsceneManager::Clear() { FScopeLock lock1(&sequencesLock); FScopeLock lock2(&callbacksLock); + if(sequencePlayer) + sequencePlayer->OnStop.Clear(); if(!nextSequences.IsEmpty()) nextSequences.Empty(); if(!endCallbacks.IsEmpty()) endCallbacks.Empty(); + holding = false; } void UCutsceneManager::LockCallback(bool lock) @@ -156,6 +159,7 @@ void UCutsceneManager::OnFirstCutsceneInit() // most first sequence, so widgets static FSkipCutsceneDelegate skipCutsceneDelegate; if(!skipCutsceneDelegate.IsBound()) skipCutsceneDelegate.BindDynamic(this, &UCutsceneManager::SkipSequence); + WM->AnimateCutsceneWidget(EInputAnimatedWidgetAnimation::Reset); WM->EnableCutsceneWidget(skipCutsceneDelegate); } } diff --git a/UnrealProject/Lost_Edge/Source/Lost_Edge/Private/CutsceneManager.h b/UnrealProject/Lost_Edge/Source/Lost_Edge/Private/CutsceneManager.h index 6b9f4e8..aedd7fa 100644 --- a/UnrealProject/Lost_Edge/Source/Lost_Edge/Private/CutsceneManager.h +++ b/UnrealProject/Lost_Edge/Source/Lost_Edge/Private/CutsceneManager.h @@ -23,7 +23,7 @@ public: void SkipSequence(); UFUNCTION(BlueprintCallable) - void ClearQueue(); + void Clear(); UFUNCTION(BlueprintCallable) void LockCallback(bool lock); diff --git a/UnrealProject/Lost_Edge/Source/Lost_Edge/Private/Graphics/GrassGenerator.cpp b/UnrealProject/Lost_Edge/Source/Lost_Edge/Private/Graphics/GrassGenerator.cpp new file mode 100644 index 0000000..af83f1c --- /dev/null +++ b/UnrealProject/Lost_Edge/Source/Lost_Edge/Private/Graphics/GrassGenerator.cpp @@ -0,0 +1,246 @@ +// Oleg Petruny proprietary. + +#include "GrassGenerator.h" + +#include "Components/BoxComponent.h" +#include "ProceduralMeshComponent.h" +#if WITH_EDITOR +#include "AssetRegistry/AssetRegistryModule.h" +#include "Engine/SkyLight.h" +#include "Engine/StaticMeshActor.h" +#include "MeshDescription.h" +#include "PhysicalMaterials/PhysicalMaterial.h" +#include "ProceduralMeshConversion.h" +#include "StaticMeshDescription.h" +#include "Editor/EditorEngine.h" +#include "LevelEditorSubsystem.h" +#include "Landscape.h" +#include "LandscapeComponent.h" +#endif + +AGrassGenerator::AGrassGenerator() +{ + mesh = CreateDefaultSubobject(TEXT("RootComponent")); + RootComponent = mesh; + + areaBrush = CreateDefaultSubobject(TEXT("AreaBrush")); + areaBrush->SetupAttachment(RootComponent); +} + +void AGrassGenerator::PostLoad() +{ + Super::PostLoad(); + + Update(); +} + +#if WITH_EDITOR +void AGrassGenerator::PostEditChangeProperty(FPropertyChangedEvent& PropertyChangedEvent) +{ + Super::PostEditChangeProperty(PropertyChangedEvent); + + //if(PropertyChangedEvent.GetPropertyName() == TEXT("Grass Material") + // || PropertyChangedEvent.GetPropertyName() == TEXT("Tile Count") + // || PropertyChangedEvent.GetPropertyName() == TEXT("Tile Size")) + // Update(); +} +#endif + +void AGrassGenerator::Generate() +{ +#if WITH_EDITOR + Clear(); + + FVector loc = GetActorLocation(); + int32 hh = tileCount.Y / 2 * grassDensity; + int32 hw = tileCount.X / 2 * grassDensity; + float densedTileSize = tileSize / grassDensity; + auto world = GetWorld(); + FRandomStream randomStream(FMath::Rand()); + int64 verticesCount = hh * 2 * hw * 2 * 3; + + constexpr int32 chunkSize = 2 << 24; + TArray vertices; + vertices.Reserve(chunkSize); + TArray triangles; + triangles.Reserve(chunkSize); + TArray normals; + normals.Reserve(chunkSize); + TArray UVs; + UVs.Reserve(chunkSize); + + TArray lands; + landscape->GetComponents(lands); + TArray> landsWeightMaps; + landsWeightMaps.Reserve(lands.Num()); + + for(int32 y = hh * -1; y < hh; ++y) + { + for(int32 x = hw * -1; x < hw; ++x) + { + FVector pivot = loc + FVector{ x * densedTileSize, y * densedTileSize, 0 }; + + int32 landId = -1; + for(int32 i = 0; i < lands.Num(); ++i) + { + if(lands[i]->Bounds.GetBox().IsInside({ pivot.X, pivot.Y, lands[i]->Bounds.Origin.Z })) + { + landId = i; + + for(int32 m = landsWeightMaps.Num() - 1; m < landId; ++m) + { + landsWeightMaps.Add({}); + } + + if(landsWeightMaps[landId].Num() == 0) + { + FLandscapeComponentDataInterface CDI(lands[landId]); + CDI.GetWeightmapTextureData(grassLayer.LoadSynchronous(), landsWeightMaps[landId]); + } + + break; + } + } + if(landId < 0 || landsWeightMaps[landId].Num() == 0) + continue; + + FVector mapLoc = lands[landId]->GetComponentTransform().InverseTransformPosition(pivot); + if(mapLoc.X < 0 || mapLoc.Y < 0 || mapLoc.X > lands[landId]->ComponentSizeQuads || mapLoc.Y > lands[landId]->ComponentSizeQuads) + continue; + + float weight = 0.0f; + { // copied from ULandscapeComponent::GetLayerWeightAtLocation + int32 X1 = FMath::FloorToInt32(mapLoc.X); + int32 Y1 = FMath::FloorToInt32(mapLoc.Y); + int32 X2 = FMath::CeilToInt32(mapLoc.X); + int32 Y2 = FMath::CeilToInt32(mapLoc.Y); + + int32 Stride = (lands[landId]->SubsectionSizeQuads + 1) * lands[landId]->NumSubsections; + + // Min is to prevent the sampling of the final column from overflowing + int32 IdxX1 = FMath::Min(((X1 / lands[landId]->SubsectionSizeQuads) * (lands[landId]->SubsectionSizeQuads + 1)) + (X1 % lands[landId]->SubsectionSizeQuads), Stride - 1); + int32 IdxY1 = FMath::Min(((Y1 / lands[landId]->SubsectionSizeQuads) * (lands[landId]->SubsectionSizeQuads + 1)) + (Y1 % lands[landId]->SubsectionSizeQuads), Stride - 1); + int32 IdxX2 = FMath::Min(((X2 / lands[landId]->SubsectionSizeQuads) * (lands[landId]->SubsectionSizeQuads + 1)) + (X2 % lands[landId]->SubsectionSizeQuads), Stride - 1); + int32 IdxY2 = FMath::Min(((Y2 / lands[landId]->SubsectionSizeQuads) * (lands[landId]->SubsectionSizeQuads + 1)) + (Y2 % lands[landId]->SubsectionSizeQuads), Stride - 1); + + // sample + float Sample11 = (float)(landsWeightMaps[landId][IdxX1 + Stride * IdxY1]) / 255.0f; + float Sample21 = (float)(landsWeightMaps[landId][IdxX2 + Stride * IdxY1]) / 255.0f; + float Sample12 = (float)(landsWeightMaps[landId][IdxX1 + Stride * IdxY2]) / 255.0f; + float Sample22 = (float)(landsWeightMaps[landId][IdxX2 + Stride * IdxY2]) / 255.0f; + + float LerpX = FMath::Fractional(static_cast(mapLoc.X)); + float LerpY = FMath::Fractional(static_cast(mapLoc.Y)); + + weight = FMath::Lerp( + FMath::Lerp(Sample11, Sample21, LerpX), + FMath::Lerp(Sample12, Sample22, LerpX), + LerpY); + } + + if(weight < minWeight) + continue; + + auto landCollision = lands[landId]->GetCollisionComponent(); + TOptional height = landCollision->GetHeight(mapLoc.X, mapLoc.Y, EHeightfieldSource::Complex); + if(!height.IsSet()) + continue; + pivot -= loc; + pivot.Z = landCollision->GetComponentToWorld().TransformPositionNoScale(FVector{ 0, 0, height.GetValue() }).Z - loc.Z; + pivot += {randomStream.FRand()* densedTileSize, randomStream.FRand()* densedTileSize, 0}; + + triangles.Add(vertices.Num()); + vertices.Add(pivot); + triangles.Add(vertices.Num()); + vertices.Add(pivot + FVector{ 0, 0, randomStream.FRandRange(grassHeight - grassHeightVariation, grassHeight + grassHeightVariation) * weight }); + triangles.Add(vertices.Num()); + vertices.Add(pivot + FVector{ randomStream.FRandRange(grassWidth * -1, grassWidth) * weight, randomStream.FRandRange(0, grassWidth) * weight, 0 }); + + int32 v = vertices.Num() - 1; + FVector normal = FVector::CrossProduct(vertices[v - 1] - vertices[v - 2], vertices[v] - vertices[v - 2]).GetSafeNormal() * -1; + normals.Add(normal); + normals.Add(normal); + normals.Add(normal); + + float Vstart = std::min(1.0f - weight, 1.0f); + UVs.Add({ 0, Vstart }); + UVs.Add({ 0.5, 1 }); + UVs.Add({ 1, Vstart }); + + if(vertices.Num() + 3 > chunkSize) + { + mesh->CreateMeshSection(sectionsCount++, vertices, triangles, normals, UVs, {}, {}, false); + vertices.Empty(); + triangles.Empty(); + normals.Empty(); + UVs.Empty(); + } + } + } + + if(vertices.Num()) + mesh->CreateMeshSection(sectionsCount++, vertices, triangles, normals, UVs, {}, {}, false); + + Update(); +#endif +} + +void AGrassGenerator::Clear() +{ +#if WITH_EDITOR + mesh->ClearAllMeshSections(); + sectionsCount = 0; +#endif +} + +void AGrassGenerator::Export() +{ +#if WITH_EDITOR + const FString actorName = GetName(); + const FString levelName = GetWorld()->GetMapName().RightChop(2); + const FString levelPath = FPaths::GetPath(GEditor->GetEditorSubsystem()->GetCurrentLevel()->GetPathName()); + const FString assetName = FString::Printf(TEXT("SM_%s_%s"), *levelName, *actorName); + const FString packageName = FString::Printf(TEXT("%s/Grass/%s"), *levelPath, *assetName); + + UPackage* package = CreatePackage(*packageName); + UStaticMesh* smesh = NewObject(package, FName(assetName), RF_Public | RF_Standalone); + smesh->bAllowCPUAccess = true; + smesh->NeverStream = true; + smesh->InitResources(); + smesh->SetLightingGuid(); + + FMeshDescription meshDesc = BuildMeshDescription(mesh); + UStaticMeshDescription* smeshDesc = smesh->CreateStaticMeshDescription(); + smeshDesc->SetMeshDescription(meshDesc); + smesh->BuildFromStaticMeshDescriptions({ smeshDesc }, false, true); + smesh->GetStaticMaterials().Add({ grassMaterial.LoadSynchronous() }); + smesh->PostEditChange(); + smesh->MarkPackageDirty(); + FAssetRegistryModule::AssetCreated(smesh); + + Clear(); + + AStaticMeshActor* smeshActor = Cast(GEditor->AddActor( + GEditor->GetEditorWorldContext().World()->GetCurrentLevel(), + AStaticMeshActor::StaticClass(), + GetActorTransform() + )); + smeshActor->GetStaticMeshComponent()->SetStaticMesh(smesh); + smeshActor->Rename(*assetName); + smeshActor->SetActorLabel(assetName, false); + smeshActor->MarkPackageDirty(); + GEditor->SelectNone(false, true); + GEditor->SelectActor(smeshActor, true, true); + GEditor->RedrawAllViewports(); +#endif +} + +void AGrassGenerator::Update() +{ +#if WITH_EDITOR + areaBrush->SetBoxExtent({ tileCount.X * tileSize * 0.5, tileCount.Y * tileSize * 0.5, 200 }, false); + mesh->SetMaterial(0, grassMaterial.LoadSynchronous()); + //for(int32 i = 0; i < sectionsCount; ++i) + // mesh->SetMaterSetMaterial(i, grassMaterial.LoadSynchronous()); +#endif +} diff --git a/UnrealProject/Lost_Edge/Source/Lost_Edge/Private/Graphics/GrassGenerator.h b/UnrealProject/Lost_Edge/Source/Lost_Edge/Private/Graphics/GrassGenerator.h new file mode 100644 index 0000000..d48b296 --- /dev/null +++ b/UnrealProject/Lost_Edge/Source/Lost_Edge/Private/Graphics/GrassGenerator.h @@ -0,0 +1,66 @@ +// Oleg Petruny proprietary. + +#pragma once + +#include "GameFramework/Actor.h" + +#include "GrassGenerator.generated.h" + +/** + * Actor which generates grass on the level. + */ +UCLASS(Blueprintable, MinimalAPI, meta = (PrioritizeCategories = "Grass Generator")) +class AGrassGenerator : public AActor +{ + GENERATED_BODY() + +public: + AGrassGenerator(); + + virtual void PostLoad() override; +#if WITH_EDITOR + virtual void PostEditChangeProperty(FPropertyChangedEvent& PropertyChangedEvent) override; +#endif + + UFUNCTION(CallInEditor, Category = "Grass Generator") + void Generate(); + UFUNCTION(CallInEditor, Category = "Grass Generator") + void Clear(); + UFUNCTION(CallInEditor, Category = "Grass Generator") + void Export(); + +private: + UPROPERTY(EditInstanceOnly, Category = "Grass Generator") + TObjectPtr landscape; + UPROPERTY(EditInstanceOnly, Category = "Grass Generator") + TSoftObjectPtr grassLayer; + UPROPERTY(EditInstanceOnly, Category = "Grass Generator") + float minWeight = 1.0f / 3; + + UPROPERTY(EditInstanceOnly, Category = "Grass Generator") + FIntPoint tileCount = { 100, 100 }; + UPROPERTY(EditInstanceOnly, Category = "Grass Generator") + float tileSize = 10; + UPROPERTY(EditInstanceOnly, Category = "Grass Generator") + float grassDensity = 2; + + UPROPERTY(EditInstanceOnly, Category = "Grass Generator") + float grassHeight = 50; + UPROPERTY(EditInstanceOnly, Category = "Grass Generator") + float grassHeightVariation = 20; + UPROPERTY(EditInstanceOnly, Category = "Grass Generator") + float grassWidth = 20; + + UPROPERTY(EditInstanceOnly, Category = "Grass Generator") + TSoftObjectPtr grassMaterial; + + UPROPERTY(VisibleAnywhere) + class UProceduralMeshComponent* mesh; + UPROPERTY() + class UBoxComponent* areaBrush; + + int32 sectionsCount = 0; + + void Update(); +}; + diff --git a/UnrealProject/Lost_Edge/Source/Lost_Edge/Private/GraphicsSettingsHelper.cpp b/UnrealProject/Lost_Edge/Source/Lost_Edge/Private/GraphicsSettingsHelper.cpp index 6db30fa..082f62c 100644 --- a/UnrealProject/Lost_Edge/Source/Lost_Edge/Private/GraphicsSettingsHelper.cpp +++ b/UnrealProject/Lost_Edge/Source/Lost_Edge/Private/GraphicsSettingsHelper.cpp @@ -303,8 +303,12 @@ TArray UGraphicsSettingsHelper::FilterResolutionsViaAspectRatio(const TArray result; for(FIntPoint i : resolutions) - if(i.X % aspectRatio.X == 0 && i.Y % aspectRatio.Y == 0) + { + float resRatio = static_cast(i.X) / i.Y; + float aspRatio = static_cast(aspectRatio.X) / aspectRatio.Y; + if(UCommonFunctions::FloatIsZero(resRatio - aspRatio)) result.Add(i); + } return MoveTemp(result); } @@ -395,10 +399,7 @@ TArray UGraphicsSettingsHelper::GetAvailableAspectRatiousOfMonitor(co TSet aspects; for(auto& i : resolutions) - { aspects.Add(GetAspectRatioFromResolution(i)); - UE_LOG(LogTemp, Log, TEXT("%dx%d = %dx%d"), i.X, i.Y, GetAspectRatioFromResolution(i).X, GetAspectRatioFromResolution(i).Y); - } aspects.Add(GetAspectRatioFromResolution(GetResolution(nullptr))); TArray result = aspects.Array(); diff --git a/UnrealProject/Lost_Edge/Source/Lost_Edge/Private/Interactable/Activators/InteractableScreenCapturer.cpp b/UnrealProject/Lost_Edge/Source/Lost_Edge/Private/Interactable/Activators/InteractableScreenCapturer.cpp index 51c2ca9..7cbd06a 100644 --- a/UnrealProject/Lost_Edge/Source/Lost_Edge/Private/Interactable/Activators/InteractableScreenCapturer.cpp +++ b/UnrealProject/Lost_Edge/Source/Lost_Edge/Private/Interactable/Activators/InteractableScreenCapturer.cpp @@ -105,10 +105,10 @@ void UInteractableScreenCapturer::Process() ENQUEUE_RENDER_COMMAND(GetInteractablesFromScreen)( [ capture = TextureTarget->GetResource()->TextureRHI, - world = GetWorld(), - view = view, - //output = _output->GetResource()->TextureRHI, - this + world = GetWorld(), + view = view, + //output = _output->GetResource()->TextureRHI, + this ] (FRHICommandListImmediate& RHICmdList) { @@ -238,7 +238,7 @@ void UInteractableScreenCapturer::Process() (FTranslationMatrix(-(view.Location)) * (FInverseRotationMatrix(view.Rotation) * FMatrix(FPlane(0, 0, 1, 0), FPlane(1, 0, 0, 0), FPlane(0, 1, 0, 0), FPlane(0, 0, 0, 1))) * view.CalculateProjectionMatrix()) - .InverseFast(); + .InverseFast(); // fast inverse errors about NIL matrix, aren't from here... FVector worldLoc, worldDir; for(int i = 1; i < components; ++i) { 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 13d924f..748d9b2 100644 --- a/UnrealProject/Lost_Edge/Source/Lost_Edge/Private/Interactable/Interactable.cpp +++ b/UnrealProject/Lost_Edge/Source/Lost_Edge/Private/Interactable/Interactable.cpp @@ -107,9 +107,21 @@ void AInteractable::BeginPlay() } } - GetComponents(collisions, true); - for(auto collision : collisions) + GetComponents(collisions); + for(int32 i = 0; i < collisions.Num(); ++i) { + auto collision = collisions[i]; + switch(collision->GetCollisionResponseToChannel(GetCollisionChannel())) + { + case ECollisionResponse::ECR_Ignore: + case ECollisionResponse::ECR_Overlap: + collisions.RemoveAt(i, EAllowShrinking::No); + --i; + continue; + default: + break; + } + if(activatorTypes) { collision->SetCollisionProfileName(collisionProfile); @@ -128,9 +140,13 @@ void AInteractable::BeginPlay() collision->SetRenderCustomDepth(true); } } + collisions.Shrink(); if(auto PC = UGameplayStatics::GetPlayerController(GetWorld(), 0)) player = Cast(PC->GetPawn()); + + if(lockOnBeginPlay) + Lock(); } void AInteractable::EndPlay(const EEndPlayReason::Type EndPlayReason) @@ -220,9 +236,13 @@ void AInteractable::Lock() for(int32 i = 1; i < 255; i <<= 1) Deactivate(static_cast(i)); activationLockers.Add(nullptr); + for(auto collision : collisions) + collision->SetCollisionProfileName(TEXT("BlockAll")); } void AInteractable::Unlock() { activationLockers.Empty(); + for(auto collision : collisions) + collision->SetCollisionProfileName(collisionProfile); } 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 cea2af8..868cc8d 100644 --- a/UnrealProject/Lost_Edge/Source/Lost_Edge/Private/Interactable/Interactable.h +++ b/UnrealProject/Lost_Edge/Source/Lost_Edge/Private/Interactable/Interactable.h @@ -87,6 +87,9 @@ protected: /** Mask of active activator types */ UPROPERTY(EditAnywhere, BlueprintReadWrite, meta = (Bitmask, BitmaskEnum = "EActivatorType")) int32 activated = 0; + UPROPERTY(EditAnywhere) + bool lockOnBeginPlay = false; + TArray collisions; /** TArray cannot be a value of a TMap */ struct FModificatorsArray @@ -96,8 +99,6 @@ protected: /** Map of modificators to activator types initialized on BeginPlay */ TMap modificators; - - TArray collisions; class APlayerBase* player = nullptr; }; diff --git a/UnrealProject/Lost_Edge/Source/Lost_Edge/Private/Interactable/Modificators/InteractableModificator.cpp b/UnrealProject/Lost_Edge/Source/Lost_Edge/Private/Interactable/Modificators/InteractableModificator.cpp index d2f061a..39369da 100644 --- a/UnrealProject/Lost_Edge/Source/Lost_Edge/Private/Interactable/Modificators/InteractableModificator.cpp +++ b/UnrealProject/Lost_Edge/Source/Lost_Edge/Private/Interactable/Modificators/InteractableModificator.cpp @@ -2,6 +2,7 @@ #include "InteractableModificator.h" +#include "CustomPlayerController.h" #include "Interactable/Interactable.h" #include "Widgets/InteractableHintWidget.h" @@ -12,12 +13,24 @@ void UInteractableModificator::OnRegister() AInteractable::AppendModificatorClass(GetClass()); } -const TSoftObjectPtr UInteractableModificator::GetMappingContext() const +const TSoftObjectPtr& UInteractableModificator::GetMappingContext() const { return inputMapping; } +const TArray& UInteractableModificator::GetMappingDescription() const +{ + return inputDescription; +} + EActivatorType UInteractableModificator::GetActivatorTypes() const { return static_cast(activatorTypes); } + +void UInteractableModificator::BeginPlay() +{ + Super::BeginPlay(); + + ACustomPlayerController::AppendInputContext(inputMapping); +} diff --git a/UnrealProject/Lost_Edge/Source/Lost_Edge/Private/Interactable/Modificators/InteractableModificator.h b/UnrealProject/Lost_Edge/Source/Lost_Edge/Private/Interactable/Modificators/InteractableModificator.h index a765b4c..3a48246 100644 --- a/UnrealProject/Lost_Edge/Source/Lost_Edge/Private/Interactable/Modificators/InteractableModificator.h +++ b/UnrealProject/Lost_Edge/Source/Lost_Edge/Private/Interactable/Modificators/InteractableModificator.h @@ -22,7 +22,11 @@ public: /** Returns input mappings assigned in constructor */ UFUNCTION(BlueprintCallable) - const TSoftObjectPtr GetMappingContext() const; + const TSoftObjectPtr& GetMappingContext() const; + + /** Returns input mappings custom descriptions */ + UFUNCTION(BlueprintCallable) + const TArray& GetMappingDescription() const; /** Filters activation type in interractable */ UFUNCTION(BlueprintCallable) @@ -39,9 +43,14 @@ public: virtual void Unbind_Implementation() {} protected: + virtual void BeginPlay() override; + UPROPERTY(EditDefaultsOnly, NoClear) TSoftObjectPtr inputMapping; + UPROPERTY(EditDefaultsOnly) + TArray inputDescription; + UPROPERTY(EditDefaultsOnly, NoClear, meta = (Bitmask, BitmaskEnum = "EActivatorType")) int32 activatorTypes = 0; diff --git a/UnrealProject/Lost_Edge/Source/Lost_Edge/Private/Levels/LevelBase.cpp b/UnrealProject/Lost_Edge/Source/Lost_Edge/Private/Levels/LevelBase.cpp index 9780d95..1658907 100644 --- a/UnrealProject/Lost_Edge/Source/Lost_Edge/Private/Levels/LevelBase.cpp +++ b/UnrealProject/Lost_Edge/Source/Lost_Edge/Private/Levels/LevelBase.cpp @@ -22,13 +22,13 @@ ALevelBase* ALevelBase::Get() { if(auto GM = AMainGameModeBase::Get()) - return GM->leadLevel.Get(); + return GM->leadLevel; return nullptr; } void ALevelBase::BeginPlay() { - AMainGameModeBase::leadLevel = TStrongObjectPtr{ this }; + AMainGameModeBase::leadLevel = this; ALevelScriptActor::BeginPlay(); diff --git a/UnrealProject/Lost_Edge/Source/Lost_Edge/Private/MainGameModeBase.cpp b/UnrealProject/Lost_Edge/Source/Lost_Edge/Private/MainGameModeBase.cpp index e736024..891271f 100644 --- a/UnrealProject/Lost_Edge/Source/Lost_Edge/Private/MainGameModeBase.cpp +++ b/UnrealProject/Lost_Edge/Source/Lost_Edge/Private/MainGameModeBase.cpp @@ -19,7 +19,7 @@ TStrongObjectPtr AMainGameModeBase::widgetsManager = nullptr; TStrongObjectPtr AMainGameModeBase::cutsceneManager = nullptr; TStrongObjectPtr AMainGameModeBase::quickTimeEventManager = nullptr; TStrongObjectPtr AMainGameModeBase::dialogueManager = nullptr; -TStrongObjectPtr AMainGameModeBase::leadLevel = nullptr; +ALevelBase* AMainGameModeBase::leadLevel = nullptr; void AMainGameModeBase::StartPlay() { @@ -37,12 +37,12 @@ void AMainGameModeBase::StartPlay() void AMainGameModeBase::EndPlay(const EEndPlayReason::Type EndPlayReason) { cutsceneManager->LockCallback(true); - //cutsceneManager->ClearQueue(); // condition race segfault? - leadLevel.Reset(); + cutsceneManager->Clear(); widgetsManager.Reset(); cutsceneManager.Reset(); quickTimeEventManager.Reset(); dialogueManager.Reset(); + leadLevel = nullptr; Super::EndPlay(EndPlayReason); } diff --git a/UnrealProject/Lost_Edge/Source/Lost_Edge/Private/MainGameModeBase.h b/UnrealProject/Lost_Edge/Source/Lost_Edge/Private/MainGameModeBase.h index a630654..2693913 100644 --- a/UnrealProject/Lost_Edge/Source/Lost_Edge/Private/MainGameModeBase.h +++ b/UnrealProject/Lost_Edge/Source/Lost_Edge/Private/MainGameModeBase.h @@ -44,7 +44,7 @@ public: void SwitchCameraMode(); - static TStrongObjectPtr leadLevel; + static class ALevelBase* leadLevel; FQuestsUpdateDelegate questsUpdateDelegate; diff --git a/UnrealProject/Lost_Edge/Source/Lost_Edge/Private/Minigame/AgeOfWar/AgeOfWarUnit.cpp b/UnrealProject/Lost_Edge/Source/Lost_Edge/Private/Minigame/AgeOfWar/AgeOfWarUnit.cpp index d09c3bb..441d981 100644 --- a/UnrealProject/Lost_Edge/Source/Lost_Edge/Private/Minigame/AgeOfWar/AgeOfWarUnit.cpp +++ b/UnrealProject/Lost_Edge/Source/Lost_Edge/Private/Minigame/AgeOfWar/AgeOfWarUnit.cpp @@ -66,6 +66,7 @@ void AAgeOfWarUnit::EndPlay(const EEndPlayReason::Type EndPlayReason) AAgeOfWarUnit::AAgeOfWarUnit() { root = CreateDefaultSubobject(TEXT("Collision")); + SetRootComponent(root); allyblocker = CreateDefaultSubobject(TEXT("AllyBlocker")); allyblocker->SetupAttachment(root); traceStart = CreateDefaultSubobject(TEXT("TraceStart")); @@ -85,7 +86,7 @@ void AAgeOfWarUnit::Tick(float deltaTime) // try move FHitResult moveHit; - auto moveStep = GetActorForwardVector() * GetStats().moveSpeed; + auto moveStep = GetActorForwardVector() * GetStats().moveSpeed * GetActorScale3D().X; this->AddActorWorldOffset(moveStep, true, &moveHit, ETeleportType::None); if(moveHit.bBlockingHit) allyblocker->SetCollisionEnabled(ECollisionEnabled::QueryOnly); @@ -95,7 +96,7 @@ void AAgeOfWarUnit::Tick(float deltaTime) // look for units forward FHitResult hit; auto startLocation = traceStart->GetComponentLocation(); - auto endLocation = startLocation + (GetActorRotation().Vector() * attackStartRange * (moveHit.bBlockingHit ? 5 : 1)); + auto endLocation = startLocation + (GetActorRotation().Vector() * attackStartRange * GetActorScale3D().X * (moveHit.bBlockingHit ? 5 : 1)); world->LineTraceSingleByChannel( hit, startLocation, diff --git a/UnrealProject/Lost_Edge/Source/Lost_Edge/Private/Minigame/CrossyRoad/CrossyRoadManager.cpp b/UnrealProject/Lost_Edge/Source/Lost_Edge/Private/Minigame/CrossyRoad/CrossyRoadManager.cpp index 31ab03a..f24b032 100644 --- a/UnrealProject/Lost_Edge/Source/Lost_Edge/Private/Minigame/CrossyRoad/CrossyRoadManager.cpp +++ b/UnrealProject/Lost_Edge/Source/Lost_Edge/Private/Minigame/CrossyRoad/CrossyRoadManager.cpp @@ -159,6 +159,7 @@ void ACrossyRoadManager::CreateObstacle(int32 index) FActorSpawnParameters spawnParams{}; spawnParams.Owner = this; auto obstacle = GetWorld()->SpawnActor(*obstacleClass, spline->GetComponentLocation(), GetActorRotation(), spawnParams); + obstacle->AttachToActor(this, FAttachmentTransformRules{ EAttachmentRule::KeepWorld, false }); obstacle->manager = this; if(index < 0) @@ -197,7 +198,7 @@ void ACrossyRoadManager::RotateLine(USplineComponent* line) void ACrossyRoadManager::Up() { auto line = lines[0]; - auto diffY = lines[0]->GetComponentLocation().Y - lines[1]->GetComponentLocation().Y; + auto diffY = lines[0]->GetRelativeLocation().Y - lines[1]->GetRelativeLocation().Y; for(int32 i = 1; i < lines.Num(); ++i) { lines[i]->AddRelativeLocation(FVector{ 0, diffY, 0 }); diff --git a/UnrealProject/Lost_Edge/Source/Lost_Edge/Private/Minigame/SubwaySurf/SubwaySurfManager.cpp b/UnrealProject/Lost_Edge/Source/Lost_Edge/Private/Minigame/SubwaySurf/SubwaySurfManager.cpp index 35bde19..3cf92af 100644 --- a/UnrealProject/Lost_Edge/Source/Lost_Edge/Private/Minigame/SubwaySurf/SubwaySurfManager.cpp +++ b/UnrealProject/Lost_Edge/Source/Lost_Edge/Private/Minigame/SubwaySurf/SubwaySurfManager.cpp @@ -157,11 +157,9 @@ void ASubwaySurfManager::CreateObstacle(int32 index) for(int32 i = 0; i < FMath::RandRange(0, obstacleClasses.Num() - 1); ++i) // std::advance not works :( ++obstacleClass; - int32 lineId; - do - { - lineId = FMath::RandRange(0, lines.Num() - 1); - } while(lineId == lastSpawnedLine); + int32 lineId = FMath::RandRange(0, lines.Num() - 1); + if(lineId == lastSpawnedLine) + lineId = (lineId + 1) % (lines.Num() - 1); auto spline = lines[lineId]; FActorSpawnParameters spawnParams{}; @@ -169,6 +167,8 @@ void ASubwaySurfManager::CreateObstacle(int32 index) lastSpawnedLine = lineId; auto obstacle = GetWorld()->SpawnActor(*obstacleClass, spline->GetComponentLocation(), GetActorRotation(), spawnParams); + obstacle->AttachToActor(this, FAttachmentTransformRules{ EAttachmentRule::KeepWorld, false }); + obstacle->subwaySurf = this; if(index < 0) diff --git a/UnrealProject/Lost_Edge/Source/Lost_Edge/Private/PlayerBase.cpp b/UnrealProject/Lost_Edge/Source/Lost_Edge/Private/PlayerBase.cpp index 7acdb60..9be035c 100644 --- a/UnrealProject/Lost_Edge/Source/Lost_Edge/Private/PlayerBase.cpp +++ b/UnrealProject/Lost_Edge/Source/Lost_Edge/Private/PlayerBase.cpp @@ -116,13 +116,19 @@ void APlayerBase::ResetInteractions() activator->Rescan(); } +FVector APlayerBase::GetCameraLocation() +{ + return camera->GetComponentLocation(); +} FVector APlayerBase::GetCameraDirection() { return camera->GetForwardVector(); } -FVector APlayerBase::GetCameraLocation() + +void APlayerBase::SetTransform(const FTransform transform) { - return camera->GetComponentLocation(); + SetActorLocation(transform.GetLocation(), false, nullptr, ETeleportType::ResetPhysics); + Controller->SetControlRotation(transform.GetRotation().Rotator()); } void APlayerBase::SwitchToCameraPawn() diff --git a/UnrealProject/Lost_Edge/Source/Lost_Edge/Private/PlayerBase.h b/UnrealProject/Lost_Edge/Source/Lost_Edge/Private/PlayerBase.h index 4d2d069..a2e44b9 100644 --- a/UnrealProject/Lost_Edge/Source/Lost_Edge/Private/PlayerBase.h +++ b/UnrealProject/Lost_Edge/Source/Lost_Edge/Private/PlayerBase.h @@ -16,11 +16,17 @@ struct FPlayerLock { GENERATED_BODY() + UPROPERTY(BlueprintReadWrite) uint8 walk : 1; + UPROPERTY(BlueprintReadWrite) uint8 jump : 1; + UPROPERTY(BlueprintReadWrite) uint8 run : 1; + UPROPERTY(BlueprintReadWrite) uint8 interaction : 1; + UPROPERTY(BlueprintReadWrite) uint8 camera : 1; + UPROPERTY(BlueprintReadWrite) uint8 inventory : 1; static FPlayerLock All(); @@ -51,7 +57,12 @@ public: UFUNCTION(BlueprintPure) FVector GetCameraDirection(); + UFUNCTION(BlueprintCallable, meta = (DisplayName = "Set Player Transform")) + void SetTransform(const FTransform transform); + + UFUNCTION(BlueprintCallable) void LockPlayer(const FPlayerLock lock); + UFUNCTION(BlueprintCallable) void UnlockPlayer(const FPlayerLock lock); /** Force interactable activators reset */ diff --git a/UnrealProject/Lost_Edge/Source/Lost_Edge/Private/QuickTimeEvent.cpp b/UnrealProject/Lost_Edge/Source/Lost_Edge/Private/QuickTimeEvent.cpp index 60f8976..b4fb9ac 100644 --- a/UnrealProject/Lost_Edge/Source/Lost_Edge/Private/QuickTimeEvent.cpp +++ b/UnrealProject/Lost_Edge/Source/Lost_Edge/Private/QuickTimeEvent.cpp @@ -10,6 +10,11 @@ #include "PlayerBase.h" #include "Widgets/WidgetsManager.h" +namespace +{ + constexpr float failBlockAfterBegin = 0.2f; +} + int32 Event::counter = 0; Event::Event() @@ -33,38 +38,31 @@ inline int32 Event::GetId() void UQuickTimeEventManager::ShowQuickTimeEvent(FQuickTimeEventEnqueProperties properties) { - UE_LOG(LogTemp, Log, TEXT("ShowQuickTimeEvent Start")); OnFirstEventInit(); FScopeLock lock1(&lock); CreateEvent(properties, false); - UE_LOG(LogTemp, Log, TEXT("ShowQuickTimeEvent End")); } void UQuickTimeEventManager::EnqueQuickTimeEvent(FQuickTimeEventEnqueProperties properties) { - UE_LOG(LogTemp, Log, TEXT("EnqueQuickTimeEvent Start")); OnFirstEventInit(); { FScopeLock lock1(&lock); nextEvents.Enqueue(properties); } ShowNextEvent(); - UE_LOG(LogTemp, Log, TEXT("EnqueQuickTimeEvent End")); } void UQuickTimeEventManager::ShowNextEvent() { - UE_LOG(LogTemp, Log, TEXT("ShowNextEvent Start")); FScopeLock lock1(&lock); FQuickTimeEventEnqueProperties properties; nextEvents.Dequeue(properties); CreateEvent(properties, true); - UE_LOG(LogTemp, Log, TEXT("ShowNextEvent End")); } void UQuickTimeEventManager::OnEventEnd(int32 id, EQuickTimeEventResult result) { - UE_LOG(LogTemp, Log, TEXT("OnEventEnd Start")); FScopeLock lock1(&lock); Event event; if(!events.RemoveAndCopyValue(id, event)) @@ -78,7 +76,6 @@ void UQuickTimeEventManager::OnEventEnd(int32 id, EQuickTimeEventResult result) if(event.sequence && !nextEvents.IsEmpty()) { ShowNextEvent(); - UE_LOG(LogTemp, Log, TEXT("OnEventEnd End")); return; } @@ -90,8 +87,8 @@ void UQuickTimeEventManager::OnEventEnd(int32 id, EQuickTimeEventResult result) PC->onAnyKeyReleased.RemoveDynamic(this, &UQuickTimeEventManager::OnInputReleased); } UCommonFunctions::ExitSlowMotion(); + inputBinded = false; } - UE_LOG(LogTemp, Log, TEXT("OnEventEnd End")); } void UQuickTimeEventManager::OnInput(const FKey& key, bool released) @@ -124,6 +121,10 @@ void UQuickTimeEventManager::OnInput(const FKey& key, bool released) if(released) return; + // events failed + if(sequenceBeginTimeStamp + failBlockAfterBegin > GetWorld()->GetTimeSeconds()) + return; + if(auto WM = AMainGameModeBase::GetWidgetsManager()) { while(events.Num() > 0) @@ -141,24 +142,25 @@ void UQuickTimeEventManager::OnInput(const FKey& key, bool released) void UQuickTimeEventManager::OnInputPressed(FKey key) { - if(key == EKeys::W || key == EKeys::A || key == EKeys::S || key == EKeys::D) - return; + //if(key == EKeys::W || key == EKeys::A || key == EKeys::S || key == EKeys::D) + // return; OnInput(key, false); } void UQuickTimeEventManager::OnInputReleased(FKey key) { - if(key == EKeys::W || key == EKeys::A || key == EKeys::S || key == EKeys::D) - return; + //if(key == EKeys::W || key == EKeys::A || key == EKeys::S || key == EKeys::D) + // return; OnInput(key, true); } void UQuickTimeEventManager::OnFirstEventInit() { - if(!events.IsEmpty()) + if(!events.IsEmpty() || inputBinded) return; + inputBinded = true; if(auto PC = ACustomPlayerController::Get()) { @@ -168,6 +170,7 @@ void UQuickTimeEventManager::OnFirstEventInit() PC->onAnyKeyReleased.AddDynamic(this, &UQuickTimeEventManager::OnInputReleased); }); } + sequenceBeginTimeStamp = GetWorld()->GetTimeSeconds(); UCommonFunctions::EnterSlowMotion(); } diff --git a/UnrealProject/Lost_Edge/Source/Lost_Edge/Private/QuickTimeEvent.h b/UnrealProject/Lost_Edge/Source/Lost_Edge/Private/QuickTimeEvent.h index 09f828c..a7373b6 100644 --- a/UnrealProject/Lost_Edge/Source/Lost_Edge/Private/QuickTimeEvent.h +++ b/UnrealProject/Lost_Edge/Source/Lost_Edge/Private/QuickTimeEvent.h @@ -92,4 +92,6 @@ protected: TQueue nextEvents; TMap events; FCriticalSection lock; + float sequenceBeginTimeStamp = 0; // used to block player fails right at begin + bool inputBinded = false; }; diff --git a/UnrealProject/Lost_Edge/Source/Lost_Edge/Private/Widgets/CutsceneSkipWidget.cpp b/UnrealProject/Lost_Edge/Source/Lost_Edge/Private/Widgets/CutsceneSkipWidget.cpp new file mode 100644 index 0000000..5e36fbb --- /dev/null +++ b/UnrealProject/Lost_Edge/Source/Lost_Edge/Private/Widgets/CutsceneSkipWidget.cpp @@ -0,0 +1,8 @@ +#include "CutsceneSkipWidget.h" + +void UCutsceneSkipWidget::SetVisibility(ESlateVisibility InVisibility) +{ + if(InVisibility == ESlateVisibility::Hidden) + RunAnimation(EInputAnimatedWidgetAnimation::Reset); + Super::SetVisibility(InVisibility); +} diff --git a/UnrealProject/Lost_Edge/Source/Lost_Edge/Private/Widgets/CutsceneSkipWidget.h b/UnrealProject/Lost_Edge/Source/Lost_Edge/Private/Widgets/CutsceneSkipWidget.h index 5fe62cc..57725b5 100644 --- a/UnrealProject/Lost_Edge/Source/Lost_Edge/Private/Widgets/CutsceneSkipWidget.h +++ b/UnrealProject/Lost_Edge/Source/Lost_Edge/Private/Widgets/CutsceneSkipWidget.h @@ -15,6 +15,8 @@ class UCutsceneSkipWidget : public UResolutionResponsiveWidget, public IInputAni GENERATED_BODY() public: + virtual void SetVisibility(ESlateVisibility InVisibility) override; + FSkipCutsceneDelegate skipCutsceneDelegate; UPROPERTY(meta = (BindWidget)) diff --git a/UnrealProject/Lost_Edge/Source/Lost_Edge/Private/Widgets/InputAnimatedWidgetInterface.h b/UnrealProject/Lost_Edge/Source/Lost_Edge/Private/Widgets/InputAnimatedWidgetInterface.h index f886a64..aace34d 100644 --- a/UnrealProject/Lost_Edge/Source/Lost_Edge/Private/Widgets/InputAnimatedWidgetInterface.h +++ b/UnrealProject/Lost_Edge/Source/Lost_Edge/Private/Widgets/InputAnimatedWidgetInterface.h @@ -9,6 +9,7 @@ UENUM(BlueprintType) enum class EInputAnimatedWidgetAnimation : uint8 { + Reset, Click, Hold, Unhold, @@ -27,6 +28,8 @@ class IInputAnimatedWidgetInterface GENERATED_BODY() public: + UFUNCTION(BlueprintImplementableEvent, BlueprintCallable, Category = "InputAnimatedWidget") + void OnReset(); UFUNCTION(BlueprintImplementableEvent, BlueprintCallable, Category = "InputAnimatedWidget") void OnClick(); UFUNCTION(BlueprintImplementableEvent, BlueprintCallable, Category = "InputAnimatedWidget") @@ -43,6 +46,9 @@ public: { switch(animation) { + case EInputAnimatedWidgetAnimation::Reset: + Execute_OnReset(this->_getUObject()); + break; case EInputAnimatedWidgetAnimation::Click: Execute_OnClick(this->_getUObject()); break; diff --git a/UnrealProject/Lost_Edge/Source/Lost_Edge/Private/Widgets/InteractableHintWidget.h b/UnrealProject/Lost_Edge/Source/Lost_Edge/Private/Widgets/InteractableHintWidget.h index 7d9bbdf..da9af77 100644 --- a/UnrealProject/Lost_Edge/Source/Lost_Edge/Private/Widgets/InteractableHintWidget.h +++ b/UnrealProject/Lost_Edge/Source/Lost_Edge/Private/Widgets/InteractableHintWidget.h @@ -13,8 +13,8 @@ class UInteractableHintWidget : public UResolutionResponsiveWidget, public IInpu GENERATED_BODY() public: - UPROPERTY(meta = (BindWidget)) + UPROPERTY(BlueprintReadOnly, meta = (BindWidget)) class UTextBlock* keyText; - UPROPERTY(meta = (BindWidget)) + UPROPERTY(BlueprintReadOnly, meta = (BindWidget)) class UTextBlock* descriptionText; }; diff --git a/UnrealProject/Lost_Edge/Source/Lost_Edge/Private/Widgets/InteractableHintWidgetManager.cpp b/UnrealProject/Lost_Edge/Source/Lost_Edge/Private/Widgets/InteractableHintWidgetManager.cpp index da185b9..e807a83 100644 --- a/UnrealProject/Lost_Edge/Source/Lost_Edge/Private/Widgets/InteractableHintWidgetManager.cpp +++ b/UnrealProject/Lost_Edge/Source/Lost_Edge/Private/Widgets/InteractableHintWidgetManager.cpp @@ -22,7 +22,7 @@ void UInteractableHintWidgetManager::Append(const UInteractableModificator* modi return; } - if(hintsMap.Contains(modificator) || !modificator->GetMappingContext().IsValid()) + if(hintsMap.Contains(modificator) || modificator->GetMappingContext().IsNull()) return; const auto& mappings = modificator->GetMappingContext().LoadSynchronous()->GetMappings(); @@ -34,6 +34,7 @@ void UInteractableHintWidgetManager::Append(const UInteractableModificator* modi hints->AddChild(hint); } + const auto& descriptions = modificator->GetMappingDescription(); int32 skipped = 0; for(int32 i = 0; i < mappings.Num(); ++i) { @@ -45,7 +46,10 @@ void UInteractableHintWidgetManager::Append(const UInteractableModificator* modi auto hint = Cast(hints->GetChildAt(count++)); hint->keyText->SetText(UCommonFunctions::GetKeyDisplayName(mappings[i].Key)); - hint->descriptionText->SetText(mappings[i].Action->ActionDescription); + if(i < descriptions.Num() && !descriptions[i].IsEmpty()) + hint->descriptionText->SetText(descriptions[i]); + else + hint->descriptionText->SetText(mappings[i].Action->ActionDescription); hint->SetVisibility(ESlateVisibility::Visible); } diff --git a/UnrealProject/Lost_Edge/Source/Lost_EdgeShaders/Lost_EdgeShaders.Build.cs b/UnrealProject/Lost_Edge/Source/Lost_EdgeShaders/Lost_EdgeShaders.Build.cs index 660a4d6..dfe2864 100644 --- a/UnrealProject/Lost_Edge/Source/Lost_EdgeShaders/Lost_EdgeShaders.Build.cs +++ b/UnrealProject/Lost_Edge/Source/Lost_EdgeShaders/Lost_EdgeShaders.Build.cs @@ -2,8 +2,12 @@ using UnrealBuildTool; -public class Lost_EdgeShaders : ModuleRules { - public Lost_EdgeShaders(ReadOnlyTargetRules Target) : base(Target) { +public class Lost_EdgeShaders : ModuleRules +{ + public Lost_EdgeShaders(ReadOnlyTargetRules Target) : base(Target) + { + //bPrecompile = true; + //bUsePrecompiled = true; PCHUsage = PCHUsageMode.UseExplicitOrSharedPCHs; PublicDependencyModuleNames.AddRange(new string[] { }); PrivateDependencyModuleNames.AddRange(new string[] { "Core",