From 67c6294ae35ca1036a8e4a45c736fb5959cdbfb1 Mon Sep 17 00:00:00 2001 From: amasson Date: Wed, 14 Aug 2024 15:11:46 +0200 Subject: [PATCH] Upgrade to 5.4 --- Config/DefaultEngine.ini | 8 ++++++-- Plugins/FactionSystem | 2 +- Plugins/GasRpg | 2 +- Source/Wailing.Target.cs | 6 +++--- Source/Wailing/Private/MyClass.cpp | 12 ------------ Source/Wailing/Public/MyClass.h | 15 --------------- Source/WailingEditor.Target.cs | 6 +++--- Wailing.uproject | 4 ++-- 8 files changed, 16 insertions(+), 39 deletions(-) delete mode 100644 Source/Wailing/Private/MyClass.cpp delete mode 100644 Source/Wailing/Public/MyClass.h diff --git a/Config/DefaultEngine.ini b/Config/DefaultEngine.ini index 006dac5..f97dfbe 100644 --- a/Config/DefaultEngine.ini +++ b/Config/DefaultEngine.ini @@ -33,6 +33,9 @@ CompressionQualityModifier=1.000000 AutoStreamingThreshold=0.000000 SoundCueCookQualityIndex=-1 +[/Script/LinuxTargetPlatform.LinuxTargetSettings] +-TargetedRHIs=SF_VULKAN_SM5 ++TargetedRHIs=SF_VULKAN_SM6 [/Script/HardwareTargeting.HardwareTargetingSettings] TargetedHardwareClass=Desktop @@ -41,6 +44,7 @@ DefaultGraphicsPerformance=Maximum AppliedDefaultGraphicsPerformance=Maximum [/Script/Engine.RendererSettings] +r.Mobile.EnableNoPrecomputedLightingCSMShader=True r.GenerateMeshDistanceFields=True r.DynamicGlobalIlluminationMethod=1 r.ReflectionMethod=1 @@ -58,8 +62,8 @@ FontDPIPreset=Standard FontDPI=72 [/Script/Engine.Engine] -+ActiveGameNameRedirects=(OldGameName="TP_BlankBP",NewGameName="/Script/Wailing") -+ActiveGameNameRedirects=(OldGameName="/Script/TP_BlankBP",NewGameName="/Script/Wailing") ++ActiveGameNameRedirects=(OldGameName="TP_Blank",NewGameName="/Script/Wailing") ++ActiveGameNameRedirects=(OldGameName="/Script/TP_Blank",NewGameName="/Script/Wailing") [/Script/AndroidFileServerEditor.AndroidFileServerRuntimeSettings] bEnablePlugin=True diff --git a/Plugins/FactionSystem b/Plugins/FactionSystem index 91c4cae..691169e 160000 --- a/Plugins/FactionSystem +++ b/Plugins/FactionSystem @@ -1 +1 @@ -Subproject commit 91c4cae73fc997e18eaef946cf2567690a7d5e37 +Subproject commit 691169eda5c8cb3abd3569d4e4d44e2c8dffaa30 diff --git a/Plugins/GasRpg b/Plugins/GasRpg index 97549c1..8347ac3 160000 --- a/Plugins/GasRpg +++ b/Plugins/GasRpg @@ -1 +1 @@ -Subproject commit 97549c14bf8c79e0487b2aaa364c607d729ed3d8 +Subproject commit 8347ac37b64727c79cf5cf742a1662d2a0d5ed5c diff --git a/Source/Wailing.Target.cs b/Source/Wailing.Target.cs index c22cd83..9cdd173 100644 --- a/Source/Wailing.Target.cs +++ b/Source/Wailing.Target.cs @@ -8,8 +8,8 @@ public class WailingTarget : TargetRules public WailingTarget(TargetInfo Target) : base(Target) { Type = TargetType.Game; - DefaultBuildSettings = BuildSettingsVersion.V4; - - ExtraModuleNames.AddRange( new string[] { "Wailing" } ); + DefaultBuildSettings = BuildSettingsVersion.V5; + IncludeOrderVersion = EngineIncludeOrderVersion.Unreal5_4; + ExtraModuleNames.Add("Wailing"); } } diff --git a/Source/Wailing/Private/MyClass.cpp b/Source/Wailing/Private/MyClass.cpp deleted file mode 100644 index 40012b2..0000000 --- a/Source/Wailing/Private/MyClass.cpp +++ /dev/null @@ -1,12 +0,0 @@ -// Fill out your copyright notice in the Description page of Project Settings. - - -#include "MyClass.h" - -MyClass::MyClass() -{ -} - -MyClass::~MyClass() -{ -} diff --git a/Source/Wailing/Public/MyClass.h b/Source/Wailing/Public/MyClass.h deleted file mode 100644 index 25ec6f3..0000000 --- a/Source/Wailing/Public/MyClass.h +++ /dev/null @@ -1,15 +0,0 @@ -// Fill out your copyright notice in the Description page of Project Settings. - -#pragma once - -#include "CoreMinimal.h" - -/** - * - */ -class WAILING_API MyClass -{ -public: - MyClass(); - ~MyClass(); -}; diff --git a/Source/WailingEditor.Target.cs b/Source/WailingEditor.Target.cs index 6949516..12acb51 100644 --- a/Source/WailingEditor.Target.cs +++ b/Source/WailingEditor.Target.cs @@ -8,8 +8,8 @@ public class WailingEditorTarget : TargetRules public WailingEditorTarget(TargetInfo Target) : base(Target) { Type = TargetType.Editor; - DefaultBuildSettings = BuildSettingsVersion.V4; - - ExtraModuleNames.AddRange( new string[] { "Wailing" } ); + DefaultBuildSettings = BuildSettingsVersion.V5; + IncludeOrderVersion = EngineIncludeOrderVersion.Unreal5_4; + ExtraModuleNames.Add("Wailing"); } } diff --git a/Wailing.uproject b/Wailing.uproject index a7deec5..20ba427 100644 --- a/Wailing.uproject +++ b/Wailing.uproject @@ -1,6 +1,6 @@ { "FileVersion": 3, - "EngineAssociation": "5.3", + "EngineAssociation": "5.4", "Category": "", "Description": "", "Modules": [ @@ -19,4 +19,4 @@ ] } ] -} \ No newline at end of file +}