Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
131 commits
Select commit Hold shift + click to select a range
90ee4ce
subscribe report close window button to logout
OswaldoApexSystems Mar 5, 2026
2ce8c57
Merge branch 'release-6.0.2' into fix/EOSU-1040-close-report-ui-when-…
OswaldoApexSystems Mar 9, 2026
a7e2f17
Update version to 6.1.0
DanF-ApexSystems Mar 9, 2026
e78dc38
Merge pull request #1250 from EOS-Contrib/fix/EOSU-1040-close-report-…
DanF-ApexSystems Mar 10, 2026
e65c259
Updating IL2CPP Setup.md
EOSPluginJeff Mar 10, 2026
fef491e
Egpi Redaction Utility
JessTello Mar 11, 2026
72a4ded
Update EOSHighFrequencyP2P.cs
JessTello Mar 11, 2026
30d3962
Remove extra character
DanF-ApexSystems Mar 11, 2026
3abf5d2
Use non-version specific link
EOSPluginJeff Mar 11, 2026
ce456d5
Merge pull request #1253 from EOS-Contrib/chore/6.1.0-update-version
DanF-ApexSystems Mar 11, 2026
dba2c1f
Updating docs.unity3d.com links to be version agnostic
EOSPluginJeff Mar 11, 2026
4a08fed
Address EGPI review feedback and redact IDs at log callsites
JessTello Mar 12, 2026
084f29a
Refactor HighFrequency coordinate packet serialization
JessTello Mar 12, 2026
3834481
Update EOSHighFrequencyP2P.cs
JessTello Mar 12, 2026
f005114
Merge pull request #1254 from EOS-Contrib/docs/eosu-1062-il2cpp_setup
DanF-ApexSystems Mar 13, 2026
64a8d29
Merge branch 'release-6.1.0' into eosu-794-clarify-coordinate-payload…
DanF-ApexSystems Mar 13, 2026
da65a9e
Merge pull request #1256 from EOS-Contrib/eosu-794-clarify-coordinate…
DanF-ApexSystems Mar 13, 2026
c01ab59
Update TitleStorageTests.cs
EOSPluginJeff Mar 18, 2026
0f73041
Simplify logging call by adding using directive
JessTello Mar 12, 2026
ed200d5
Merge pull request #1259 from EOS-Contrib/docs/eosu-1014-title_storag…
DanF-ApexSystems Mar 19, 2026
04bdd91
Merge branch 'release-6.1.0' into eosu-963-remove-logging-of-EGPI-ide…
matt-clarke Mar 20, 2026
2c9e637
Update EOSManager.cs
OswaldoApexSystems Mar 23, 2026
82270e0
Merge pull request #1255 from EOS-Contrib/eosu-963-remove-logging-of-…
DanF-ApexSystems Mar 24, 2026
99ec272
Update EOSManager.cs
OswaldoApexSystems Mar 24, 2026
92e6ee4
Apply suggestion from @matt-clarke
OswaldoApexSystems Mar 24, 2026
b174add
Update EOSTransport.cs
JessTello Mar 26, 2026
195ba0f
Refactor config system: replace EOSConfig with ProductConfig
OswaldoApexSystems Mar 27, 2026
74d387a
Update ProductConfigTests.cs
OswaldoApexSystems Mar 27, 2026
b0f54cd
Merge branch 'release-6.1.0' into refacto/EOSU-1007-Replace-EOSConfig…
OswaldoApexSystems Mar 27, 2026
1a36436
Update PlatformFlagsExtensions.cs
OswaldoApexSystems Mar 27, 2026
2ad4c68
Update ListOfStringsToEnumConverterTests.cs
OswaldoApexSystems Mar 27, 2026
13bc850
Update Assets/Tests/PlayMode/Config/JsonConverters/ListOfStringsToEnu…
OswaldoApexSystems Mar 30, 2026
70a787b
Apply suggestions from code review
OswaldoApexSystems Mar 30, 2026
882f34c
Merge branch 'release-6.1.0' into Fix/eosu-407-virtual-keyboard-const…
OswaldoApexSystems Mar 30, 2026
9a74729
Merge pull request #1262 from EOS-Contrib/eosu-91-clarify-RTT-behavior
DanF-ApexSystems Mar 30, 2026
ff82bfb
Import EOS-SDK-1.19.1-CL52217470
DanF-ApexSystems Mar 30, 2026
4564bb2
Fix aar rename
DanF-ApexSystems Mar 30, 2026
f3e0e2f
Add meta file for new EOS SDK file
DanF-ApexSystems Mar 30, 2026
f2ebdb2
Merge branch 'release-6.1.0' into Fix/eosu-407-virtual-keyboard-const…
OswaldoApexSystems Mar 30, 2026
2bfb15a
Merge branch 'release-6.1.0' into refacto/EOSU-1007-Replace-EOSConfig…
OswaldoApexSystems Mar 30, 2026
5b3d963
Fix spelling mistake
matt-clarke Mar 31, 2026
50c9f84
Merge pull request #1264 from EOS-Contrib/Update/EOSU-1009-PlatformFl…
DanF-ApexSystems Mar 31, 2026
7bffacb
Merge pull request #1266 from EOS-Contrib/upgrade/EOS-SDK-1.19.1-CL52…
DanF-ApexSystems Mar 31, 2026
87fe489
Merge pull request #1265 from EOS-Contrib/Update/EOSU-1006-ListOfStri…
DanF-ApexSystems Mar 31, 2026
967d3f9
Merge pull request #1261 from EOS-Contrib/Fix/eosu-407-virtual-keyboa…
DanF-ApexSystems Mar 31, 2026
6a44515
Build Windows native libraries
DanF-ApexSystems Mar 31, 2026
1997896
Fix(high-frequency-p2p): avoid toggle send without selected peer
JessTello Mar 31, 2026
712589a
Merge pull request #1267 from EOS-Contrib/EOSU-1046-build-win-native-…
DanF-ApexSystems Apr 1, 2026
9cc157e
Update gitattributes to include EAC launchers
DanF-ApexSystems Apr 1, 2026
b418e2e
Temp remove EAC launchers
DanF-ApexSystems Apr 1, 2026
03962d9
Re-add EAC launchers for LFS
DanF-ApexSystems Apr 1, 2026
7b9a1ac
Update gitattributes to capture EAC launcher files
DanF-ApexSystems Apr 1, 2026
39ab63c
Temp remove pending LFS files
DanF-ApexSystems Apr 1, 2026
b05ad5e
Re-add pending LFS files
DanF-ApexSystems Apr 1, 2026
ee5c1b5
Unify slash direction
DanF-ApexSystems Apr 1, 2026
6034dac
Remove white space
DanF-ApexSystems Apr 1, 2026
cd8314c
Merge branch 'release-6.1.0' into refacto/EOSU-1007-Replace-EOSConfig…
OswaldoApexSystems Apr 1, 2026
74078a3
Merge pull request #1269 from EOS-Contrib/chore/EOSU-1126-EAC-to-LFS
DanF-ApexSystems Apr 1, 2026
b47784d
Merge branch 'release-6.1.0' into refacto/EOSU-1007-Replace-EOSConfig…
OswaldoApexSystems Apr 1, 2026
2f795ea
Apply suggestions from code review
OswaldoApexSystems Apr 6, 2026
504eb40
Apply and fix suggestions from code review
OswaldoApexSystems Apr 6, 2026
6797245
Update SandboxId.cs
OswaldoApexSystems Apr 6, 2026
0e30877
Sandbox Function Renamed
OswaldoApexSystems Apr 6, 2026
b2c9b7c
eosu-1145 Implement support for Custom Invites Disable Request
JessTello Apr 6, 2026
b019d30
Merge pull request #1263 from EOS-Contrib/refacto/EOSU-1007-Replace-E…
DanF-ApexSystems Apr 8, 2026
634d8e9
Merge pull request #1270 from EOS-Contrib/eosu-1145-Implement-support…
DanF-ApexSystems Apr 8, 2026
a4e1ec5
Replace PEW material in the Performance Stress Test scene
OswaldoApexSystems Apr 8, 2026
c575895
Create EpicGamesIncLicense.txt
OswaldoApexSystems Apr 9, 2026
3a77cf8
Create EpicGamesIncLicense.txt.meta
OswaldoApexSystems Apr 9, 2026
9590a6b
Merge pull request #1271 from EOS-Contrib/Update/EOSU-1025-Replace-PE…
DanF-ApexSystems Apr 9, 2026
f3f0113
Fix for ClientSessionTests FindByBucketIdAndJoin
EOSPluginJeff Apr 9, 2026
9d7b855
Merge pull request #1272 from EOS-Contrib/Fix/eosu-1012-clientsession…
DanF-ApexSystems Apr 13, 2026
0b81d9e
Import EOS SDK 1.19.1.0-CL52662522
DanF-ApexSystems Apr 14, 2026
223975f
Remove obsolete credential type and redundant using
JessTello Apr 14, 2026
f362923
Remove deprecated localization files
DanF-ApexSystems Apr 15, 2026
fe9b58a
Add Windows Arm64 files and import line
DanF-ApexSystems Apr 15, 2026
18127d9
Merge pull request #1273 from EOS-Contrib/upgrade/EOS-SDK-1.19.1.0-CL…
DanF-ApexSystems Apr 15, 2026
9f264bc
Move ARM64 files to ARM64 folder
DanF-ApexSystems Apr 15, 2026
7c501ac
Merge pull request #1274 from EOS-Contrib/fix/arm64-location
DanF-ApexSystems Apr 16, 2026
e4a002d
Fix: Now log lines are placed correctly and not cut off
Apr 20, 2026
e897b24
Fix trailing comma in import script
DanF-ApexSystems Apr 21, 2026
062061e
Import EOS SDK 1.19.1.0-CL52894002
DanF-ApexSystems Apr 21, 2026
5bbf4fd
Update version to 1.19.1.0-CL52894002
DanF-ApexSystems Apr 21, 2026
ecca256
Merge pull request #1275 from EOS-Contrib/Fix/EOSU-1203LogLinesCutOff
DanF-ApexSystems Apr 21, 2026
7494020
Update changelog
DanF-ApexSystems Apr 21, 2026
c022e5f
Build Win x64 native libs
DanF-ApexSystems Apr 21, 2026
7e36774
Remove changelog items still pending PR
DanF-ApexSystems Apr 22, 2026
a9db701
eosu-1026 Fix achievements failing after auth token expiration
JessTello Apr 23, 2026
e2ad26e
Fix Connect re-auth using stale JWT on token expiration
JessTello Apr 23, 2026
54f7421
Add P2P connection established and interrupted callbacks to EOSTransp…
JessTello Apr 23, 2026
4ae2e3c
Add P2P connection interrupted callback to EOSPeer2PeerManager
JessTello Apr 23, 2026
0f9ec33
Merge pull request #1277 from EOS-Contrib/upgrade/EOS-SDK-1.19.1.0-CL…
DanF-ApexSystems Apr 23, 2026
ecbd73a
Update import script for new ARM64 files
DanF-ApexSystems Apr 24, 2026
ad950ca
Update version to EOS SDK 1.19.1.1-CL53093741
DanF-ApexSystems Apr 24, 2026
984ee31
Import EOS SDK 1.19.1.1-CL53093741
DanF-ApexSystems Apr 24, 2026
2edf1fd
Merge pull request #1268 from EOS-Contrib/eosu-1130-high-frequency-p2…
DanF-ApexSystems Apr 27, 2026
fa6610a
Add .lib to LFS
DanF-ApexSystems Apr 27, 2026
dc8f74b
Temp remove lib file for LFS
DanF-ApexSystems Apr 27, 2026
5543214
Re-add lib file for LFS
DanF-ApexSystems Apr 27, 2026
ab61fcd
Merge pull request #1280 from EOS-Contrib/upgrade/EOS-SDK-1.19.1.1-CL…
DanF-ApexSystems Apr 28, 2026
05093d2
Merge pull request #1278 from EOS-Contrib/eosu-1026-achievements-stop…
DanF-ApexSystems Apr 28, 2026
ee57694
Updated mac libs
rubenserrano-cmyk Apr 28, 2026
1c83352
Update P2PNetcode.unity
JessTello Apr 28, 2026
0fec115
Update Lobbies.unity
JessTello Apr 28, 2026
068ed67
Update EOSTransportManager.cs
JessTello Apr 28, 2026
607ac98
Merge pull request #1281 from EOS-Contrib/EOSU-1208-build-native-libs…
DanF-ApexSystems Apr 29, 2026
5de76f9
Merge pull request #1279 from EOS-Contrib/eosu-404-auth-token-reauth-…
DanF-ApexSystems Apr 29, 2026
c445cb0
Merge pull request #1282 from EOS-Contrib/fix-canvas-transform
DanF-ApexSystems Apr 29, 2026
9fcc8c0
Import EOS SDK 1.19.1.2-CL53289219
DanF-ApexSystems May 1, 2026
b1c8e96
Update Changelog
DanF-ApexSystems May 1, 2026
3538f83
Update hotfix version in iOS header
DanF-ApexSystems May 1, 2026
e2d271a
Merge pull request #1283 from EOS-Contrib/upgrade/EOS-SDK-1.19.1.2-CL…
DanF-ApexSystems May 1, 2026
e08320f
Update C++ version to 20
DanF-ApexSystems May 4, 2026
51e39d0
Build Win 64 native libs
DanF-ApexSystems May 4, 2026
4b1d429
Merge pull request #1284 from EOS-Contrib/chore/1.19.1.2-win-libs
EpicCliffHudson May 4, 2026
b82acc0
Update Makefile
JessTello May 4, 2026
97ae853
Build Linux native lib
JessTello May 4, 2026
6f9d4df
Merge pull request #1285 from EOS-Contrib/1.19.1.2-linux-libs
EpicCliffHudson May 4, 2026
d1b30c4
Update libDynamicLibraryLoaderHelper.dylib
rubenserrano-cmyk May 4, 2026
44e1ece
Update Makefile
rubenserrano-cmyk May 4, 2026
1748374
Support for windows ARM64
JessTello May 4, 2026
b33db8c
Merge pull request #1286 from EOS-Contrib/EOSU-1265-build-native-libs…
DanF-ApexSystems May 5, 2026
8616db9
Whitelist export files for tools/bin
DanF-ApexSystems May 5, 2026
13593f7
Merge pull request #1288 from EOS-Contrib/fix/EOSU-1290-EAC-files
DanF-ApexSystems May 6, 2026
5e334f7
Address PR review feedback for Windows ARM64 support
JessTello May 7, 2026
e2269f9
Consolidate repeated platform strings into constants in Windows builders
JessTello May 8, 2026
87512b6
Merge branch 'release-6.1.0' into ARM64
DanF-ApexSystems May 8, 2026
6468b3d
Merge pull request #1287 from EOS-Contrib/ARM64
DanF-ApexSystems May 8, 2026
5c22774
Remove ARM64 lib file from repo
DanF-ApexSystems May 11, 2026
c0530cf
Build windows native libraries
DanF-ApexSystems May 11, 2026
b7bffaa
Merge pull request #1289 from EOS-Contrib/chore/EOS-SDK-1.19.1.2-buil…
DanF-ApexSystems May 11, 2026
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
3 changes: 3 additions & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ etc\PlatformSpecificAssets\EOS\Mac\eac_launcher.app\Contents\_CodeSignature\Code
*.dylib binary
*.exe binary
*.gif binary
*.icns binary
*.jpg binary
*.png binary
*.so binary
Expand All @@ -36,13 +37,15 @@ etc\PlatformSpecificAssets\EOS\Mac\eac_launcher.app\Contents\_CodeSignature\Code
*.dylib filter=lfs diff=lfs merge=lfs -text
*.exe filter=lfs diff=lfs merge=lfs -text
*.gif filter=lfs diff=lfs merge=lfs -text
*.icns filter=lfs diff=lfs merge=lfs -text
*.jpg filter=lfs diff=lfs merge=lfs -text
*.png filter=lfs diff=lfs merge=lfs -text
*.so filter=lfs diff=lfs merge=lfs -text
*.ttf filter=lfs diff=lfs merge=lfs -text

# Files without extensions to add to git-lfs
Assets/Plugins/iOS/EOSSDK.framework/EOSSDK filter=lfs diff=lfs merge=lfs -text
etc/PlatformSpecificAssets/EOS/Linux/eac_launcher filter=lfs diff=lfs merge=lfs -text
etc/PlatformSpecificAssets/EOS/Mac/eac_launcher.app/Contents/MacOS/start_protected_game filter=lfs diff=lfs merge=lfs -text
tools/bin/EAC/Linux/anticheat_integritytool filter=lfs diff=lfs merge=lfs -text
tools/bin/EAC/Mac/anticheat_integritytool filter=lfs diff=lfs merge=lfs -text
Expand Down
2 changes: 1 addition & 1 deletion .github/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ See [this](/com.playeveryware.eos/Documentation~/plugin_advantages.md) for a mor
* A Unity project to integrate the plugin into.

> [!NOTE]
> Your system should also satisfy [Unity's system requirements](https://docs.unity3d.com/2021.3/Documentation/Manual/system-requirements.html) as well as the [EOS system requirements](https://dev.epicgames.com/docs/epic-online-services/eos-get-started/system-requirements)
> Your system should also satisfy [Unity's system requirements](https://docs.unity3d.com/Manual/system-requirements.html) as well as the [EOS system requirements](https://dev.epicgames.com/docs/epic-online-services/eos-get-started/system-requirements)

# Supported EOS SDK Features

Expand Down
12 changes: 6 additions & 6 deletions Assets/Materials/PerformanceStressTestMaterials/BaseObject.mat
Original file line number Diff line number Diff line change
Expand Up @@ -51,12 +51,12 @@ Material:
m_Offset: {x: 0, y: 0}
- _EmissionMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Scale: {x: 2, y: 2}
m_Offset: {x: -2, y: -2}
- _MainTex:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Texture: {fileID: 2800000, guid: b7f4e055a013be2469002777d2cf8ae0, type: 3}
m_Scale: {x: 2, y: 2}
m_Offset: {x: -2, y: -2}
- _MetallicGlossMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
Expand Down Expand Up @@ -94,7 +94,7 @@ Material:
- _UVSec: 0
- _ZWrite: 1
m_Colors:
- _Color: {r: 1, g: 0.039215688, b: 0.45882356, a: 1}
- _Color: {r: 1, g: 1, b: 1, a: 1}
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
- _SpecColor: {r: 0.2, g: 0.2, b: 0.2, a: 1}
m_BuildTextureStacks: []
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ Material:
m_Shader: {fileID: 45, guid: 0000000000000000f000000000000000, type: 0}
m_ValidKeywords:
- _DETAIL_MULX2
- _NORMALMAP
- _SMOOTHNESS_TEXTURE_ALBEDO_CHANNEL_A
m_InvalidKeywords: []
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
Expand All @@ -27,15 +27,15 @@ Material:
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DetailAlbedoMap:
m_Texture: {fileID: 2800000, guid: 5c6f26400cfc55c49bc6177063379693, type: 3}
m_Texture: {fileID: 2800000, guid: b7f4e055a013be2469002777d2cf8ae0, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DetailMask:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DetailNormalMap:
m_Texture: {fileID: 2800000, guid: bb303f7d37b6b454f92e695c5336e511, type: 3}
m_Texture: {fileID: 2800000, guid: 3e5fbaabcb9af8e479e3d1e96398079b, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _EmissionMap:
Expand Down Expand Up @@ -71,21 +71,21 @@ Material:
- _DetailNormalMapScale: 1
- _DstBlend: 0
- _GlossMapScale: 1
- _Glossiness: 0.399
- _Glossiness: 0
- _GlossyReflections: 1
- _Metallic: 0.554
- _Mode: 0
- _OcclusionStrength: 1
- _Parallax: 0.02
- _SmoothnessTextureChannel: 0
- _SmoothnessTextureChannel: 1
- _SpecularHighlights: 1
- _SrcBlend: 1
- _UVSec: 0
- _ZWrite: 1
m_Colors:
- _Color: {r: 1, g: 1, b: 1, a: 1}
- _Color: {r: 0, g: 0, b: 0, a: 1}
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
- _SpecColor: {r: 0.2, g: 0.2, b: 0.2, a: 1}
- _SpecColor: {r: 0.2264151, g: 0.2264151, b: 0.2264151, a: 1}
m_BuildTextureStacks: []
--- !u!114 &5865323441971905698
MonoBehaviour:
Expand Down
4 changes: 2 additions & 2 deletions Assets/Materials/PerformanceStressTestMaterials/Skybox.mat
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ Material:
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MainTex:
m_Texture: {fileID: 2800000, guid: 5c6f26400cfc55c49bc6177063379693, type: 3}
m_Texture: {fileID: 2800000, guid: b7f4e055a013be2469002777d2cf8ae0, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MetallicGlossMap:
Expand All @@ -65,7 +65,7 @@ Material:
- _Cutoff: 0.5
- _DetailNormalMapScale: 1
- _DstBlend: 0
- _Exposure: 1.3
- _Exposure: 2
- _GlossMapScale: 1
- _Glossiness: 0.5
- _GlossyReflections: 1
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
© 2026, Epic Games, Inc. All rights reserved. Epic, Epic Games, the Epic Games logo, Fortnite, the Fortnite logo, Unreal, Unreal Engine, the Unreal Engine logo, Unreal Tournament, and the Unreal Tournament logo are trademarks or registered trademarks of Epic Games, Inc. in the United States of America and elsewhere. Other brands or product names are the trademarks of their respective owners.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ Material:
serializedVersion: 3
m_TexEnvs:
- _BumpMap:
m_Texture: {fileID: 2800000, guid: bb303f7d37b6b454f92e695c5336e511, type: 3}
m_Texture: {fileID: 2800000, guid: 1b6261a99bf6bb741924d819ad18c8e2, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _Cube:
Expand Down

This file was deleted.

This file was deleted.

This file was deleted.

4 changes: 2 additions & 2 deletions Assets/Plugins/Linux/libDynamicLibraryLoaderHelper.so
Git LFS file not shown
4 changes: 2 additions & 2 deletions Assets/Plugins/Linux/libEOSSDK-Linux-Shipping.so
Git LFS file not shown
3 changes: 2 additions & 1 deletion Assets/Plugins/Source/Editor/Build/BuildRunner.cs
Original file line number Diff line number Diff line change
Expand Up @@ -74,8 +74,9 @@ public void OnPreprocessBuild(BuildReport report)
// Run the static builder's prebuild.
s_builder?.PreBuild(report);

#if !DISABLESTEAMWORKS
#if !DISABLESTEAMWORKS && !EOS_PLATFORM_WINDOWS_ARM64
// If we're using Steamworks, then look at the user's Steam configuration file
// (Steamworks does not ship Windows ARM64 binaries, so it is gated off there.)
// If the "steamApiInterfaceVersionsArray" is empty, try to set it for the user
SteamConfig config = Config.Get<SteamConfig>();
if (config != null && (config.steamApiInterfaceVersionsArray == null || config.steamApiInterfaceVersionsArray.Count == 0))
Expand Down
20 changes: 15 additions & 5 deletions Assets/Plugins/Source/Editor/Build/PlatformSpecificBuilder.cs
Original file line number Diff line number Diff line change
Expand Up @@ -99,10 +99,7 @@ protected PlatformSpecificBuilder(string nativeCodeOutputDirectory, params Build
/// <param name="report">The prebuild report.</param>
public void OnPreprocessBuild(BuildReport report)
{
// If the platform being built is one of the platforms that this
// builder builds to, then set this as the builder with the
// BuildRunner.
if (_buildTargets.Contains(report.summary.platform))
if (ShouldHandle(report))
{
// Note that in this context, despite being within an abstract
// class, the most derived instance will be returned when
Expand All @@ -111,6 +108,19 @@ public void OnPreprocessBuild(BuildReport report)
}
}

/// <summary>
/// Determines whether this builder should handle the indicated build.
/// Default implementation matches by BuildTarget. Override for
/// finer-grained dispatch (e.g. architecture sub-options on Windows
/// where x64 and ARM64 share BuildTarget.StandaloneWindows64).
/// </summary>
/// <param name="report">The build report being processed.</param>
/// <returns>True if this builder is responsible for this build.</returns>
protected virtual bool ShouldHandle(BuildReport report)
{
return _buildTargets.Contains(report.summary.platform);
}

/// <summary>
/// Adds a mapping of solution file to expected binary file output.
/// </summary>
Expand Down Expand Up @@ -167,7 +177,7 @@ public virtual void BuildNativeCode()
// via UPM.
if (_projectFileToBinaryFilesMap.Keys.All(File.Exists))
{
BuildUtility.BuildNativeBinaries(_projectFileToBinaryFilesMap, _nativeCodeOutputDirectory, true);
BuildUtility.BuildNativeBinaries(_projectFileToBinaryFilesMap, _nativeCodeOutputDirectory, true, GetPlatformString());
}
else
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ public class CheckDeploymentWindow : EOSEditorWindow
private const string WindowsPluginDirectory = "Assets/Plugins/Windows";
private const string EOSWindows64DllFile = "x64/EOSSDK-Win64-Shipping.dll";
private const string EOSWindows32DllFile = "x86/EOSSDK-Win32-Shipping.dll";
private const string EOSWindowsARM64DllFile = "ARM64/EOSSDK-Win64-Shippingarm64.dll";

private string content;
private string currentPath;
Expand Down Expand Up @@ -84,6 +85,11 @@ protected override void RenderWindow()
LoadDLLFile(Path.Combine(FileSystemUtility.GetProjectPath(), WindowsPluginDirectory, EOSWindows64DllFile));
}

if (GUILayout.Button(EOSWindowsARM64DllFile))
{
LoadDLLFile(Path.Combine(FileSystemUtility.GetProjectPath(), WindowsPluginDirectory, EOSWindowsARM64DllFile));
}

if (!string.IsNullOrWhiteSpace(currentPath))
{
scrollPosition = GUILayout.BeginScrollView(scrollPosition, GUILayout.MaxHeight(Screen.height));
Expand Down
Loading