Skip to content

Applied patch for UE-5.4 #6

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
pml76 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Applied patch for UE-5.4 #6

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"
]
}
Binary file modified Content/Common/Blueprints/Components/UniverseComponent_BP.uasset
View file
Open in desktop
Binary file not shown.
Binary file modified Plugins/MaxQ/Content/Scenery/Earth/BP_Earth.uasset
View file
Open in desktop
Binary file not shown.
2 changes: 1 addition & 1 deletion Plugins/MaxQ/MaxQ.uplugin
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"FileVersion": 3,
"Version": 7,
"VersionName": "1.0068.0",
"EngineVersion": "5.3",
"EngineVersion": "5.4",
"FriendlyName": "MaxQ Spaceflight Toolkit",
"Description": "MaxQ is powered by the SPICE Toolkit software released by NASA/JPL/NAIF, which is the premier Space Flight toolset for space flight planning and analysis.",
"Category": "Spaceflight",
Expand Down
2 changes: 1 addition & 1 deletion Plugins/MaxQ/Source/MaxQCppSamples/Private/GetTelemetryFromServer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ void UGetTelemetryFromServer_AsyncExecution::Activate()
FString Mistake;

switch (pRequest->GetStatus()) {
case EHttpRequestStatus::Failed_ConnectionError:
case EHttpRequestStatus::Failed:
Mistake = TEXT("Connection failed.");
default:
Mistake = TEXT("Request failed.");
Expand Down
1 change: 1 addition & 0 deletions Plugins/MaxQ/Source/MaxQCppSamples/Private/Sample04Actor.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
// GitHub: https://github.com/Gamergenic1/MaxQ/

#include "Sample04Actor.h"
#include "Engine/Engine.h"
#include "Spice.h"

using MaxQSamples::Log;
Expand Down
1 change: 1 addition & 0 deletions Plugins/MaxQ/Source/MaxQCppSamples/Private/Sample05Actor.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
#include "SampleUtilities.h"
#include "Sample05TelemetryActor.h"
#include "SpiceOrbits.h"
#include "Engine/Engine.h"
#include "GetTelemetryFromServer.h"

using MaxQSamples::Log;
Expand Down
1 change: 1 addition & 0 deletions Plugins/MaxQ/Source/MaxQCppSamples/Private/Sample06Actor.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
#include "Misc/Paths.h"
#include "HAL/FileManager.h"
#include "GenericPlatform/GenericPlatformMisc.h"
#include "Engine/Engine.h"
#include "Spice.h"

using MaxQSamples::Log;
Expand Down
7 changes: 6 additions & 1 deletion Plugins/MaxQ/Source/MaxQCppSamples/Private/SampleUtilities.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,11 @@
#include "HttpModule.h"
#include "Interfaces/IHttpRequest.h"
#include "Interfaces/IHttpResponse.h"
#include "Engine/Engine.h"
#include "Engine/StaticMesh.h"
#include "HAL/FileManager.h"
#include "Misc/Paths.h"
#include "Components/StaticMeshComponent.h"
#include "Spice.h"

#if WITH_EDITOR
Expand Down Expand Up @@ -646,7 +651,7 @@ void USampleUtilities::GetTelemetryFromServer(FTelemetryCallback Callback, FStri
FString Mistake;

switch (pRequest->GetStatus()) {
case EHttpRequestStatus::Failed_ConnectionError:
case EHttpRequestStatus::Failed:
Mistake = TEXT("Connection failed.");
default:
Mistake = TEXT("Request failed.");
Expand Down
1 change: 1 addition & 0 deletions Plugins/MaxQ/Source/MaxQCppSamples/Public/Sample04Actor.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
#include "SpiceTypes.h"
#include "SampleUtilities.h"
#include "UObject/WeakObjectPtrTemplates.h"
#include "GameFramework/Actor.h"
#include "Sample04Actor.generated.h"

class AActor;
Expand Down
1 change: 1 addition & 0 deletions Plugins/MaxQ/Source/MaxQCppSamples/Public/Sample06Actor.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
#include "SpiceConstants.h"
#include "SpiceTypes.h"
#include "SampleUtilities.h"
#include "GameFramework/Actor.h"
#include "UObject/WeakObjectPtrTemplates.h"
#include "Sample06Actor.generated.h"

Expand Down
1 change: 1 addition & 0 deletions Plugins/MaxQ/Source/MaxQCppSamples/Public/SampleUtilities.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
#include "Kismet/BlueprintFunctionLibrary.h"
#include "Kismet/BlueprintAsyncActionBase.h"
#include "UObject/WeakObjectPtrTemplates.h"
#include "GameFramework/Actor.h"
#include "SampleUtilities.generated.h"


Expand Down
2 changes: 2 additions & 0 deletions Plugins/MaxQ/Source/Spice/Public/SpiceConstants.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@

#pragma once

#include "CoreMinimal.h"

#pragma region NaifFNames
namespace MaxQ::Constants
{
Expand Down
2 changes: 2 additions & 0 deletions Plugins/MaxQ/Source/Spice/Public/SpiceData.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,8 @@
#pragma once

#include "SpiceTypes.h"
#include "Misc/Paths.h"
#include "HAL/FileManager.h"

namespace MaxQ::Data
{
Expand Down
1 change: 1 addition & 0 deletions Plugins/MaxQ/Source/Spice/Public/SpiceEnums.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
#pragma once

#include "CoreMinimal.h"
#include "UObject/ObjectMacros.h"
#include "SpicePlatformDefs.h"

UENUM(BlueprintType)
Expand Down
12 changes: 6 additions & 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,18 @@ void UK2Node_hat::GetMenuActions(FBlueprintActionDatabaseRegistrar& ActionRegist

FText UK2Node_hat::GetNodeTitle(ENodeTitleType::Type TitleType) const
{
constexpr bool bUseShortNameForTitle{ true };
// constexpr bool bUseShortNameForTitle{ true };

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;
// 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
12 changes: 6 additions & 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,18 @@ void UK2Node_minus::GetMenuActions(FBlueprintActionDatabaseRegistrar& ActionRegi

FText UK2Node_minus::GetNodeTitle(ENodeTitleType::Type TitleType) const
{
constexpr bool bUseShortNameForTitle{ true };
// constexpr bool bUseShortNameForTitle{ true };

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;
// 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
12 changes: 6 additions & 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,18 @@ void UK2Node_pack::GetMenuActions(FBlueprintActionDatabaseRegistrar& ActionRegis

FText UK2Node_pack::GetNodeTitle(ENodeTitleType::Type TitleType) const
{
constexpr bool bUseShortNameForTitle{ true };
// constexpr bool bUseShortNameForTitle{ true };

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;
// 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
12 changes: 6 additions & 6 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 @@ -395,18 +395,18 @@ void UK2Node_upack::GetMenuActions(FBlueprintActionDatabaseRegistrar& ActionRegi

FText UK2Node_upack::GetNodeTitle(ENodeTitleType::Type TitleType) const
{
constexpr bool bUseShortNameForTitle{ true };
// constexpr bool bUseShortNameForTitle{ true };

switch (TitleType)
{
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;
// 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
12 changes: 6 additions & 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,18 @@ UK2Node_vadd::UK2Node_vadd()

FText UK2Node_vadd::GetNodeTitle(ENodeTitleType::Type TitleType) const
{
constexpr bool bUseShortNameForTitle{ true };
// constexpr bool bUseShortNameForTitle{ true };

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;
// 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
14 changes: 7 additions & 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,18 @@ UK2Node_vsub::UK2Node_vsub()

FText UK2Node_vsub::GetNodeTitle(ENodeTitleType::Type TitleType) const
{
constexpr bool bUseShortNameForTitle{ true };
// constexpr bool bUseShortNameForTitle{ true };

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;
// 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
1 change: 1 addition & 0 deletions Source/SpiceEditor.Target.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ public SpiceEditorTarget(TargetInfo Target) : base(Target)
bUseFastPDBLinking = false;
bPublicSymbolsByDefault = true; // <- Forced to true on Windows anyways
WindowsPlatform.bStripUnreferencedSymbols = false;
bOverrideBuildEnvironment = true;

ExtraModuleNames.Add("Spice");
ExtraModuleNames.Add("MaxQMain");
Expand Down
8 changes: 5 additions & 3 deletions 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 All @@ -16,8 +16,10 @@
"Enabled": true,
"SupportedTargetPlatforms": [
"Win64",
"Mac"
]
"Mac",
"Android"
],
"MarketplaceURL": "com.epicgames.launcher://ue/marketplace/product/146e96d801ed4d8d930b41bfeca53733"
}
],
"TargetPlatforms": [
Expand Down