Skip to content

Commit aaf9b71

Browse files
albixhalbixh
authored
Merge pull request #11 from albixh/main
Alpakit support, FF7RML, custom asset factories
2 parents b178157 + 9bdfb17 commit aaf9b71

File tree

211 files changed

+47773
-47
lines changed

Some content is hidden

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

211 files changed

+47773
-47
lines changed

‎.gitignore‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -215,6 +215,9 @@
215215
!/Plugins/EnginePlugins/Marketplace/ACLPlugin/Content/*
216216
!/Mods/**/Binaries/Win64/*
217217

218+
# Add exceptions for mod folder
219+
!/Mods/**/*
220+
218221
# avoid PDBs
219222
/Plugins/**/*.pdb
220223
/Mods/**/*.pdb
@@ -281,7 +284,6 @@ obj/
281284

282285
!/Intermediate/ScriptModules/
283286

284-
/Mods/*
285287

286288

287289

@@ -324,4 +326,7 @@ Engine/Extras/ThirdPartyNotUE/SDKs/HostLinux/**
324326

325327
# Ignore large FB data files
326328
/Source/ThirdParty/Facebook/IOS/**/*.yml
327-
/Source/ThirdParty/Facebook/IOS/**/*.json
329+
/Source/ThirdParty/Facebook/IOS/**/*.json
330+
331+
# Add exception for alpakit resources
332+
!/Plugins/Alpakit/Resources/*

‎Binaries/Win64/EndEditor.target‎

Lines changed: 49 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
"IsLicenseeVersion": 0,
1717
"IsPromotedBuild": 0,
1818
"BranchName": "++UE4+Release-4.26",
19-
"BuildId": "e2008ceb-b06c-4dc4-8379-9e4463ed0b34"
19+
"BuildId": "8675476d-48b4-44ea-a4a7-2a43a14da6ca"
2020
},
2121
"BuildProducts": [
2222
{
@@ -267,6 +267,22 @@
267267
"Path": "$(EngineDir)/Plugins/MovieScene/SequencerScripting/Binaries/Win64/UE4Editor-SequencerScriptingEditor.dll",
268268
"Type": "DynamicLibrary"
269269
},
270+
{
271+
"Path": "$(ProjectDir)/Plugins/Alpakit/Binaries/Win64/UE4Editor-Alpakit.dll",
272+
"Type": "DynamicLibrary"
273+
},
274+
{
275+
"Path": "$(ProjectDir)/Plugins/Alpakit/Binaries/Win64/UE4Editor-Alpakit.pdb",
276+
"Type": "SymbolFile"
277+
},
278+
{
279+
"Path": "$(EngineDir)/Plugins/Editor/PluginBrowser/Binaries/Win64/UE4Editor-PluginBrowser.dll",
280+
"Type": "DynamicLibrary"
281+
},
282+
{
283+
"Path": "$(EngineDir)/Plugins/Developer/PluginUtils/Binaries/Win64/UE4Editor-PluginUtils.dll",
284+
"Type": "DynamicLibrary"
285+
},
270286
{
271287
"Path": "$(ProjectDir)/Plugins/BodyDriverPlugin/Binaries/Win64/UE4Editor-BodyDriverPlugin.dll",
272288
"Type": "DynamicLibrary"
@@ -499,10 +515,6 @@
499515
"Path": "$(EngineDir)/Plugins/Runtime/SignificanceManager/Binaries/Win64/UE4Editor-SignificanceManager.dll",
500516
"Type": "DynamicLibrary"
501517
},
502-
{
503-
"Path": "$(EngineDir)/Plugins/Developer/PluginUtils/Binaries/Win64/UE4Editor-PluginUtils.dll",
504-
"Type": "DynamicLibrary"
505-
},
506518
{
507519
"Path": "$(EngineDir)/Plugins/Developer/PropertyAccessNode/Binaries/Win64/UE4Editor-PropertyAccessNode.dll",
508520
"Type": "DynamicLibrary"
@@ -563,10 +575,6 @@
563575
"Path": "$(EngineDir)/Plugins/Editor/GeometryMode/Binaries/Win64/UE4Editor-TextureAlignMode.dll",
564576
"Type": "DynamicLibrary"
565577
},
566-
{
567-
"Path": "$(EngineDir)/Plugins/Editor/PluginBrowser/Binaries/Win64/UE4Editor-PluginBrowser.dll",
568-
"Type": "DynamicLibrary"
569-
},
570578
{
571579
"Path": "$(EngineDir)/Plugins/Editor/SpeedTreeImporter/Binaries/Win64/UE4Editor-SpeedTreeImporter.dll",
572580
"Type": "DynamicLibrary"
@@ -2235,6 +2243,18 @@
22352243
"Path": "$(EngineDir)/Plugins/MovieScene/SequencerScripting/Binaries/Win64/UE4Editor.modules",
22362244
"Type": "RequiredResource"
22372245
},
2246+
{
2247+
"Path": "$(ProjectDir)/Plugins/Alpakit/Binaries/Win64/UE4Editor.modules",
2248+
"Type": "RequiredResource"
2249+
},
2250+
{
2251+
"Path": "$(EngineDir)/Plugins/Editor/PluginBrowser/Binaries/Win64/UE4Editor.modules",
2252+
"Type": "RequiredResource"
2253+
},
2254+
{
2255+
"Path": "$(EngineDir)/Plugins/Developer/PluginUtils/Binaries/Win64/UE4Editor.modules",
2256+
"Type": "RequiredResource"
2257+
},
22382258
{
22392259
"Path": "$(ProjectDir)/Plugins/BodyDriverPlugin/Binaries/Win64/UE4Editor.modules",
22402260
"Type": "RequiredResource"
@@ -2319,10 +2339,6 @@
23192339
"Path": "$(EngineDir)/Plugins/Runtime/SignificanceManager/Binaries/Win64/UE4Editor.modules",
23202340
"Type": "RequiredResource"
23212341
},
2322-
{
2323-
"Path": "$(EngineDir)/Plugins/Developer/PluginUtils/Binaries/Win64/UE4Editor.modules",
2324-
"Type": "RequiredResource"
2325-
},
23262342
{
23272343
"Path": "$(EngineDir)/Plugins/Developer/PropertyAccessNode/Binaries/Win64/UE4Editor.modules",
23282344
"Type": "RequiredResource"
@@ -2371,10 +2387,6 @@
23712387
"Path": "$(EngineDir)/Plugins/Editor/GeometryMode/Binaries/Win64/UE4Editor.modules",
23722388
"Type": "RequiredResource"
23732389
},
2374-
{
2375-
"Path": "$(EngineDir)/Plugins/Editor/PluginBrowser/Binaries/Win64/UE4Editor.modules",
2376-
"Type": "RequiredResource"
2377-
},
23782390
{
23792391
"Path": "$(EngineDir)/Plugins/Editor/SpeedTreeImporter/Binaries/Win64/UE4Editor.modules",
23802392
"Type": "RequiredResource"
@@ -2561,6 +2573,18 @@
25612573
"Path": "$(ProjectDir)/Plugins/AcrePreBuild/AcrePreBuild.uplugin",
25622574
"Type": "UFS"
25632575
},
2576+
{
2577+
"Path": "$(ProjectDir)/Plugins/Alpakit/Alpakit.uplugin",
2578+
"Type": "UFS"
2579+
},
2580+
{
2581+
"Path": "$(EngineDir)/Plugins/Editor/PluginBrowser/PluginBrowser.uplugin",
2582+
"Type": "UFS"
2583+
},
2584+
{
2585+
"Path": "$(EngineDir)/Plugins/Developer/PluginUtils/PluginUtils.uplugin",
2586+
"Type": "UFS"
2587+
},
25642588
{
25652589
"Path": "$(ProjectDir)/Plugins/BodyDriverPlugin/BodyDriverPlugin.uplugin",
25662590
"Type": "UFS"
@@ -2661,6 +2685,14 @@
26612685
"Path": "$(ProjectDir)/Plugins/Scrapyard/Scrapyard.uplugin",
26622686
"Type": "UFS"
26632687
},
2688+
{
2689+
"Path": "$(ProjectDir)/Mods/FF7RML/FF7RML.uplugin",
2690+
"Type": "UFS"
2691+
},
2692+
{
2693+
"Path": "$(ProjectDir)/Mods/FF7RModMenu/FF7RModMenu.uplugin",
2694+
"Type": "UFS"
2695+
},
26642696
{
26652697
"Path": "$(EngineDir)/Plugins/AI/EnvironmentQueryEditor/EnvironmentQueryEditor.uplugin",
26662698
"Type": "UFS"
@@ -2685,10 +2717,6 @@
26852717
"Path": "$(EngineDir)/Plugins/Runtime/SignificanceManager/SignificanceManager.uplugin",
26862718
"Type": "UFS"
26872719
},
2688-
{
2689-
"Path": "$(EngineDir)/Plugins/Developer/PluginUtils/PluginUtils.uplugin",
2690-
"Type": "UFS"
2691-
},
26922720
{
26932721
"Path": "$(EngineDir)/Plugins/Developer/PropertyAccessNode/PropertyAccessNode.uplugin",
26942722
"Type": "UFS"
@@ -2737,10 +2765,6 @@
27372765
"Path": "$(EngineDir)/Plugins/Editor/GeometryMode/GeometryMode.uplugin",
27382766
"Type": "UFS"
27392767
},
2740-
{
2741-
"Path": "$(EngineDir)/Plugins/Editor/PluginBrowser/PluginBrowser.uplugin",
2742-
"Type": "UFS"
2743-
},
27442768
{
27452769
"Path": "$(EngineDir)/Plugins/Editor/SpeedTreeImporter/SpeedTreeImporter.uplugin",
27462770
"Type": "UFS"
@@ -21013,10 +21037,6 @@
2101321037
"Path": "$(EngineDir)/Binaries/Win64/AgentInterface.dll",
2101421038
"Type": "NonUFS"
2101521039
},
21016-
{
21017-
"Path": "$(EngineDir)/Binaries/Win64/AgentInterface.pdb",
21018-
"Type": "DebugNonUFS"
21019-
},
2102021040
{
2102121041
"Path": "$(EngineDir)/Binaries/ThirdParty/FreeImage/Win64/FreeImage.dll",
2102221042
"Type": "NonUFS"

‎Binaries/Win64/UE4Editor-ENDEditor.dll‎

26 KB
Binary file not shown.

‎Binaries/Win64/UE4Editor-EndCore.dll‎

0 Bytes
Binary file not shown.

‎Binaries/Win64/UE4Editor-EndDataBase.dll‎

0 Bytes
Binary file not shown.

‎Binaries/Win64/UE4Editor-EndDataObject.dll‎

0 Bytes
Binary file not shown.

‎Binaries/Win64/UE4Editor-EndDebug.dll‎

0 Bytes
Binary file not shown.

‎Binaries/Win64/UE4Editor-EndGame.dll‎

0 Bytes
Binary file not shown.

‎Binaries/Win64/UE4Editor-EndOneSaveData.dll‎

0 Bytes
Binary file not shown.

‎Binaries/Win64/UE4Editor.modules‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"BuildId": "e2008ceb-b06c-4dc4-8379-9e4463ed0b34",
2+
"BuildId": "8675476d-48b4-44ea-a4a7-2a43a14da6ca",
33
"Modules":
44
{
55
"EndCore": "UE4Editor-EndCore.dll",

0 commit comments

Comments
 (0)