diff --git a/.gitignore b/.gitignore index 0210746..c8d6d49 100644 --- a/.gitignore +++ b/.gitignore @@ -3,8 +3,8 @@ [Oo]bj/ [Bb]uild/ [Bb]uilds/ +[Dd]ependencies/ Assets/AssetStoreTools* - # Visual Studio cache directory .vs/ diff --git a/Art Assets/logo.jpg b/Art Assets/logo.jpg new file mode 100644 index 0000000..ca4e79b Binary files /dev/null and b/Art Assets/logo.jpg differ diff --git a/Art Assets/marshmello.jpg b/Art Assets/marshmello.jpg new file mode 100644 index 0000000..39f2f19 Binary files /dev/null and b/Art Assets/marshmello.jpg differ diff --git a/Assets/Editor/UERP/Scripts.meta b/Assets/Editor/UERP/Scripts.meta deleted file mode 100644 index f7f8d06..0000000 --- a/Assets/Editor/UERP/Scripts.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 30b0f9d3f5a074c439f36a4021890316 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Editor/UERP/Scripts/DiscordRpc.cs.meta b/Assets/Editor/UERP/Scripts/DiscordRpc.cs.meta deleted file mode 100644 index 4ad929a..0000000 --- a/Assets/Editor/UERP/Scripts/DiscordRpc.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 181f442a5d4cc854b856dc4a39005ab8 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Editor/UERP/Scripts/UERP.cs.meta b/Assets/Editor/UERP/Scripts/UERP.cs.meta deleted file mode 100644 index e8031e5..0000000 --- a/Assets/Editor/UERP/Scripts/UERP.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 0532178919fd18a4882cbb48842638fa -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/UERP.unitypackage.meta b/Assets/UERP.unitypackage.meta deleted file mode 100644 index 815b60f..0000000 --- a/Assets/UERP.unitypackage.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 384988a6c8a2a934cbb9d8e01f3210ed -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Editor/UERP/Scripts/DiscordRpc.cs b/Native Plugin/DiscordRpc.cs similarity index 100% rename from Assets/Editor/UERP/Scripts/DiscordRpc.cs rename to Native Plugin/DiscordRpc.cs diff --git a/Native Plugin/Properties/AssemblyInfo.cs b/Native Plugin/Properties/AssemblyInfo.cs new file mode 100644 index 0000000..d0e8bf7 --- /dev/null +++ b/Native Plugin/Properties/AssemblyInfo.cs @@ -0,0 +1,36 @@ +using System.Reflection; +using System.Runtime.CompilerServices; +using System.Runtime.InteropServices; + +// General Information about an assembly is controlled through the following +// set of attributes. Change these attribute values to modify the information +// associated with an assembly. +[assembly: AssemblyTitle("UERP")] +[assembly: AssemblyDescription("")] +[assembly: AssemblyConfiguration("")] +[assembly: AssemblyCompany("")] +[assembly: AssemblyProduct("UERP")] +[assembly: AssemblyCopyright("Copyright © 2018")] +[assembly: AssemblyTrademark("")] +[assembly: AssemblyCulture("")] + +// Setting ComVisible to false makes the types in this assembly not visible +// to COM components. If you need to access a type in this assembly from +// COM, set the ComVisible attribute to true on that type. +[assembly: ComVisible(false)] + +// The following GUID is for the ID of the typelib if this project is exposed to COM +[assembly: Guid("5d8afb0d-91ff-4a02-9cb2-950b6831f26c")] + +// Version information for an assembly consists of the following four values: +// +// Major Version +// Minor Version +// Build Number +// Revision +// +// You can specify all the values or you can default the Build and Revision Numbers +// by using the '*' as shown below: +// [assembly: AssemblyVersion("1.0.*")] +[assembly: AssemblyVersion("1.0.0.0")] +[assembly: AssemblyFileVersion("1.0.0.0")] diff --git a/Assets/Editor/UERP/Scripts/UERP.cs b/Native Plugin/UERP.cs similarity index 100% rename from Assets/Editor/UERP/Scripts/UERP.cs rename to Native Plugin/UERP.cs diff --git a/Native Plugin/bin/Release/UERP.dll b/Native Plugin/bin/Release/UERP.dll new file mode 100644 index 0000000..4ddce5d Binary files /dev/null and b/Native Plugin/bin/Release/UERP.dll differ diff --git a/Assets/Editor.meta b/Unity Project/Assets/Editor.meta similarity index 100% rename from Assets/Editor.meta rename to Unity Project/Assets/Editor.meta diff --git a/Assets/Editor/UERP.meta b/Unity Project/Assets/Editor/UERP.meta similarity index 100% rename from Assets/Editor/UERP.meta rename to Unity Project/Assets/Editor/UERP.meta diff --git a/Assets/Editor/UERP/Plugins.meta b/Unity Project/Assets/Editor/UERP/Plugins.meta similarity index 100% rename from Assets/Editor/UERP/Plugins.meta rename to Unity Project/Assets/Editor/UERP/Plugins.meta diff --git a/Unity Project/Assets/Editor/UERP/Plugins/UERP.dll b/Unity Project/Assets/Editor/UERP/Plugins/UERP.dll new file mode 100644 index 0000000..4ddce5d Binary files /dev/null and b/Unity Project/Assets/Editor/UERP/Plugins/UERP.dll differ diff --git a/Unity Project/Assets/Editor/UERP/Plugins/UERP.dll.meta b/Unity Project/Assets/Editor/UERP/Plugins/UERP.dll.meta new file mode 100644 index 0000000..4c26865 --- /dev/null +++ b/Unity Project/Assets/Editor/UERP/Plugins/UERP.dll.meta @@ -0,0 +1,30 @@ +fileFormatVersion: 2 +guid: 884c2f73a0e6fac4d9ee3485030e88c6 +PluginImporter: + externalObjects: {} + serializedVersion: 2 + iconMap: {} + executionOrder: {} + isPreloaded: 0 + isOverridable: 0 + platformData: + - first: + Any: + second: + enabled: 0 + settings: {} + - first: + Editor: Editor + second: + enabled: 1 + settings: + DefaultValueInitialized: true + - first: + Windows Store Apps: WindowsStoreApps + second: + enabled: 0 + settings: + CPU: AnyCPU + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Editor/UERP/Plugins/x86.meta b/Unity Project/Assets/Editor/UERP/Plugins/x86.meta similarity index 100% rename from Assets/Editor/UERP/Plugins/x86.meta rename to Unity Project/Assets/Editor/UERP/Plugins/x86.meta diff --git a/Assets/Editor/UERP/Plugins/x86/discord-rpc.dll b/Unity Project/Assets/Editor/UERP/Plugins/x86/discord-rpc.dll similarity index 100% rename from Assets/Editor/UERP/Plugins/x86/discord-rpc.dll rename to Unity Project/Assets/Editor/UERP/Plugins/x86/discord-rpc.dll diff --git a/Assets/Editor/UERP/Plugins/x86/discord-rpc.dll.meta b/Unity Project/Assets/Editor/UERP/Plugins/x86/discord-rpc.dll.meta similarity index 100% rename from Assets/Editor/UERP/Plugins/x86/discord-rpc.dll.meta rename to Unity Project/Assets/Editor/UERP/Plugins/x86/discord-rpc.dll.meta diff --git a/Assets/Editor/UERP/Plugins/x86_64.meta b/Unity Project/Assets/Editor/UERP/Plugins/x86_64.meta similarity index 100% rename from Assets/Editor/UERP/Plugins/x86_64.meta rename to Unity Project/Assets/Editor/UERP/Plugins/x86_64.meta diff --git a/Assets/Editor/UERP/Plugins/x86_64/discord-rpc.dll b/Unity Project/Assets/Editor/UERP/Plugins/x86_64/discord-rpc.dll similarity index 100% rename from Assets/Editor/UERP/Plugins/x86_64/discord-rpc.dll rename to Unity Project/Assets/Editor/UERP/Plugins/x86_64/discord-rpc.dll diff --git a/Assets/Editor/UERP/Plugins/x86_64/discord-rpc.dll.meta b/Unity Project/Assets/Editor/UERP/Plugins/x86_64/discord-rpc.dll.meta similarity index 100% rename from Assets/Editor/UERP/Plugins/x86_64/discord-rpc.dll.meta rename to Unity Project/Assets/Editor/UERP/Plugins/x86_64/discord-rpc.dll.meta diff --git a/Assets/Editor/UERP/Scenes.meta b/Unity Project/Assets/Editor/UERP/Scenes.meta similarity index 100% rename from Assets/Editor/UERP/Scenes.meta rename to Unity Project/Assets/Editor/UERP/Scenes.meta diff --git a/Assets/Editor/UERP/Scenes/UERP Example Scene.unity b/Unity Project/Assets/Editor/UERP/Scenes/UERP Example Scene.unity similarity index 100% rename from Assets/Editor/UERP/Scenes/UERP Example Scene.unity rename to Unity Project/Assets/Editor/UERP/Scenes/UERP Example Scene.unity diff --git a/Assets/Editor/UERP/Scenes/UERP Example Scene.unity.meta b/Unity Project/Assets/Editor/UERP/Scenes/UERP Example Scene.unity.meta similarity index 100% rename from Assets/Editor/UERP/Scenes/UERP Example Scene.unity.meta rename to Unity Project/Assets/Editor/UERP/Scenes/UERP Example Scene.unity.meta diff --git a/Icons/Logo.png b/Unity Project/Icons/Logo.png similarity index 100% rename from Icons/Logo.png rename to Unity Project/Icons/Logo.png diff --git a/Packages/manifest.json b/Unity Project/Packages/manifest.json similarity index 100% rename from Packages/manifest.json rename to Unity Project/Packages/manifest.json diff --git a/ProjectSettings/AudioManager.asset b/Unity Project/ProjectSettings/AudioManager.asset similarity index 100% rename from ProjectSettings/AudioManager.asset rename to Unity Project/ProjectSettings/AudioManager.asset diff --git a/ProjectSettings/ClusterInputManager.asset b/Unity Project/ProjectSettings/ClusterInputManager.asset similarity index 100% rename from ProjectSettings/ClusterInputManager.asset rename to Unity Project/ProjectSettings/ClusterInputManager.asset diff --git a/ProjectSettings/DynamicsManager.asset b/Unity Project/ProjectSettings/DynamicsManager.asset similarity index 100% rename from ProjectSettings/DynamicsManager.asset rename to Unity Project/ProjectSettings/DynamicsManager.asset diff --git a/ProjectSettings/EditorBuildSettings.asset b/Unity Project/ProjectSettings/EditorBuildSettings.asset similarity index 61% rename from ProjectSettings/EditorBuildSettings.asset rename to Unity Project/ProjectSettings/EditorBuildSettings.asset index ea88784..9bd6d10 100644 --- a/ProjectSettings/EditorBuildSettings.asset +++ b/Unity Project/ProjectSettings/EditorBuildSettings.asset @@ -5,7 +5,7 @@ EditorBuildSettings: m_ObjectHideFlags: 0 serializedVersion: 2 m_Scenes: - - enabled: 1 - path: Assets/Scenes/SampleScene.unity - guid: 99c9720ab356a0642a771bea13969a05 + - enabled: 0 + path: + guid: 00000000000000000000000000000000 m_configObjects: {} diff --git a/ProjectSettings/EditorSettings.asset b/Unity Project/ProjectSettings/EditorSettings.asset similarity index 100% rename from ProjectSettings/EditorSettings.asset rename to Unity Project/ProjectSettings/EditorSettings.asset diff --git a/ProjectSettings/GraphicsSettings.asset b/Unity Project/ProjectSettings/GraphicsSettings.asset similarity index 94% rename from ProjectSettings/GraphicsSettings.asset rename to Unity Project/ProjectSettings/GraphicsSettings.asset index cd1c3d6..1a6b7d1 100644 --- a/ProjectSettings/GraphicsSettings.asset +++ b/Unity Project/ProjectSettings/GraphicsSettings.asset @@ -36,6 +36,8 @@ GraphicsSettings: - {fileID: 10753, guid: 0000000000000000f000000000000000, type: 0} - {fileID: 10770, guid: 0000000000000000f000000000000000, type: 0} - {fileID: 10783, guid: 0000000000000000f000000000000000, type: 0} + - {fileID: 16000, guid: 0000000000000000f000000000000000, type: 0} + - {fileID: 17000, guid: 0000000000000000f000000000000000, type: 0} m_PreloadedShaders: [] m_SpritesDefaultMaterial: {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} diff --git a/ProjectSettings/InputManager.asset b/Unity Project/ProjectSettings/InputManager.asset similarity index 100% rename from ProjectSettings/InputManager.asset rename to Unity Project/ProjectSettings/InputManager.asset diff --git a/ProjectSettings/NavMeshAreas.asset b/Unity Project/ProjectSettings/NavMeshAreas.asset similarity index 100% rename from ProjectSettings/NavMeshAreas.asset rename to Unity Project/ProjectSettings/NavMeshAreas.asset diff --git a/ProjectSettings/NetworkManager.asset b/Unity Project/ProjectSettings/NetworkManager.asset similarity index 100% rename from ProjectSettings/NetworkManager.asset rename to Unity Project/ProjectSettings/NetworkManager.asset diff --git a/ProjectSettings/Physics2DSettings.asset b/Unity Project/ProjectSettings/Physics2DSettings.asset similarity index 100% rename from ProjectSettings/Physics2DSettings.asset rename to Unity Project/ProjectSettings/Physics2DSettings.asset diff --git a/ProjectSettings/PresetManager.asset b/Unity Project/ProjectSettings/PresetManager.asset similarity index 100% rename from ProjectSettings/PresetManager.asset rename to Unity Project/ProjectSettings/PresetManager.asset diff --git a/ProjectSettings/ProjectSettings.asset b/Unity Project/ProjectSettings/ProjectSettings.asset similarity index 100% rename from ProjectSettings/ProjectSettings.asset rename to Unity Project/ProjectSettings/ProjectSettings.asset diff --git a/ProjectSettings/ProjectVersion.txt b/Unity Project/ProjectSettings/ProjectVersion.txt similarity index 100% rename from ProjectSettings/ProjectVersion.txt rename to Unity Project/ProjectSettings/ProjectVersion.txt diff --git a/ProjectSettings/QualitySettings.asset b/Unity Project/ProjectSettings/QualitySettings.asset similarity index 100% rename from ProjectSettings/QualitySettings.asset rename to Unity Project/ProjectSettings/QualitySettings.asset diff --git a/ProjectSettings/TagManager.asset b/Unity Project/ProjectSettings/TagManager.asset similarity index 100% rename from ProjectSettings/TagManager.asset rename to Unity Project/ProjectSettings/TagManager.asset diff --git a/ProjectSettings/TimeManager.asset b/Unity Project/ProjectSettings/TimeManager.asset similarity index 100% rename from ProjectSettings/TimeManager.asset rename to Unity Project/ProjectSettings/TimeManager.asset diff --git a/ProjectSettings/UnityConnectSettings.asset b/Unity Project/ProjectSettings/UnityConnectSettings.asset similarity index 98% rename from ProjectSettings/UnityConnectSettings.asset rename to Unity Project/ProjectSettings/UnityConnectSettings.asset index 3da14d5..1be4600 100644 --- a/ProjectSettings/UnityConnectSettings.asset +++ b/Unity Project/ProjectSettings/UnityConnectSettings.asset @@ -3,7 +3,7 @@ --- !u!310 &1 UnityConnectSettings: m_ObjectHideFlags: 0 - m_Enabled: 0 + m_Enabled: 1 m_TestMode: 0 m_TestEventUrl: m_TestConfigUrl: