ActualHorse/ComboInput
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request 'Created the necessary changes for Unreal Engine 5.4' (#1) from update-to-5.4 into main

Browse Source 
Reviewed-on: BattyBovine/ComboInput#1
This commit is contained in:
Jamie Greunbaum 2024-06-28 17:28:10 -04:00
commit 26b506eb0e
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ComboInput.uplugin
View File

@ -6,7 +6,7 @@
"Description": "A set of components and classes for capturing Enhanced Input actions for buffering actions and stringing them into complex combos.", "Description": "A set of components and classes for capturing Enhanced Input actions for buffering actions and stringing them into complex combos.",
"Category": "Input", "Category": "Input",
"CreatedBy": "Jamie Greunbaum", "CreatedBy": "Jamie Greunbaum",
"EngineVersion": "5.3.0", "EngineVersion": "5.4.0",
"CanContainContent": true, "CanContainContent": true,
"IsBetaVersion": true, "IsBetaVersion": true,
"IsExperimentalVersion": true, "IsExperimentalVersion": true,

2
Source/ComboInput/Public/ComboActionGraph.h
View File

@ -116,7 +116,7 @@ public:
public: public:
UPROPERTY() UPROPERTY()
class UEdGraph *EdGraph; TObjectPtr<class UEdGraph> EdGraph;
UPROPERTY(BlueprintReadOnly, Category="Combo Input|Action|Editor") UPROPERTY(BlueprintReadOnly, Category="Combo Input|Action|Editor")
bool bCanRenameNode; bool bCanRenameNode;

4
Source/ComboInputEditor/Private/ComboActionGraphSchema.h
View File

@ -95,7 +95,7 @@ public:
virtual UEdGraphNode *PerformAction(class UEdGraph *ParentGraph, UEdGraphPin *FromPin, const FVector2D Location, bool bSelectNewNode = true) override; virtual UEdGraphNode *PerformAction(class UEdGraph *ParentGraph, UEdGraphPin *FromPin, const FVector2D Location, bool bSelectNewNode = true) override;
virtual void AddReferencedObjects(FReferenceCollector &Collector) override; virtual void AddReferencedObjects(FReferenceCollector &Collector) override;
class UEdComboActionGraphNode *NodeTemplate; TObjectPtr<class UEdComboActionGraphNode> NodeTemplate;
}; };
USTRUCT() USTRUCT()
@ -114,7 +114,7 @@ public:
virtual UEdGraphNode *PerformAction(class UEdGraph *ParentGraph, UEdGraphPin *FromPin, const FVector2D Location, bool bSelectNewNode = true) override; virtual UEdGraphNode *PerformAction(class UEdGraph *ParentGraph, UEdGraphPin *FromPin, const FVector2D Location, bool bSelectNewNode = true) override;
virtual void AddReferencedObjects(FReferenceCollector &Collector) override; virtual void AddReferencedObjects(FReferenceCollector &Collector) override;
class UEdComboActionGraphEdge *NodeTemplate; TObjectPtr<class UEdComboActionGraphEdge> NodeTemplate;
}; };

2
Source/ComboInputEditor/Private/Ed/AssetEditor_ComboActionGraph.h
View File

@ -146,7 +146,7 @@ private:
class UComboActionGraphEditorSettings *ComboActionGraphEditorSettings; class UComboActionGraphEditorSettings *ComboActionGraphEditorSettings;
class UComboActionGraph *EditingGraph; TObjectPtr<class UComboActionGraph> EditingGraph;
//Toolbar //Toolbar
TSharedPtr<FAssetEditorToolbarComboActionGraph> ToolbarBuilder; TSharedPtr<FAssetEditorToolbarComboActionGraph> ToolbarBuilder;