Skip to content
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.

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

Improve menu #959

Merged
merged 5 commits into from
Oct 14, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ public class CheckDeploymentWindow : EOSEditorWindow

public CheckDeploymentWindow() : base("Deployment Checker") { }

[MenuItem("Tools/EOS Plugin/Check Deployment")]
[MenuItem("EOS Plugin/Advanced/Check Deployment")]
public static void ShowWindow()
{
GetWindow<CheckDeploymentWindow>();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ public CreatePackageWindow() : base("Create Package") { }

#endregion

[MenuItem("Tools/EOS Plugin/Create Package")]
[MenuItem("EOS Plugin/Advanced/Create Package")]
public static void ShowWindow()
{
GetWindow<CreatePackageWindow>();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ public static SettingsProvider CreateSettingsProvider()
return provider;
}

[MenuItem("Tools/EOS Plugin/Plugin Configuration")]
[MenuItem("EOS Plugin/Plugin Configuration", priority = 2)]
public static void ShowWindow()
{
var window = GetWindow<EOSPluginSettingsWindow>();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ public EOSSettingsWindow() : base("EOS Configuration")
{
}

[MenuItem("Tools/EOS Plugin/EOS Configuration")]
[MenuItem("EOS Plugin/EOS Configuration", priority = 1)]
public static void ShowWindow()
{
var window = GetWindow<EOSSettingsWindow>();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ public class EOSUnitTestSettingsWindow : EOSEditorWindow

public EOSUnitTestSettingsWindow() : base("EOS Unit Test Configuration") { }

[MenuItem("Tools/EOS Plugin/Advanced/Unit Test Configuration")]
[MenuItem("EOS Plugin/Advanced/Unit Test Configuration")]
public static void OpenUnitTestSettingsWindow()
{
GetWindow<EOSUnitTestSettingsWindow>();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ private class PlatformImportInfoList
private string pathToImportDescDirectory;
private PlatformImportInfoList importInfoList;

[MenuItem("Tools/EOS Plugin/Install EOS zip")]
[MenuItem("EOS Plugin/Advanced/Install EOS zip")]
public static void ShowWindow()
{
GetWindow<InstallEOSZipWindow>();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ public LogLevelWindow() : base("Log Level Configuration")
{
}

[MenuItem("Tools/EOS Plugin/Log Level Configuration")]
[MenuItem("EOS Plugin/Log Level Configuration", priority = 3)]
public static void ShowWindow()
{
GetWindow<LogLevelWindow>();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ private class UPMPackage
public string version;
}

[MenuItem("Tools/EOS Plugin/Version", false, 100)]
[MenuItem("EOS Plugin/Version", false, 4)]
public static void ShowWindow()
{
GetWindow<PluginVersionWindow>();
Expand Down
4 changes: 2 additions & 2 deletions Assets/Plugins/Source/Editor/Utility/CreateXMLLinkUtility.cs
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ namespace PlayEveryWare.EpicOnlineServices.Editor.Utility
{
public static class CreateXMLLinkUtility
{
[MenuItem("Tools/EOS Plugin/Create link.xml")]
[MenuItem("EOS Plugin/Advanced/Create link.xml")]
static void CreateLinkXml()
{
var linkSourceFilePath = Path.Combine("Packages", EOSPackageInfo.PackageName, "Editor", "link.xml");
Expand All @@ -55,7 +55,7 @@ static void CreateLinkXml()
}

//disable menu item if not running within a UPM package
[MenuItem("Tools/EOS Plugin/Create link.xml", true)]
[MenuItem("EOS Plugin/Advanced/Create link.xml", true)]
static bool ValidateCreateLinkXml()
{
return Directory.Exists(Path.Combine("Packages", EOSPackageInfo.PackageName, "Editor"));
Expand Down
16 changes: 8 additions & 8 deletions Assets/Plugins/Source/Editor/Utility/MakefileUtility.cs
Original file line number Diff line number Diff line change
Expand Up @@ -42,24 +42,24 @@ static MakefileUtility()
ErrorRegex = new Regex(@"error [a-zA-z0-9]*:", RegexOptions.IgnoreCase);
}

[MenuItem("Tools/EOS Plugin/Build Libraries/Win32")]
[MenuItem("EOS Plugin/Advanced/Build Libraries/Win32")]
public static void BuildLibrariesWin32()
{
#if UNITY_EDITOR_WIN
(new WindowsBuilder32()).BuildNativeCode();
#endif
}

[MenuItem("Tools/EOS Plugin/Build Libraries/Win64")]
[MenuItem("EOS Plugin/Advanced/Build Libraries/Win64")]
public static void BuildLibrariesWin64()
{
#if UNITY_EDITOR_WIN
(new WindowsBuilder64()).BuildNativeCode();
#endif
}

[MenuItem("Tools/EOS Plugin/Build Libraries/Win32", true)]
[MenuItem("Tools/EOS Plugin/Build Libraries/Win64", true)]
[MenuItem("EOS Plugin/Advanced/Build Libraries/Win32", true)]
[MenuItem("EOS Plugin/Advanced/Build Libraries/Win64", true)]
public static bool CanBuildLibrariesWindows()
{
#if UNITY_EDITOR_WIN
Expand All @@ -69,15 +69,15 @@ public static bool CanBuildLibrariesWindows()
#endif
}

[MenuItem("Tools/EOS Plugin/Build Libraries/Mac")]
[MenuItem("EOS Plugin/Advanced/Build Libraries/Mac")]
public static void BuildLibrariesMac()
{
#if UNITY_EDITOR_OSX
Task.Run(BuildMac);
#endif
}

[MenuItem("Tools/EOS Plugin/Build Libraries/Mac", true)]
[MenuItem("EOS Plugin/Advanced/Build Libraries/Mac", true)]
public static bool CanBuildLibrariesMac()
{
#if UNITY_EDITOR_OSX
Expand All @@ -87,15 +87,15 @@ public static bool CanBuildLibrariesMac()
#endif
}

[MenuItem("Tools/EOS Plugin/Build Libraries/Linux")]
[MenuItem("EOS Plugin/Advanced/Build Libraries/Linux")]
public static void BuildLibrariesLinux()
{
#if UNITY_EDITOR_LINUX
Task.Run(BuildLinux);
#endif
}

[MenuItem("Tools/EOS Plugin/Build Libraries/Linux", true)]
[MenuItem("EOS Plugin/Advanced/Build Libraries/Linux", true)]
public static bool CanBuildLibrariesLinux()
{
#if UNITY_EDITOR_LINUX
Expand Down
4 changes: 2 additions & 2 deletions Assets/Plugins/Source/Editor/Utility/SigningUtility.cs
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ namespace PlayEveryWare.EpicOnlineServices.Editor

public class SigningConfigUtility
{
[MenuItem("Tools/EOS Plugin/Sign DLLs")]
[MenuItem("EOS Plugin/Advanced/Sign DLLs")]
static async Task SignAllDLLs()
{
var signConfig = await EpicOnlineServices.Config.GetAsync<SigningConfig>();
Expand All @@ -49,7 +49,7 @@ static async Task SignAllDLLs()
}
}

[MenuItem("Tools/EOS Plugin/Sign DLLs", true)]
[MenuItem("EOS Plugin/Advanced/Sign DLLs", true)]
static async Task<bool> CanSignDLLs()
{
#if UNITY_EDITOR_WIN
Expand Down
2 changes: 1 addition & 1 deletion Assets/Tests/Editor/UnitTestResultsWindow.cs
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ private class TestResultData
// NOTE: This is currently disabled as it is being investigated whether
// there is a more built-in manner in which to inspect unit test
// results.
// [MenuItem("Tools/EOS Plugin/Tests/Result Parser", priority = 11)]
// [MenuItem("EOS Plugin/Tests/Result Parser", priority = 11)]
public static void OpenUnitTestResultsWindow()
{
var window = GetWindow<UnitTestResultsWindow>();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ This document outlines how to export the plugin from source using a command line

## BuildPackage

The following command generates a new `com.playeveryware.eos-[VERSION].tgz` file at the indicated output directory, the same exact way it would if you created a package via Unity Editor `Tools -> EOS Plugin -> Create Package` (and subsequently pressed "Create UPM Package"):
The following command generates a new `com.playeveryware.eos-[VERSION].tgz` file at the indicated output directory, the same exact way it would if you created a package via Unity Editor `EOS Plugin -> Advanced -> Create Package` (and subsequently pressed "Create UPM Package"):

```
Unity.exe -batchMode \
Expand Down
2 changes: 1 addition & 1 deletion com.playeveryware.eos/Documentation~/configure_plugin.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
To function, the plugin needs some information from your EOS project. Be sure to read the Epic Documentation on [getting started](https://dev.epicgames.com/docs/epic-account-services/getting-started?sessionInvalidated=true) with Epic Online Services.

1) Open your Unity project with the integrated EOS Unity Plugin.
2) In the Unity editor, Open ```Tools -> EOS Plugin -> Dev Portal Configuration```.
2) In the Unity editor, Open ```EOS Plugin -> EOS Configuration```.

![EOS Config Menu](/com.playeveryware.eos/Documentation~/images/dev-portal-configuration-editor-menu.png)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ This tool (while a bit rough around the edges) allows for the generation of cust

## Steps to generate a UPM package

1. Go to `Tools -> EOS Plugin -> Create Package`.
1. Go to `EOS Plugin -> Advanced -> Create Package`.

<img src="images/create-package-menu.png" width="300" />

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ Once Unity is open:
1. Go to File ➝ Build Settings
2. Switch the platform to "Dedicated Server."
3. Click on the button labeled "Player Settings..." at the bottom left.
4. Go to Tools ➝ EOS Automated Test Settings
4. Go to EOS Plugin ➝ Advanced ➝ EOS Automated Test Settings
5. Select the previously created `Builds/Server` directory for the "Test Server Directory" field.

## Help! I ran out of disk space!
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ The EOS plugin provides a method of automating EAC installation as part of the b

## Steps
1) Open your Unity project with the plugin installed.
2) Open the editor preferences settings for the plugin, which is avaiable in `Tools -> EOS Plugin -> Configuration`. All EAC options are located under the Tools subheader.
2) Open the editor preferences settings for the plugin, which is avaiable in `EOS Plugin -> Configuration`. All EAC options are located under the EOS Plugin subheader.
3) Enable EAC build steps by checking the `Use EAC` toggle.
4) Set `Path to EAC private key` and `Path to EAC Certificate` to the private and public keys you previously downloaded, respectively.
5) (Recommended) Set `Path to EAC splash image` to a 800x450 PNG that will display in the EAC bootstrapper.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@ Overlay errors are most likely due to not having the overlay installed, this is

Some native functionality are required for platform specific needs.

To get these dependent libraries, use the platform library build tool in the plugin at `Tools > EOS Plugin > Build Library > [Target Platform]`
To get these dependent libraries, use the platform library build tool in the plugin at `EOS Plugin > Advanced > Build Library > [Target Platform]`

Or to install the libraries manually, go to the `lib/NativeCode` folder, find the target platform, and *build the `.sln`* or *`run the makefile`* in the folder.

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@ In the EOS Plugin for Unity project, the provided code with the plugin will give
The Samples come with scenes that demonstrate the usage of the EOS Plugin for Unity's Manager classes for each Sample's domain.

Next, follow [our documentation regarding how to configure the plugin](/com.playeveryware.eos/Documentation~/configure_plugin.md).
Inside of Unity (using the menu bar), navigate to `Tools` -> `EOS Plugin` -> `EOS Configuration`.
Inside of Unity (using the menu bar), navigate to `EOS Plugin` -> `EOS Configuration`.

<p align="center" width="100%"><img src="/com.playeveryware.eos/Documentation~/getting_started_guide/plugin_eosconfiguration.png" alt="The EOS Configuration popup can be filled out using information in the Product Settings page."/><br/>
<em>The EOS Configuration popup can be filled out using information in the Product Settings page.</em></p>
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion com.playeveryware.eos/Documentation~/macOS/README_macOS.md
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ If you want to do that work manually, please refer to the following:

### Building Native Libraries

* Run `Tools -> EOS Plugin -> Build Libraries -> Mac` to build the dylibs needed for the mac build.
* Run `EOS Plugin -> Advanced -> Build Libraries -> Mac` to build the dylibs needed for the mac build.
* Set the path of `make` at `Edit -> Preferences -> EOS Plugin -> Platform Library Build Settings -> Make path`
* By default the path is `/usr/bin/make` or `usr/local/bin/make`
* Alternatively, manually use the makefile in `lib/NativeCode/DynamicLibraryLoaderHelper_macOS/` by opening the terminal at the folder and running the command:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ new plugin can be generated.
These steps are for upgrading the EOS SDK as a maintainer of the repo.
There is a tool that one can use install new versions of the SDK, located under

`Tools -> EOS Plugin -> Install EOS Zip`
`EOS Plugin -> Install EOS Zip`

It requires a JSON description file to direct it where to put the files in the zip,
and a zip file that contains the SDK. The latest version of the SDK can be downloaded from
Expand Down
Loading