Compare commits

..

No commits in common. "e2bc06dc52278c3ff1c1a21d418b5846b6678f05" and "f520f825e0554f9c213f89983fbe8d3db7165ffd" have entirely different histories.

41 changed files with 39 additions and 109 deletions

View File

@ -2,11 +2,9 @@
"version": "1.0", "version": "1.0",
"components": [ "components": [
"Microsoft.Net.Component.4.6.2.TargetingPack", "Microsoft.Net.Component.4.6.2.TargetingPack",
"Microsoft.VisualStudio.Component.Unreal.Workspace",
"Microsoft.VisualStudio.Component.VC.14.38.17.8.ATL",
"Microsoft.VisualStudio.Component.VC.14.38.17.8.x86.x64", "Microsoft.VisualStudio.Component.VC.14.38.17.8.x86.x64",
"Microsoft.VisualStudio.Component.VC.Tools.x86.x64", "Microsoft.VisualStudio.Component.VC.Tools.x86.x64",
"Microsoft.VisualStudio.Component.Windows11SDK.22621", "Microsoft.VisualStudio.Component.Windows10SDK.22621",
"Microsoft.VisualStudio.Workload.CoreEditor", "Microsoft.VisualStudio.Workload.CoreEditor",
"Microsoft.VisualStudio.Workload.ManagedDesktop", "Microsoft.VisualStudio.Workload.ManagedDesktop",
"Microsoft.VisualStudio.Workload.NativeDesktop", "Microsoft.VisualStudio.Workload.NativeDesktop",

View File

@ -1,6 +1,6 @@
{ {
"FileVersion": 3, "FileVersion": 3,
"EngineAssociation": "5.5", "EngineAssociation": "5.4",
"Category": "", "Category": "",
"Description": "", "Description": "",
"Modules": [ "Modules": [
@ -351,11 +351,29 @@
"Name": "OpenCV", "Name": "OpenCV",
"Enabled": true "Enabled": true
}, },
{
"Name": "AutoSizeComments",
"Enabled": false,
"MarketplaceURL": "com.epicgames.launcher://ue/marketplace/content/ae89a2c4ab384de0a3f213b23de324f3"
},
{
"Name": "RenameTool",
"Enabled": true,
"MarketplaceURL": "com.epicgames.launcher://ue/marketplace/product/c6e227383f754209ab1eeb294aa0f6d6"
},
{ {
"Name": "FlatNodes", "Name": "FlatNodes",
"Enabled": true, "Enabled": true,
"MarketplaceURL": "com.epicgames.launcher://ue/marketplace/content/b719437f3fb54c259b34227363df8cab" "MarketplaceURL": "com.epicgames.launcher://ue/marketplace/content/b719437f3fb54c259b34227363df8cab"
}, },
{
"Name": "VisualStudioTools",
"Enabled": true,
"MarketplaceURL": "com.epicgames.launcher://ue/marketplace/product/362651520df94e4fa65492dbcba44ae2",
"SupportedTargetPlatforms": [
"Win64"
]
},
{ {
"Name": "FMODStudio", "Name": "FMODStudio",
"Enabled": true "Enabled": true

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

View File

@ -7,7 +7,6 @@
#include "EngineUtils.h" #include "EngineUtils.h"
#include "InputMappingContext.h" #include "InputMappingContext.h"
#include "Kismet/GameplayStatics.h" #include "Kismet/GameplayStatics.h"
#include "LevelSequenceActor.h"
#include "LevelSequencePlayer.h" #include "LevelSequencePlayer.h"
#include "CustomGameInstance.h" #include "CustomGameInstance.h"

View File

@ -38,13 +38,6 @@ void AMainGameModeBase::EndPlay(const EEndPlayReason::Type EndPlayReason)
{ {
cutsceneManager->LockCallback(true); cutsceneManager->LockCallback(true);
//cutsceneManager->ClearQueue(); // condition race segfault? //cutsceneManager->ClearQueue(); // condition race segfault?
leadLevel.Reset();
widgetsManager.Reset();
cutsceneManager.Reset();
quickTimeEventManager.Reset();
dialogueManager.Reset();
Super::EndPlay(EndPlayReason);
} }
bool AMainGameModeBase::SetPause(APlayerController* PC, FCanUnpause CanUnpauseDelegate) bool AMainGameModeBase::SetPause(APlayerController* PC, FCanUnpause CanUnpauseDelegate)