Skip to content

Update to UE5.4 #5

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jhoar wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Update to UE5.4 #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 6 additions & 5 deletions .vsconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"
]
}
7 changes: 1 addition & 6 deletions Plugins/MaxQ/Source/SpiceUncooked/Private/K2Node_hat.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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");
Expand Down
7 changes: 1 addition & 6 deletions Plugins/MaxQ/Source/SpiceUncooked/Private/K2Node_minus.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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");
Expand Down
7 changes: 1 addition & 6 deletions Plugins/MaxQ/Source/SpiceUncooked/Private/K2Node_pack.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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");
Expand Down
5 changes: 0 additions & 5 deletions Plugins/MaxQ/Source/SpiceUncooked/Private/K2Node_upack.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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");
Expand Down
7 changes: 1 addition & 6 deletions Plugins/MaxQ/Source/SpiceUncooked/Private/K2Node_vadd.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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");
Expand Down
8 changes: 1 addition & 7 deletions Plugins/MaxQ/Source/SpiceUncooked/Private/K2Node_vsub.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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");
Expand Down
6 changes: 5 additions & 1 deletion Source/SpiceEditor.Target.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion Spice.uproject
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"FileVersion": 3,
"EngineAssociation": "5.3",
"EngineAssociation": "5.4",
"Category": "",
"Description": "",
"Modules": [
Expand Down
Loading