diff --git a/UnrealProject/Lost_Edge/Content/Blueprints/Decorations/BP_Door.uasset b/UnrealProject/Lost_Edge/Content/Blueprints/Decorations/BP_Door.uasset index 2d8fbd6..ad57b63 100644 --- a/UnrealProject/Lost_Edge/Content/Blueprints/Decorations/BP_Door.uasset +++ b/UnrealProject/Lost_Edge/Content/Blueprints/Decorations/BP_Door.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4bd1af3cac09a91245b2f532103df01b6ebbfb81b3868380fe1e559e97d73a43 -size 85765 +oid sha256:1e67b45f27b6865288a21f0880ed30a0aa814e85991206095be1b30f0cf35705 +size 86796 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..2ffe5c7 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:4389e973284a0b8e9a1971cb1d6115c2097ed0ae97e35fad7dd5b9c761ac6226 +size 523994 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 index f5f75c6..408ff18 100644 --- 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 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ccf2053a79ce97bda00ed3e03c415aefa87395b45ae8f3d42f42fd75eb26c937 -size 39457 +oid sha256:a18efd4b5c48d4387cd75001b1ab39875fe97c54ffec42da548d8d64b3958003 +size 54215 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..1e54374 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:cc3e13282498f04add636bd8ed12f1cce03fbb835165cd6bcc1d151c0e1c532b +size 54517 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..04ba6d5 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:9d491b07530a41c9613fb898580dc41b602e42222d69fdf31ab45aa8933c76e5 +size 33505 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..efd4a3c 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:bb6595d2f483510eadb98ee82635ea7c22e02646309b5c40b327f7eeb5bca9b3 +size 54029 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 d2b8270..bed5edb 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:fe830717d3a942ac732fc3ed87080d363ef5f23db15cc83c1fb51e9ebcc9fead -size 43695547 +oid sha256:01f4b4c10dc7d86c3a2baf8db940665f9467d6eb0b89c9c99ad66f80e58619c0 +size 43685628 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..28be197 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:c98ffaffad0717ae74df332a88c52f5771255d8c8b2a9f3619e9a13b440fcb7a +size 11617 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..f92c9e2 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:c1f8d61231174585571961f6da7c9f2679ea20647af055707bdd6c1f48f0375f +size 2043 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..f7bee29 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:c75d1bfa4e15eec5570bc2b646e59c8b7de397f271f33a1464a137c2fb9adfec +size 972 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..46615c8 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:71a3bdd993447680d0ae9346a564bbbf16aaed559231ebc0db6a9d1f36c118ab +size 1424 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 b76fbc3..f4054ca 100644 --- a/UnrealProject/Lost_Edge/Source/Lost_Edge/Private/Interactable/Interactable.cpp +++ b/UnrealProject/Lost_Edge/Source/Lost_Edge/Private/Interactable/Interactable.cpp @@ -221,7 +221,7 @@ void AInteractable::Lock() Deactivate(static_cast(i)); activationLockers.Add(nullptr); for(auto collision : collisions) - collision->SetCollisionProfileName(TEXT("NoCollision")); + collision->SetCollisionProfileName(TEXT("BlockAll")); } void AInteractable::Unlock() 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/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_EdgeShaders/Lost_EdgeShaders.Build.cs b/UnrealProject/Lost_Edge/Source/Lost_EdgeShaders/Lost_EdgeShaders.Build.cs index 660a4d6..116b1bc 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,11 @@ 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) + { + bUsePrecompiled = true; PCHUsage = PCHUsageMode.UseExplicitOrSharedPCHs; PublicDependencyModuleNames.AddRange(new string[] { }); PrivateDependencyModuleNames.AddRange(new string[] { "Core",