Skip to content
Permalink
Browse files

Merge branch 'v.2-dev' of github.com:modio/UnityPlugin into v2.1-dev

# Conflicts:
#	src/Editor/EditorMenuItems.cs
#	src/UI/ExplorerView.cs
#	src/UI/SubscriptionsView.cs
  • Loading branch information...
Jackson Wood
Jackson Wood committed Sep 10, 2019
2 parents 557582e + 6e83344 commit aea04eb070d02202cb82cbd67ab74e3705c10c0d
Showing with 173 additions and 67 deletions.
  1. +1 −1 editor Example/Editor/EditorDialogs.cs
  2. +1 −1 editor Example/Editor/EditorExtensions.cs
  3. +1 −1 editor Example/Editor/EditorImages.cs
  4. +1 −1 editor Example/Editor/LoginWindow.cs
  5. +1 −1 editor Example/Editor/ModProfileEditor.cs
  6. +1 −1 editor Example/Editor/ModProfileViewParts/ModMediaViewPart.cs
  7. +1 −1 editor Example/Editor/ModProfileViewParts/ModProfileInfoViewPart.cs
  8. +1 −1 editor Example/Editor/ModProfileViewParts/_IModProfileViewPart.cs
  9. +2 −2 editor Example/Editor/ModSubmissionToolWindow.cs
  10. +8 −0 editor Example/Editor/Resources.meta
  11. 0 editor Example/Editor/{ → Resources}/_EditorImages [mod.io].asset
  12. 0 editor Example/Editor/{ → Resources}/_EditorImages [mod.io].asset.meta
  13. +2 −2 editor Example/Editor/ScriptableModProfile.cs
  14. +13 −0 mod.io.UnityPlugin.asmdef
  15. +7 −0 package.json
  16. +12 −12 src/Editor/EditorMenuItems.cs
  17. +1 −1 src/PluginSettings.cs
  18. +2 −2 src/UI/Editor/ExplorerSortDropdownEditor.cs
  19. +2 −2 src/UI/Editor/GraphicColorSchemeEditor.cs
  20. +3 −2 src/UI/Editor/ModBrowserEditor.cs
  21. +2 −2 src/UI/Editor/PluginSettingsEditor.cs
  22. +2 −2 src/UI/Editor/ScaleFitterEditor.cs
  23. +2 −2 src/UI/Editor/SelectableColorSchemeEditor.cs
  24. +2 −2 src/UI/Editor/SubscriptionSortDropdownEditor.cs
  25. +2 −2 src/UI/Editor/TouchableEditor.cs
  26. +6 −0 src/UI/ExplorerView.cs
  27. +1 −1 src/UI/ImageRequestManager.cs
  28. +11 −11 src/UI/ModBrowser.cs
  29. +1 −1 src/UI/ModProfileRequestManager.cs
  30. +1 −1 src/UI/ModStatisticsRequestManager.cs
  31. +1 −1 src/UI/ToastAnimationSettings.cs
  32. +3 −0 src/UI/Utility/ClickOffCatcher.cs
  33. +74 −2 src/UI/Utility/UIUtilities.cs
  34. +5 −5 src/UI/ViewManager.cs
  35. +0 −2 src/_Obsolete/UI/ExplorerTagFilterView.cs
  36. +0 −2 src/_Obsolete/UI/ModTagContainer.cs
@@ -5,7 +5,7 @@
using UnityEngine;
using UnityEditor;

namespace ModIO.Editor
namespace ModIO.EditorCode
{
public static class EditorDialogs
{
@@ -4,7 +4,7 @@
using UnityEditor;
using UnityEngine;

namespace ModIO.Editor
namespace ModIO.EditorCode
{
public static class EditorUtilityExtensions
{
@@ -1,6 +1,6 @@
using UnityEngine;

namespace ModIO.Editor
namespace ModIO.EditorCode
{
[CreateAssetMenu(fileName = "New Editor Image Set", menuName = "ModIO/Theming/Editor Image Set")]
public class EditorImages : ScriptableObject
@@ -5,7 +5,7 @@
using UnityEditor;
using UnityEngine;

namespace ModIO.Editor
namespace ModIO.EditorCode
{
public class LoginWindow : EditorWindow
{
@@ -7,7 +7,7 @@
using UnityEditor;
using UnityEngine;

namespace ModIO.Editor
namespace ModIO.EditorCode
{
// NOTE(@jackson): Could do with a beauty-pass
[CustomEditor(typeof(ScriptableModProfile))]
@@ -8,7 +8,7 @@
using UnityEditor;
using UnityEditor.SceneManagement;

namespace ModIO.Editor
namespace ModIO.EditorCode
{
public class ModMediaViewPart : IModProfileViewPart
{
@@ -10,7 +10,7 @@
using UnityEditor;
using UnityEditor.SceneManagement;

namespace ModIO.Editor
namespace ModIO.EditorCode
{
public class ModProfileInfoViewPart : IModProfileViewPart
{
@@ -1,7 +1,7 @@
#if UNITY_EDITOR
using UnityEditor;

namespace ModIO.Editor
namespace ModIO.EditorCode
{
public interface IModProfileViewPart
{
@@ -10,11 +10,11 @@
using UnityEngine;
using UnityEngine.SceneManagement;

namespace ModIO.Editor
namespace ModIO.EditorCode
{
public class ModSubmissionToolWindow : EditorWindow
{
[MenuItem("mod.io/Mod Submission Tool")]
[MenuItem("Tools/mod.io/Mod Submission Tool")]
public static void ShowWindow()
{
GetWindow<ModSubmissionToolWindow>("Submit Mod");

Some generated files are not rendered by default. Learn more.

@@ -4,14 +4,14 @@

using UnityEngine;

namespace ModIO.Editor
namespace ModIO.EditorCode
{
[CreateAssetMenu(fileName = "New Mod Profile", menuName = "ModIO/Create Mod Profile")]
public class ScriptableModProfile : ScriptableObject
{
// ---------[ MENU ITEM ]---------
#if UNITY_EDITOR
[MenuItem("mod.io/Create Mod Profile")]
[MenuItem("Tools/mod.io/Create Mod Profile")]
public static void CreateAssetInstance()
{
ScriptableModProfile asset = ScriptableObject.CreateInstance<ScriptableModProfile>();
@@ -0,0 +1,13 @@
{
"name": "mod.io.UnityPlugin",
"references": [],
"optionalUnityReferences": [],
"includePlatforms": [],
"excludePlatforms": [],
"allowUnsafeCode": false,
"overrideReferences": false,
"precompiledReferences": [],
"autoReferenced": true,
"defineConstraints": [],
"versionDefines": []
}
@@ -0,0 +1,7 @@
{
"name": "mod.io.unityplugin",
"description": "The mod.io Unity Plugin allows game developers to easily control the browsing and installation of mod files in their games. It provides a C# interface built on the Unity Engine to connect to the mod.io API.",
"version": "2.1.0",
"unity": "2017.1",
"displayName": "mod.io Unity Plugin"
}
@@ -5,18 +5,18 @@

using ModIO.UI;

namespace ModIO.Editor
namespace ModIO.EditorCode
{
public static class EditorMenuItems
{
static EditorMenuItems()
{
new MenuItem("mod.io/Edit Settings", false, 0);
new MenuItem("mod.io/Debugging/", false, 1);
new MenuItem("mod.io/Tools/", false, 1);
new MenuItem("Tools/mod.io/Edit Settings", false, 0);
new MenuItem("Tools/mod.io/Debugging/", false, 1);
new MenuItem("Tools/mod.io/Tools/", false, 1);
}

[MenuItem("mod.io/Debugging/Locate Cache...", false)]
[MenuItem("Tools/mod.io/Debugging/Locate Cache...", false)]
public static void LocateCache()
{
if(!System.IO.Directory.Exists(CacheClient.cacheDirectory))
@@ -27,7 +27,7 @@ public static void LocateCache()
EditorUtility.RevealInFinder(CacheClient.cacheDirectory);
}

[MenuItem("mod.io/Debugging/Clear All Cached Data", false)]
[MenuItem("Tools/mod.io/Debugging/Clear All Cached Data", false)]
public static void ClearCache()
{
if(IOUtilities.DeleteDirectory(CacheClient.cacheDirectory))
@@ -36,7 +36,7 @@ public static void ClearCache()
}
}

[MenuItem("mod.io/Debugging/Clear User Data", false)]
[MenuItem("Tools/mod.io/Debugging/Clear User Data", false)]
public static void ClearCachedAuthenticatedUserData()
{
UserAuthenticationData.instance = UserAuthenticationData.NONE;
@@ -45,15 +45,15 @@ public static void ClearCachedAuthenticatedUserData()

Debug.Log("[mod.io] Cached User Data Deleted.");
}
[MenuItem("mod.io/Debugging/Clear Game Data", false)]
[MenuItem("Tools/mod.io/Debugging/Clear Game Data", false)]
public static void ClearCachedGameProfile()
{
if(IOUtilities.DeleteFile(CacheClient.gameProfileFilePath))
{
Debug.Log("[mod.io] Cached Game Data Deleted.");
}
}
[MenuItem("mod.io/Debugging/Clear Mod Data", false)]
[MenuItem("Tools/mod.io/Debugging/Clear Mod Data", false)]
public static void ClearCachedModData()
{
string modDir = IOUtilities.CombinePath(CacheClient.cacheDirectory, "mods");
@@ -62,7 +62,7 @@ public static void ClearCachedModData()
Debug.Log("[mod.io] Cached Mod Data Deleted.");
}
}
[MenuItem("mod.io/Debugging/Clear User Profiles", false)]
[MenuItem("Tools/mod.io/Debugging/Clear User Profiles", false)]
public static void ClearCachedUserProfiles()
{
string usersDir = IOUtilities.CombinePath(CacheClient.cacheDirectory, "users");
@@ -72,7 +72,7 @@ public static void ClearCachedUserProfiles()
}
}

[MenuItem("mod.io/Debugging/Delete Installed Mods", false)]
[MenuItem("Tools/mod.io/Debugging/Delete Installed Mods", false)]
public static void RemoveAllInstalledMods()
{
if(IOUtilities.DeleteDirectory(ModManager.installationDirectory))
@@ -81,7 +81,7 @@ public static void RemoveAllInstalledMods()
}
}

[MenuItem("mod.io/Tools/Update ALL Color Scheme Applicators", false)]
[MenuItem("Tools/mod.io/Update ALL Color Scheme Applicators", false)]
public static void ForceColorSchemeUpdate()
{
Resources.LoadAll<GraphicColorApplicator>(string.Empty);
@@ -122,7 +122,7 @@ private static void LoadDataInstance()

#if UNITY_EDITOR
/// <summary>Locates the PluginSettings asset used by the plugin.</summary>
[UnityEditor.MenuItem("mod.io/Edit Settings", false)]
[UnityEditor.MenuItem("Tools/mod.io/Edit Settings", false)]
public static void FocusAsset()
{
PluginSettings settings = Resources.Load<PluginSettings>(PluginSettings.FILE_PATH);
@@ -5,10 +5,10 @@
using UnityEngine;
using UnityEditor;

namespace ModIO.UI.Editor
namespace ModIO.UI.EditorCode
{
[CustomPropertyDrawer(typeof(ExplorerSortDropdownController.FieldSelectAttribute))]
public class ExplorerSortDropdownFieldSelectDrawer : UnityEditor.PropertyDrawer
public class ExplorerSortDropdownFieldSelectDrawer : PropertyDrawer
{
// ---------[ NESTED DATA-TYPES ]---------
private struct FieldData
@@ -3,10 +3,10 @@
using UnityEngine;
using UnityEditor;

namespace ModIO.UI.Editor
namespace ModIO.UI.EditorCode
{
[CustomEditor(typeof(GraphicColorScheme))]
public class GraphicColorSchemeEditor : UnityEditor.Editor
public class GraphicColorSchemeEditor : Editor
{
public override void OnInspectorGUI()
{
@@ -1,11 +1,12 @@
#if UNITY_EDITOR

using UnityEngine;
using UnityEditor;

namespace ModIO.UI.Editor
namespace ModIO.UI.EditorCode
{
[CustomEditor(typeof(ModBrowser))]
public class ModBrowserEditor : UnityEditor.Editor
public class ModBrowserEditor : Editor
{
public override void OnInspectorGUI()
{
@@ -2,10 +2,10 @@
using UnityEngine;
using UnityEditor;

namespace ModIO.UI.Editor
namespace ModIO.UI.EditorCode
{
[CustomEditor(typeof(PluginSettings))]
public class PluginSettingsEditor : UnityEditor.Editor
public class PluginSettingsEditor : Editor
{
SerializedProperty apiURLProperty;

@@ -2,11 +2,11 @@

using UnityEditor;

namespace ModIO.UI.Editor
namespace ModIO.UI.EditorCode
{
[CustomEditor(typeof(ScaleFitter))]
[CanEditMultipleObjects]
public class ScaleFitterEditor : UnityEditor.Editor
public class ScaleFitterEditor : Editor
{
private void OnEnable()
{
@@ -3,10 +3,10 @@
using UnityEngine;
using UnityEditor;

namespace ModIO.UI.Editor
namespace ModIO.UI.EditorCode
{
[CustomEditor(typeof(SelectableColorScheme))]
public class SelectableColorSchemeEditor : UnityEditor.Editor
public class SelectableColorSchemeEditor : Editor
{
public override void OnInspectorGUI()
{
@@ -5,10 +5,10 @@
using UnityEngine;
using UnityEditor;

namespace ModIO.UI.Editor
namespace ModIO.UI.EditorCode
{
[CustomPropertyDrawer(typeof(SubscriptionSortDropdownController.FieldSelectAttribute))]
public class SubscriptionSortDropdownFieldSelectDrawer : UnityEditor.PropertyDrawer
public class SubscriptionSortDropdownFieldSelectDrawer : PropertyDrawer
{
// ---------[ STATIC DATA ]---------
private static GUIContent[] popupOptions = null;
@@ -2,10 +2,10 @@

using UnityEditor;

namespace ModIO.UI.Editor
namespace ModIO.UI.EditorCode
{
[CustomEditor(typeof(Touchable))]
public class TouchableEditor : UnityEditor.Editor
public class TouchableEditor : Editor
{
public override void OnInspectorGUI(){}
}
@@ -993,6 +993,12 @@ public void UpdateTargetPageDisplay()
this.UpdateTransitionPageDisplay();
}

[Obsolete("Use ExplorerView.ClearAllFilters() instead.")]
public void ClearFilters()
{
ClearAllFilters();
}

[Obsolete("No longer necessary. Event is directly linked to ModBrowser.")]
public event Action<ModView> inspectRequested;
[Obsolete("No longer necessary. Event is directly linked to ModBrowser.")]
@@ -16,7 +16,7 @@ public static ImageRequestManager instance
{
if(ImageRequestManager._instance == null)
{
ImageRequestManager._instance = UIUtilities.FindComponentInScene<ImageRequestManager>(true);
ImageRequestManager._instance = UIUtilities.FindComponentInAllScenes<ImageRequestManager>(true);

if(ImageRequestManager._instance == null)
{

0 comments on commit aea04eb

Please sign in to comment.
You can’t perform that action at this time.