Skip to content

Merge Release 3.3.4 into development #1053

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

Merged
paulhazen merged 19 commits into from
Dec 12, 2024
Merged

Merge Release 3.3.4 into development #1053

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
14de71e
fix: Increment version number within package.json
paulhazen Oct 23, 2024
2557dc6
Merge branch 'development' into release-3.3.4
paulhazen Oct 25, 2024
66b8dba
fix: Correct attributes for platform config internal classes so they …
paulhazen Oct 28, 2024
f899cfb
fix: Update Version within EOSPackageInfo.
paulhazen Oct 28, 2024
adbe475
Merge branch 'development' into release-3.3.4
paulhazen Oct 28, 2024
20994ca
docs: Update changelog.
paulhazen Oct 28, 2024
e81dc4a
docs: Improve formatting of the Changelog document.
paulhazen Oct 28, 2024
cdff183
docs: Continued formatting improvements.
paulhazen Oct 28, 2024
f49853b
docs: Continued formatting improvements.
paulhazen Oct 28, 2024
43f1ff7
fix: Make eos_package_description pretty.
paulhazen Oct 29, 2024
fb60596
Merge branch 'development' into release-3.3.4
paulhazen Oct 29, 2024
e587018
Merge branch 'development' into release-3.3.4
paulhazen Nov 7, 2024
0740baa
Merge branch 'development' into release-3.3.4
paulhazen Nov 7, 2024
048c5d7
Merge branch 'development' into release-3.3.4
paulhazen Nov 13, 2024
70c14db
Merge branch 'release-3.3.4' into ph/integration-3.3.4
paulhazen Dec 2, 2024
9e2d6cb
fix: Resolve merge conflicts.
paulhazen Dec 2, 2024
db67cea
fix: Update NativeRender binaries.
paulhazen Dec 2, 2024
c0b3868
Merge branch 'stable' into ph/integration-3.3.4
paulhazen Dec 12, 2024
24dd181
Merge branch 'development' into ph/integration-3.3.4
paulhazen Dec 12, 2024
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
1 change: 0 additions & 1 deletion Assets/Plugins/Source/Editor/Platforms/iOS/IOSBuilder.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ namespace PlayEveryWare.EpicOnlineServices.Editor.Build
using System.IO;
using UnityEditor;
using UnityEditor.Build.Reporting;
using EpicOnlineServices.Utility;

// This conditional is here so that no compiler errors will happen if the
// Unity Editor is not configured to build for iOS.
Expand Down
2 changes: 1 addition & 1 deletion Assets/Plugins/Windows/Core/WindowsPlatformSpecifics.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@

#if !EOS_DISABLE

#define ENABLE_CONFIGURE_STEAM_FROM_MANAGED
//#define ENABLE_CONFIGURE_STEAM_FROM_MANAGED

// If standalone windows and not editor, or the windows editor.
#if (UNITY_STANDALONE_WIN && !UNITY_EDITOR) || UNITY_EDITOR_WIN || EXTERNAL_TO_UNITY
Expand Down
4 changes: 2 additions & 2 deletions Assets/Plugins/Windows/x64/GfxPluginNativeRender-x64.dll
View file
Open in desktop
Git LFS file not shown
2 changes: 1 addition & 1 deletion Assets/Plugins/Windows/x86/GfxPluginNativeRender-x86.dll
View file
Open in desktop
Git LFS file not shown
2 changes: 1 addition & 1 deletion Assets/StreamingAssets/EOS/EpicOnlineServicesConfig.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,4 +23,4 @@
"initialButtonDelayForOverlay": null,
"repeatButtonDelayForOverlay": null,
"toggleFriendsButtonCombination": "SpecialLeft"
}
}
2 changes: 1 addition & 1 deletion Assets/StreamingAssets/EOS/eos_android_config.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,4 +33,4 @@
"repeatButtonDelayForOverlay": 0.0,
"toggleFriendsButtonCombination": "None",
"schemaVersion": "1.0"
}
}
2 changes: 1 addition & 1 deletion Assets/StreamingAssets/EOS/eos_ios_config.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,4 +31,4 @@
"repeatButtonDelayForOverlay": 0.0,
"toggleFriendsButtonCombination": "None",
"schemaVersion": "1.0"
}
}
2 changes: 1 addition & 1 deletion Assets/StreamingAssets/EOS/eos_linux_config.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,4 +31,4 @@
"repeatButtonDelayForOverlay": 0.0,
"toggleFriendsButtonCombination": "None",
"schemaVersion": "1.0"
}
}