diff --git a/.vsconfig b/.vsconfig index cf3175a..7f5f4b3 100644 --- a/.vsconfig +++ b/.vsconfig @@ -1,12 +1,13 @@ -{ +{ "version": "1.0", "components": [ - "Microsoft.VisualStudio.Component.VC.Tools.ARM64", + "Microsoft.Net.Component.4.6.2.TargetingPack", + "Microsoft.VisualStudio.Component.VC.14.38.17.8.x86.x64", "Microsoft.VisualStudio.Component.VC.Tools.x86.x64", - "Microsoft.VisualStudio.Component.Windows10SDK", + "Microsoft.VisualStudio.Component.Windows10SDK.22621", "Microsoft.VisualStudio.Workload.CoreEditor", + "Microsoft.VisualStudio.Workload.ManagedDesktop", "Microsoft.VisualStudio.Workload.NativeDesktop", - "Microsoft.VisualStudio.Workload.NativeGame", - "Microsoft.VisualStudio.Workload.Universal" + "Microsoft.VisualStudio.Workload.NativeGame" ] } diff --git a/Plugins/MaxQ/Source/SpiceUncooked/Private/K2Node_hat.cpp b/Plugins/MaxQ/Source/SpiceUncooked/Private/K2Node_hat.cpp index f935dab..1436889 100644 --- a/Plugins/MaxQ/Source/SpiceUncooked/Private/K2Node_hat.cpp +++ b/Plugins/MaxQ/Source/SpiceUncooked/Private/K2Node_hat.cpp @@ -281,18 +281,13 @@ void UK2Node_hat::GetMenuActions(FBlueprintActionDatabaseRegistrar& ActionRegist FText UK2Node_hat::GetNodeTitle(ENodeTitleType::Type TitleType) const { - constexpr bool bUseShortNameForTitle{ true }; + constexpr bool bUseShortNameForTitle{ false }; switch (TitleType) { case ENodeTitleType::FullTitle: /** The full title, may be multiple lines. */ return LOCTEXT("ListViewTitle", "vhat"); - if (!bUseShortNameForTitle && !OperandType.TypeName.IsNone()) - { - return FText::FromString(FString::Printf(TEXT("vhat %s"), *OperandType.TypeName.ToString())); - } - break; case ENodeTitleType::MenuTitle: /** Menu Title for context menus to be displayed in context menus referencing the node. */ return LOCTEXT("MenuTitle", "vhat - Unit vector"); diff --git a/Plugins/MaxQ/Source/SpiceUncooked/Private/K2Node_minus.cpp b/Plugins/MaxQ/Source/SpiceUncooked/Private/K2Node_minus.cpp index 722bdd3..f73c9b8 100644 --- a/Plugins/MaxQ/Source/SpiceUncooked/Private/K2Node_minus.cpp +++ b/Plugins/MaxQ/Source/SpiceUncooked/Private/K2Node_minus.cpp @@ -289,18 +289,13 @@ void UK2Node_minus::GetMenuActions(FBlueprintActionDatabaseRegistrar& ActionRegi FText UK2Node_minus::GetNodeTitle(ENodeTitleType::Type TitleType) const { - constexpr bool bUseShortNameForTitle{ true }; + constexpr bool bUseShortNameForTitle{ false }; switch (TitleType) { case ENodeTitleType::FullTitle: /** The full title, may be multiple lines. */ return LOCTEXT("ListViewTitle", "vminus"); - if (!bUseShortNameForTitle && !OperandType.TypeName.IsNone()) - { - return FText::FromString(FString::Printf(TEXT("vminus %s"), *OperandType.TypeName.ToString())); - } - break; case ENodeTitleType::MenuTitle: /** Menu Title for context menus to be displayed in context menus referencing the node. */ return LOCTEXT("MenuTitle", "vminus - Negate vector"); diff --git a/Plugins/MaxQ/Source/SpiceUncooked/Private/K2Node_pack.cpp b/Plugins/MaxQ/Source/SpiceUncooked/Private/K2Node_pack.cpp index f536522..27d5a9c 100644 --- a/Plugins/MaxQ/Source/SpiceUncooked/Private/K2Node_pack.cpp +++ b/Plugins/MaxQ/Source/SpiceUncooked/Private/K2Node_pack.cpp @@ -412,18 +412,13 @@ void UK2Node_pack::GetMenuActions(FBlueprintActionDatabaseRegistrar& ActionRegis FText UK2Node_pack::GetNodeTitle(ENodeTitleType::Type TitleType) const { - constexpr bool bUseShortNameForTitle{ true }; + constexpr bool bUseShortNameForTitle{ false }; switch (TitleType) { case ENodeTitleType::FullTitle: /** The full title, may be multiple lines. */ return LOCTEXT("ListViewTitle", "vpack"); - if (!bUseShortNameForTitle && !OperandType.TypeName.IsNone()) - { - return FText::FromString(FString::Printf(TEXT("vpack %s"), *OperandType.TypeName.ToString())); - } - break; case ENodeTitleType::MenuTitle: /** Menu Title for context menus to be displayed in context menus referencing the node. */ return LOCTEXT("MenuTitle", "vpack - Pack/Init MaxQ vector"); diff --git a/Plugins/MaxQ/Source/SpiceUncooked/Private/K2Node_upack.cpp b/Plugins/MaxQ/Source/SpiceUncooked/Private/K2Node_upack.cpp index 69e92c7..57e7819 100644 --- a/Plugins/MaxQ/Source/SpiceUncooked/Private/K2Node_upack.cpp +++ b/Plugins/MaxQ/Source/SpiceUncooked/Private/K2Node_upack.cpp @@ -402,11 +402,6 @@ FText UK2Node_upack::GetNodeTitle(ENodeTitleType::Type TitleType) const case ENodeTitleType::FullTitle: /** The full title, may be multiple lines. */ return LOCTEXT("ListViewTitle", "vupack"); - if (!bUseShortNameForTitle && !OperandType.TypeName.IsNone()) - { - return FText::FromString(FString::Printf(TEXT("vupack %s"), *OperandType.TypeName.ToString())); - } - break; case ENodeTitleType::MenuTitle: /** Menu Title for context menus to be displayed in context menus referencing the node. */ return LOCTEXT("MenuTitle", "vupack - Unpack MaxQ vector"); diff --git a/Plugins/MaxQ/Source/SpiceUncooked/Private/K2Node_vadd.cpp b/Plugins/MaxQ/Source/SpiceUncooked/Private/K2Node_vadd.cpp index 45ebe5c..20438bd 100644 --- a/Plugins/MaxQ/Source/SpiceUncooked/Private/K2Node_vadd.cpp +++ b/Plugins/MaxQ/Source/SpiceUncooked/Private/K2Node_vadd.cpp @@ -26,18 +26,13 @@ UK2Node_vadd::UK2Node_vadd() FText UK2Node_vadd::GetNodeTitle(ENodeTitleType::Type TitleType) const { - constexpr bool bUseShortNameForTitle{ true }; + constexpr bool bUseShortNameForTitle{ false }; switch (TitleType) { case ENodeTitleType::FullTitle: /** The full title, may be multiple lines. */ return LOCTEXT("ListViewTitle", "vadd"); - if (!bUseShortNameForTitle && !OperandType.TypeName.IsNone()) - { - return FText::FromString(FString::Printf(TEXT("vadd %s"), *OperandType.TypeName.ToString())); - } - break; case ENodeTitleType::MenuTitle: /** Menu Title for context menus to be displayed in context menus referencing the node. */ return LOCTEXT("MenuTitle", "vadd - Add MaxQ vectors"); diff --git a/Plugins/MaxQ/Source/SpiceUncooked/Private/K2Node_vsub.cpp b/Plugins/MaxQ/Source/SpiceUncooked/Private/K2Node_vsub.cpp index 40904ce..825f957 100644 --- a/Plugins/MaxQ/Source/SpiceUncooked/Private/K2Node_vsub.cpp +++ b/Plugins/MaxQ/Source/SpiceUncooked/Private/K2Node_vsub.cpp @@ -26,18 +26,12 @@ UK2Node_vsub::UK2Node_vsub() FText UK2Node_vsub::GetNodeTitle(ENodeTitleType::Type TitleType) const { - constexpr bool bUseShortNameForTitle{ true }; + constexpr bool bUseShortNameForTitle{ false }; switch (TitleType) { case ENodeTitleType::FullTitle: return LOCTEXT("ListViewTitle", "vsub"); - if (!bUseShortNameForTitle && !OperandType.TypeName.IsNone()) - { - /** The full title, may be multiple lines. */ - return FText::FromString(FString::Printf(TEXT("vsub %s"), *OperandType.TypeName.ToString())); - } - break; case ENodeTitleType::MenuTitle: /** Menu Title for context menus to be displayed in context menus referencing the node. */ return LOCTEXT("MenuTitle", "vsub - Subtract two MaxQ vectors"); diff --git a/Source/SpiceEditor.Target.cs b/Source/SpiceEditor.Target.cs index cb503fc..801a711 100644 --- a/Source/SpiceEditor.Target.cs +++ b/Source/SpiceEditor.Target.cs @@ -34,7 +34,11 @@ public SpiceEditorTarget(TargetInfo Target) : base(Target) UpdateDocs(Target); BuildCSpiceLib(this); - CppStandard = CppStandardVersion.Cpp17; + + CppStandard = CppStandardVersion.Default; + bLegacyParentIncludePaths = false; + WindowsPlatform.bStrictConformanceMode = true; + bValidateFormatStrings = true; } public void UpdateDocs(TargetInfo Target) diff --git a/Spice.uproject b/Spice.uproject index 459216a..6ee74d1 100644 --- a/Spice.uproject +++ b/Spice.uproject @@ -1,6 +1,6 @@ { "FileVersion": 3, - "EngineAssociation": "5.3", + "EngineAssociation": "5.4", "Category": "", "Description": "", "Modules": [ diff --git a/UpgradeLog.htm b/UpgradeLog.htm new file mode 100644 index 0000000..658be78 --- /dev/null +++ b/UpgradeLog.htm @@ -0,0 +1,332 @@ + + + + Migration Report +

+ Migration Report - Spice

Overview

ProjectPathErrorsWarningsMessages
SolutionSpice.sln012
Android.Automation..\..\..\Games\Epic Games\UE_5.4\Engine\Source\Programs\AutomationTool\Android\Android.Automation.csproj000
Apple.Automation..\..\..\Games\Epic Games\UE_5.4\Engine\Source\Programs\AutomationTool\Apple\Apple.Automation.csproj000
AutomationAutomation000
AutomationScripts.Automation..\..\..\Games\Epic Games\UE_5.4\Engine\Source\Programs\AutomationTool\Scripts\AutomationScripts.Automation.csproj000
AutomationTool..\..\..\Games\Epic Games\UE_5.4\Engine\Source\Programs\AutomationTool\AutomationTool.csproj000
AutomationUtils.Automation..\..\..\Games\Epic Games\UE_5.4\Engine\Source\Programs\AutomationTool\AutomationUtils\AutomationUtils.Automation.csproj000
BuildGraph.Automation..\..\..\Games\Epic Games\UE_5.4\Engine\Source\Programs\AutomationTool\BuildGraph\BuildGraph.Automation.csproj000
CookedEditor.Automation..\..\..\Games\Epic Games\UE_5.4\Engine\Source\Programs\AutomationTool\CookedEditor\CookedEditor.Automation.csproj000
CrowdinLocalization.Automation..\..\..\Games\Epic Games\UE_5.4\Engine\Source\Programs\AutomationTool\CrowdinLocalization\CrowdinLocalization.Automation.csproj000
EngineEngine000
EpicGames.AspNet..\..\..\Games\Epic Games\UE_5.4\Engine\Source\Programs\Shared\EpicGames.AspNet\EpicGames.AspNet.csproj000
EpicGames.Build..\..\..\Games\Epic Games\UE_5.4\Engine\Source\Programs\Shared\EpicGames.Build\EpicGames.Build.csproj000
EpicGames.BuildGraph..\..\..\Games\Epic Games\UE_5.4\Engine\Source\Programs\Shared\EpicGames.BuildGraph\EpicGames.BuildGraph.csproj000
EpicGames.Core..\..\..\Games\Epic Games\UE_5.4\Engine\Source\Programs\Shared\EpicGames.Core\EpicGames.Core.csproj000
EpicGames.Horde..\..\..\Games\Epic Games\UE_5.4\Engine\Source\Programs\Shared\EpicGames.Horde\EpicGames.Horde.csproj000
EpicGames.IoHash..\..\..\Games\Epic Games\UE_5.4\Engine\Source\Programs\Shared\EpicGames.IoHash\EpicGames.IoHash.csproj000
EpicGames.Jupiter..\..\..\Games\Epic Games\UE_5.4\Engine\Source\Programs\Shared\EpicGames.Jupiter\EpicGames.Jupiter.csproj000
EpicGames.MongoDB..\..\..\Games\Epic Games\UE_5.4\Engine\Source\Programs\Shared\EpicGames.MongoDB\EpicGames.MongoDB.csproj000
EpicGames.MsBuild..\..\..\Games\Epic Games\UE_5.4\Engine\Source\Programs\Shared\EpicGames.MsBuild\EpicGames.MsBuild.csproj000
EpicGames.OIDC..\..\..\Games\Epic Games\UE_5.4\Engine\Source\Programs\Shared\EpicGames.OIDC\EpicGames.OIDC.csproj000
EpicGames.Oodle..\..\..\Games\Epic Games\UE_5.4\Engine\Source\Programs\Shared\EpicGames.Oodle\EpicGames.Oodle.csproj000
EpicGames.Perforce..\..\..\Games\Epic Games\UE_5.4\Engine\Source\Programs\Shared\EpicGames.Perforce\EpicGames.Perforce.csproj000
EpicGames.Perforce.Fixture..\..\..\Games\Epic Games\UE_5.4\Engine\Source\Programs\Shared\EpicGames.Perforce.Fixture\EpicGames.Perforce.Fixture.csproj000
EpicGames.Perforce.Managed..\..\..\Games\Epic Games\UE_5.4\Engine\Source\Programs\Shared\EpicGames.Perforce.Managed\EpicGames.Perforce.Managed.csproj000
EpicGames.ProjectStore..\..\..\Games\Epic Games\UE_5.4\Engine\Source\Programs\Shared\EpicGames.ProjectStore\EpicGames.ProjectStore.csproj000
EpicGames.Redis..\..\..\Games\Epic Games\UE_5.4\Engine\Source\Programs\Shared\EpicGames.Redis\EpicGames.Redis.csproj000
EpicGames.Serialization..\..\..\Games\Epic Games\UE_5.4\Engine\Source\Programs\Shared\EpicGames.Serialization\EpicGames.Serialization.csproj000
EpicGames.Slack..\..\..\Games\Epic Games\UE_5.4\Engine\Source\Programs\Shared\EpicGames.Slack\EpicGames.Slack.csproj000
EpicGames.Tracing..\..\..\Games\Epic Games\UE_5.4\Engine\Source\Programs\Shared\EpicGames.Tracing\EpicGames.Tracing.csproj000
EpicGames.UBA..\..\..\Games\Epic Games\UE_5.4\Engine\Source\Programs\Shared\EpicGames.UBA\EpicGames.UBA.csproj000
EpicGames.UHT..\..\..\Games\Epic Games\UE_5.4\Engine\Source\Programs\Shared\EpicGames.UHT\EpicGames.UHT.csproj000
GamesGames000
Gauntlet.Automation..\..\..\Games\Epic Games\UE_5.4\Engine\Source\Programs\AutomationTool\Gauntlet\Gauntlet.Automation.csproj000
IOS.Automation..\..\..\Games\Epic Games\UE_5.4\Engine\Source\Programs\AutomationTool\IOS\IOS.Automation.csproj000
Linux.Automation..\..\..\Games\Epic Games\UE_5.4\Engine\Source\Programs\AutomationTool\Linux\Linux.Automation.csproj000
Localization.Automation..\..\..\Games\Epic Games\UE_5.4\Engine\Source\Programs\AutomationTool\Localization\Localization.Automation.csproj000
LowLevelTests.Automation..\..\..\Games\Epic Games\UE_5.4\Engine\Source\Programs\AutomationTool\LowLevelTests\LowLevelTests.Automation.csproj000
Mac.Automation..\..\..\Games\Epic Games\UE_5.4\Engine\Source\Programs\AutomationTool\Mac\Mac.Automation.csproj000
OneSkyLocalization.Automation..\..\..\Games\Epic Games\UE_5.4\Engine\Source\Programs\AutomationTool\OneSkyLocalization\OneSkyLocalization.Automation.csproj000
ProgramsPrograms000
RulesRules000
ScriptGeneratorUbtPlugin.ubtplugin..\..\..\Games\Epic Games\UE_5.4\Engine\Plugins\ScriptPlugin\Source\ScriptGeneratorUbtPlugin\ScriptGeneratorUbtPlugin.ubtplugin.csproj000
SharedShared000
SmartlingLocalization.Automation..\..\..\Games\Epic Games\UE_5.4\Engine\Source\Programs\AutomationTool\SmartlingLocalization\SmartlingLocalization.Automation.csproj000
SpiceIntermediate\ProjectFiles\Spice.vcxproj000
SpiceModuleRulesIntermediate\Build\BuildRulesProjects\SpiceModuleRules\SpiceModuleRules.csproj000
SteamDeck.Automation..\..\..\Games\Epic Games\UE_5.4\Engine\Source\Programs\AutomationTool\SteamDeck\SteamDeck.Automation.csproj000
Turnkey.Automation..\..\..\Games\Epic Games\UE_5.4\Engine\Source\Programs\AutomationTool\Turnkey\Turnkey.Automation.csproj000
TVOS.Automation..\..\..\Games\Epic Games\UE_5.4\Engine\Source\Programs\AutomationTool\TVOS\TVOS.Automation.csproj000
UE5Intermediate\ProjectFiles\UE5.vcxproj000
UE5ProgramRules..\..\..\Games\Epic Games\UE_5.4\Engine\Intermediate\Build\BuildRulesProjects\UE5ProgramRules\UE5ProgramRules.csproj000
UE5Rules..\..\..\Games\Epic Games\UE_5.4\Engine\Intermediate\Build\BuildRulesProjects\UE5Rules\UE5Rules.csproj000
UnrealBuildTool..\..\..\Games\Epic Games\UE_5.4\Engine\Source\Programs\UnrealBuildTool\UnrealBuildTool.csproj000
UnrealBuildTool.PluginsUnrealBuildTool.Plugins000
VisionOS.Automation..\..\..\Games\Epic Games\UE_5.4\Engine\Platforms\VisionOS\Source\Programs\AutomationTool\VisionOS.Automation.csproj000
VisualizersVisualizers000
Win.Automation..\..\..\Games\Epic Games\UE_5.4\Engine\Source\Programs\AutomationTool\Win\Win.Automation.csproj000
XLocLocalization.Automation..\..\..\Games\Epic Games\UE_5.4\Engine\Source\Programs\AutomationTool\XLocLocalization\XLocLocalization.Automation.csproj000

Solution and projects

Solution

Message
Spice.sln: + Visual Studio needs to make non-functional changes to this project in order to enable the project to open in released versions of Visual Studio newer than Visual Studio 2010 SP1 without impacting project behavior.
+ Show 2 additional messages +
Spice.sln: + File successfully backed up as D:\git\gamedevtricks\MaxQ 5.4\Backup\Spice.sln
Spice.sln: + Solution migrated successfully
+ Hide 2 additional messages +

Android.Automation

Message
Android.Automation logged no messages. +

Apple.Automation

Message
Apple.Automation logged no messages. +

Automation

Message
Automation logged no messages. +

AutomationScripts.Automation

Message
AutomationScripts.Automation logged no messages. +

AutomationTool

Message
AutomationTool logged no messages. +

AutomationUtils.Automation

Message
AutomationUtils.Automation logged no messages. +

BuildGraph.Automation

Message
BuildGraph.Automation logged no messages. +

CookedEditor.Automation

Message
CookedEditor.Automation logged no messages. +

CrowdinLocalization.Automation

Message
CrowdinLocalization.Automation logged no messages. +

Engine

Message
Engine logged no messages. +

EpicGames.AspNet

Message
EpicGames.AspNet logged no messages. +

EpicGames.Build

Message
EpicGames.Build logged no messages. +

EpicGames.BuildGraph

Message
EpicGames.BuildGraph logged no messages. +

EpicGames.Core

Message
EpicGames.Core logged no messages. +

EpicGames.Horde

Message
EpicGames.Horde logged no messages. +

EpicGames.IoHash

Message
EpicGames.IoHash logged no messages. +

EpicGames.Jupiter

Message
EpicGames.Jupiter logged no messages. +

EpicGames.MongoDB

Message
EpicGames.MongoDB logged no messages. +

EpicGames.MsBuild

Message
EpicGames.MsBuild logged no messages. +

EpicGames.OIDC

Message
EpicGames.OIDC logged no messages. +

EpicGames.Oodle

Message
EpicGames.Oodle logged no messages. +

EpicGames.Perforce

Message
EpicGames.Perforce logged no messages. +

EpicGames.Perforce.Fixture

Message
EpicGames.Perforce.Fixture logged no messages. +

EpicGames.Perforce.Managed

Message
EpicGames.Perforce.Managed logged no messages. +

EpicGames.ProjectStore

Message
EpicGames.ProjectStore logged no messages. +

EpicGames.Redis

Message
EpicGames.Redis logged no messages. +

EpicGames.Serialization

Message
EpicGames.Serialization logged no messages. +

EpicGames.Slack

Message
EpicGames.Slack logged no messages. +

EpicGames.Tracing

Message
EpicGames.Tracing logged no messages. +

EpicGames.UBA

Message
EpicGames.UBA logged no messages. +

EpicGames.UHT

Message
EpicGames.UHT logged no messages. +

Games

Message
Games logged no messages. +

Gauntlet.Automation

Message
Gauntlet.Automation logged no messages. +

IOS.Automation

Message
IOS.Automation logged no messages. +

Linux.Automation

Message
Linux.Automation logged no messages. +

Localization.Automation

Message
Localization.Automation logged no messages. +

LowLevelTests.Automation

Message
LowLevelTests.Automation logged no messages. +

Mac.Automation

Message
Mac.Automation logged no messages. +

OneSkyLocalization.Automation

Message
OneSkyLocalization.Automation logged no messages. +

Programs

Message
Programs logged no messages. +

Rules

Message
Rules logged no messages. +

ScriptGeneratorUbtPlugin.ubtplugin

Message
ScriptGeneratorUbtPlugin.ubtplugin logged no messages. +

Shared

Message
Shared logged no messages. +

SmartlingLocalization.Automation

Message
SmartlingLocalization.Automation logged no messages. +

Spice

Message
Spice logged no messages. +

SpiceModuleRules

Message
SpiceModuleRules logged no messages. +

SteamDeck.Automation

Message
SteamDeck.Automation logged no messages. +

Turnkey.Automation

Message
Turnkey.Automation logged no messages. +

TVOS.Automation

Message
TVOS.Automation logged no messages. +

UE5

Message
UE5 logged no messages. +

UE5ProgramRules

Message
UE5ProgramRules logged no messages. +

UE5Rules

Message
UE5Rules logged no messages. +

UnrealBuildTool

Message
UnrealBuildTool logged no messages. +

UnrealBuildTool.Plugins

Message
UnrealBuildTool.Plugins logged no messages. +

VisionOS.Automation

Message
VisionOS.Automation logged no messages. +

Visualizers

Message
Visualizers logged no messages. +

Win.Automation

Message
Win.Automation logged no messages. +

XLocLocalization.Automation

Message
XLocLocalization.Automation logged no messages. +
\ No newline at end of file