Skip to content

Commit 1000c15

Browse files
muitmuit
committed
Merge branch 'release/1.9-UE5.1'
2 parents bb91c08 + 8f6d49a commit 1000c15

File tree

69 files changed

+2095
-2663
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

69 files changed

+2095
-2663
lines changed

‎.clang-format

+145
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,145 @@
1+
---
2+
Language: Cpp
3+
AccessModifierOffset: -4
4+
AlignAfterOpenBracket: DontAlign
5+
AlignConsecutiveAssignments: false
6+
AlignConsecutiveDeclarations: false
7+
AlignEscapedNewlines: Left
8+
AlignOperands: true
9+
AlignTrailingComments: true
10+
AllowAllParametersOfDeclarationOnNextLine: true
11+
AllowShortBlocksOnASingleLine: true
12+
AllowShortCaseLabelsOnASingleLine: false
13+
AllowShortFunctionsOnASingleLine: Empty
14+
AllowShortIfStatementsOnASingleLine: Never
15+
AllowShortLambdasOnASingleLine: None
16+
AllowShortLoopsOnASingleLine: false
17+
AlwaysBreakAfterReturnType: None
18+
AlwaysBreakBeforeMultilineStrings: true
19+
AlwaysBreakTemplateDeclarations: Yes
20+
BinPackArguments: true
21+
BinPackParameters: true
22+
BreakBeforeBinaryOperators: None
23+
BreakBeforeInheritanceComma: false
24+
BreakInheritanceList: BeforeColon
25+
BreakBeforeTernaryOperators: true
26+
BreakConstructorInitializersBeforeComma: false
27+
BreakConstructorInitializers: BeforeComma
28+
BreakAfterJavaFieldAnnotations: false
29+
BreakStringLiterals: true
30+
BreakBeforeBraces: Custom
31+
BraceWrapping:
32+
AfterCaseLabel: false
33+
AfterClass: true
34+
AfterEnum: true
35+
AfterFunction: true
36+
AfterNamespace: true
37+
AfterStruct: true
38+
AfterUnion: true
39+
AfterExternBlock: true
40+
AfterControlStatement: Always
41+
BeforeElse: true
42+
BeforeCatch: true
43+
# BeforeLambdaBody: false - Waiting for Clang12
44+
SplitEmptyFunction: false
45+
SplitEmptyRecord: false
46+
SplitEmptyNamespace: false
47+
ColumnLimit: 110
48+
CommentPragmas: '^ IWYU pragma:'
49+
CompactNamespaces: false
50+
AllowAllConstructorInitializersOnNextLine: false
51+
ConstructorInitializerAllOnOneLineOrOnePerLine: true
52+
ConstructorInitializerIndentWidth: 4
53+
ContinuationIndentWidth: 4
54+
Cpp11BracedListStyle: true
55+
DerivePointerAlignment: false
56+
DisableFormat: false
57+
FixNamespaceComments: true
58+
ForEachMacros:
59+
- for
60+
IncludeBlocks: Regroup
61+
IncludeCategories:
62+
- Regex: '.*\.generated\.h'
63+
Priority: 100
64+
- Regex: '.*(PCH).*'
65+
Priority: -1
66+
- Regex: '".*"'
67+
Priority: 2
68+
- Regex: '^<.*\.(h)>'
69+
Priority: 3
70+
- Regex: '^<.*>'
71+
Priority: 4
72+
IncludeIsMainRegex: '([-_](test|unittest))?$'
73+
IndentCaseLabels: true
74+
IndentPPDirectives: AfterHash
75+
IndentWidth: 4
76+
IndentWrappedFunctionNames: false
77+
JavaScriptQuotes: Leave
78+
JavaScriptWrapImports: true
79+
KeepEmptyLinesAtTheStartOfBlocks: false
80+
MacroBlockBegin: ''
81+
MacroBlockEnd: ''
82+
MaxEmptyLinesToKeep: 2
83+
NamespaceIndentation: All
84+
ObjCBinPackProtocolList: Never
85+
ObjCBlockIndentWidth: 2
86+
ObjCSpaceAfterProperty: false
87+
ObjCSpaceBeforeProtocolList: true
88+
PenaltyBreakAssignment: 2
89+
PenaltyBreakBeforeFirstCallParameter: 1
90+
PenaltyBreakComment: 300
91+
PenaltyBreakFirstLessLess: 120
92+
PenaltyBreakString: 1000
93+
PenaltyBreakTemplateDeclaration: 10
94+
PenaltyExcessCharacter: 1000000
95+
PenaltyReturnTypeOnItsOwnLine: 200
96+
PointerAlignment: Left
97+
RawStringFormats:
98+
- Language: Cpp
99+
Delimiters:
100+
- cc
101+
- CC
102+
- cpp
103+
- Cpp
104+
- CPP
105+
- 'c++'
106+
- 'C++'
107+
CanonicalDelimiter: ''
108+
BasedOnStyle: google
109+
- Language: TextProto
110+
Delimiters:
111+
- pb
112+
- PB
113+
- proto
114+
- PROTO
115+
EnclosingFunctions:
116+
- EqualsProto
117+
- EquivToProto
118+
- PARSE_PARTIAL_TEXT_PROTO
119+
- PARSE_TEST_PROTO
120+
- PARSE_TEXT_PROTO
121+
- ParseTextOrDie
122+
- ParseTextProtoOrDie
123+
CanonicalDelimiter: ''
124+
ReflowComments: true
125+
SortIncludes: true
126+
SortUsingDeclarations: true
127+
SpaceAfterCStyleCast: true
128+
SpaceAfterTemplateKeyword: true
129+
SpaceBeforeAssignmentOperators: true
130+
SpaceBeforeCpp11BracedList: false
131+
SpaceBeforeCtorInitializerColon: true
132+
SpaceBeforeInheritanceColon: true
133+
SpaceBeforeParens: ControlStatements
134+
SpaceBeforeRangeBasedForLoopColon: true
135+
SpaceInEmptyParentheses: false
136+
SpacesBeforeTrailingComments: 4
137+
SpacesInAngles: false
138+
SpacesInContainerLiterals: true
139+
SpacesInCStyleCastParentheses: false
140+
SpacesInParentheses: false
141+
SpacesInSquareBrackets: false
142+
Standard: Auto
143+
TabWidth: 4
144+
UseTab: Always
145+
...

‎.gitignore

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
/Binaries
2-
/Intermediate
1+
Binaries
2+
Intermediate

‎FactionsExtension.uplugin

+7-33
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"FileVersion": 3,
3-
"Version": 17,
4-
"VersionName": "1.8",
3+
"Version": 18,
4+
"VersionName": "1.9",
55
"FriendlyName": "Factions Extension",
66
"Description": "Add factions and relations in your game using C++ or Blueprints",
77
"MarketplaceURL": "com.epicgames.launcher://ue/marketplace/content/29a33bd0c38e4b8f9626f495bb47dca8",
@@ -10,51 +10,25 @@
1010
"CreatedByURL": "http://piperift.com/",
1111
"DocsURL": "https://piperift.com/FactionsExtension/",
1212
"SupportURL": "info@piperift.com",
13-
"EngineVersion": "4.26",
13+
"EngineVersion": "5.1",
1414
"EnabledByDefault": true,
1515
"CanContainContent": false,
1616
"IsBetaVersion": false,
1717
"Modules": [
1818
{
1919
"Name": "Factions",
2020
"Type": "Runtime",
21-
"LoadingPhase": "PreDefault",
22-
"WhitelistPlatforms": [
23-
"Win64",
24-
"Win32",
25-
"Linux",
26-
"Android",
27-
"PS4",
28-
"XboxOne",
29-
"Switch",
30-
"Mac"
31-
]
21+
"LoadingPhase": "PreDefault"
3222
},
3323
{
3424
"Name": "FactionsEditor",
3525
"Type": "Editor",
36-
"LoadingPhase": "PostEngineInit",
37-
"WhitelistPlatforms": [
38-
"Win64",
39-
"Win32",
40-
"Linux",
41-
"Android",
42-
"PS4",
43-
"XboxOne",
44-
"Switch",
45-
"Mac"
46-
]
26+
"LoadingPhase": "PostEngineInit"
4727
},
4828
{
49-
"Name": "FactionsExtensionTest",
29+
"Name": "FactionsTest",
5030
"Type": "DeveloperTool",
51-
"LoadingPhase": "PreDefault",
52-
"WhitelistPlatforms": [
53-
"Win64",
54-
"Win32",
55-
"Linux",
56-
"Mac"
57-
]
31+
"LoadingPhase": "PreDefault"
5832
}
5933
]
6034
}

‎Source/Editor/FactionsEditor.Build.cs

+26-26
Original file line numberDiff line numberDiff line change
@@ -5,39 +5,39 @@
55

66
public class FactionsEditor : ModuleRules
77
{
8-
public FactionsEditor(ReadOnlyTargetRules TargetRules) : base(TargetRules)
9-
{
10-
PCHUsage = ModuleRules.PCHUsageMode.UseExplicitOrSharedPCHs;
11-
8+
public FactionsEditor(ReadOnlyTargetRules TargetRules) : base(TargetRules)
9+
{
10+
PCHUsage = ModuleRules.PCHUsageMode.UseExplicitOrSharedPCHs;
1211

13-
PublicDependencyModuleNames.AddRange(new string[] {
14-
"Core",
15-
"InputCore"
12+
PublicDependencyModuleNames.AddRange(new string[] {
13+
"Core",
14+
"InputCore"
1615
// ... add other public dependencies that you statically link with here ...
1716
});
1817

19-
PrivateDependencyModuleNames.AddRange(new string[] {
20-
"Core",
21-
"CoreUObject",
22-
"AppFramework",
23-
"Engine",
24-
"UnrealEd",
25-
"Slate",
26-
"SlateCore",
27-
"AssetTools",
28-
"EditorStyle",
29-
"GraphEditor",
30-
"Kismet",
31-
"PropertyEditor",
32-
"BlueprintGraph",
33-
"DetailCustomizations",
34-
"Settings",
35-
"Factions"
18+
PrivateDependencyModuleNames.AddRange(new string[] {
19+
"AppFramework",
20+
"AssetTools",
21+
"BlueprintGraph",
22+
"Core",
23+
"CoreUObject",
24+
"DetailCustomizations",
25+
"EditorStyle",
26+
"Engine",
27+
"Factions",
28+
"GraphEditor",
29+
"Kismet",
30+
"PropertyEditor",
31+
"Settings",
32+
"Slate",
33+
"SlateCore",
34+
"ToolWidgets",
35+
"UnrealEd"
3636
// ... add private dependencies that you statically link with here ...
3737
});
3838

39-
DynamicallyLoadedModuleNames.AddRange(new string[] {
39+
DynamicallyLoadedModuleNames.AddRange(new string[] {
4040
// ... add any modules that your module loads dynamically here ...
4141
});
42-
}
42+
}
4343
}

‎Source/Editor/Private/Asset/AssetTypeAction_FactionDescriptorAsset.cpp

+38
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
// Copyright 2015-2020 Piperift. All Rights Reserved.
2+
3+
#include "Asset/AssetTypeAction_FactionDescriptorAsset.h"
4+
#include "FactionDescriptorAsset.h"
5+
#include "FactionsModule.h"
6+
7+
#include "AssetToolsModule.h"
8+
#include "ContentBrowserModule.h"
9+
10+
#define LOCTEXT_NAMESPACE "AssetTypeActions"
11+
12+
13+
//////////////////////////////////////////////////////////////////////////
14+
// FAssetTypeAction_FactionDescriptorAsset
15+
16+
FText FAssetTypeAction_FactionDescriptorAsset::GetName() const
17+
{
18+
return LOCTEXT("FAssetTypeAction_FactionAssetName", "Faction Descriptor");
19+
}
20+
21+
FColor FAssetTypeAction_FactionDescriptorAsset::GetTypeColor() const
22+
{
23+
return FColor(170, 66, 244);
24+
}
25+
26+
UClass* FAssetTypeAction_FactionDescriptorAsset::GetSupportedClass() const
27+
{
28+
return UFactionDescriptorAsset::StaticClass();
29+
}
30+
31+
uint32 FAssetTypeAction_FactionDescriptorAsset::GetCategories()
32+
{
33+
return EAssetTypeCategories::Misc;
34+
}
35+
36+
//////////////////////////////////////////////////////////////////////////
37+
38+
#undef LOCTEXT_NAMESPACE

‎Source/Editor/Private/Asset/AssetTypeAction_FactionInfoAsset.h ‎Source/Editor/Private/Asset/AssetTypeAction_FactionDescriptorAsset.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
#include "AssetTypeActions_Base.h"
66

7-
class FACTIONSEDITOR_API FAssetTypeAction_FactionInfoAsset : public FAssetTypeActions_Base
7+
class FACTIONSEDITOR_API FAssetTypeAction_FactionDescriptorAsset : public FAssetTypeActions_Base
88
{
99
public:
1010
// IAssetTypeActions interface

‎Source/Editor/Private/Asset/AssetTypeAction_FactionInfoAsset.cpp

-38
This file was deleted.

0 commit comments

Comments
 (0)