diff --git a/.gitignore b/.gitignore index 1a100f0..bee64fd 100644 --- a/.gitignore +++ b/.gitignore @@ -6,6 +6,7 @@ Platforms/HoloLens Saved .vscode .vs +.vsconfig *.VC.db *.opensdf *.opendb diff --git a/.vsconfig b/.vsconfig deleted file mode 100644 index 1a9d718..0000000 --- a/.vsconfig +++ /dev/null @@ -1,13 +0,0 @@ -{ - "version": "1.0", - "components": [ - "Microsoft.Net.Component.4.6.2.TargetingPack", - "Microsoft.VisualStudio.Component.VC.14.36.17.6.x86.x64", - "Microsoft.VisualStudio.Component.VC.Tools.x86.x64", - "Microsoft.VisualStudio.Component.Windows10SDK.22000", - "Microsoft.VisualStudio.Workload.CoreEditor", - "Microsoft.VisualStudio.Workload.ManagedDesktop", - "Microsoft.VisualStudio.Workload.NativeDesktop", - "Microsoft.VisualStudio.Workload.NativeGame" - ] -} diff --git a/Nakatomi.uproject b/Nakatomi.uproject index 5d65f7e..bd049a7 100644 --- a/Nakatomi.uproject +++ b/Nakatomi.uproject @@ -1,6 +1,6 @@ { "FileVersion": 3, - "EngineAssociation": "5.3", + "EngineAssociation": "5.4", "Category": "", "Description": "", "Modules": [ diff --git a/Source/Nakatomi.Target.cs b/Source/Nakatomi.Target.cs index c6e7b26..69b292e 100644 --- a/Source/Nakatomi.Target.cs +++ b/Source/Nakatomi.Target.cs @@ -8,7 +8,7 @@ public class NakatomiTarget : TargetRules { Type = TargetType.Game; DefaultBuildSettings = BuildSettingsVersion.V2; - IncludeOrderVersion = EngineIncludeOrderVersion.Unreal5_3; + IncludeOrderVersion = EngineIncludeOrderVersion.Latest; ExtraModuleNames.Add("Nakatomi"); } } \ No newline at end of file diff --git a/Source/Nakatomi/DemolitionCharacter.cpp b/Source/Nakatomi/DemolitionCharacter.cpp index 41a6f9c..fe30285 100644 --- a/Source/Nakatomi/DemolitionCharacter.cpp +++ b/Source/Nakatomi/DemolitionCharacter.cpp @@ -5,6 +5,7 @@ #include #include "EnemyAIController.h" +#include "Engine/OverlapResult.h" ADemolitionCharacter::ADemolitionCharacter(const FObjectInitializer& ObjectInitializer) : AEnemyCharacter(ObjectInitializer) { diff --git a/Source/Nakatomi/ExplosiveActor.cpp b/Source/Nakatomi/ExplosiveActor.cpp index 0bc8f37..81fc8f8 100644 --- a/Source/Nakatomi/ExplosiveActor.cpp +++ b/Source/Nakatomi/ExplosiveActor.cpp @@ -4,6 +4,7 @@ #include "ExplosiveActor.h" #include #include "NakatomiCharacter.h" +#include "Engine/OverlapResult.h" // Sets default values AExplosiveActor::AExplosiveActor() diff --git a/Source/NakatomiEditor.Target.cs b/Source/NakatomiEditor.Target.cs index 08b5335..cd19f90 100644 --- a/Source/NakatomiEditor.Target.cs +++ b/Source/NakatomiEditor.Target.cs @@ -7,8 +7,8 @@ public class NakatomiEditorTarget : TargetRules public NakatomiEditorTarget(TargetInfo Target) : base(Target) { Type = TargetType.Editor; - DefaultBuildSettings = BuildSettingsVersion.V2; - IncludeOrderVersion = EngineIncludeOrderVersion.Unreal5_3; + DefaultBuildSettings = BuildSettingsVersion.V5; + IncludeOrderVersion = EngineIncludeOrderVersion.Latest; ExtraModuleNames.Add("Nakatomi"); } } \ No newline at end of file