diff --git a/.gitignore b/.gitignore index 1e03893ff..62e8b6632 100644 --- a/.gitignore +++ b/.gitignore @@ -35,6 +35,12 @@ bin/ Mirror/packages .mfractor +# Unity generated +Library +Temp +ProjectSettings +UnityPackageManager +Packages # generated by jekyll for documentation docs/_site diff --git a/Assets/Mirror.meta b/Assets/Mirror.meta new file mode 100644 index 000000000..a7a3dd046 --- /dev/null +++ b/Assets/Mirror.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 5cf8eb36be0834b3da408c694a41cb88 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Mirror/Editor.meta b/Assets/Mirror/Editor.meta new file mode 100644 index 000000000..f679511ca --- /dev/null +++ b/Assets/Mirror/Editor.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 2539267b6934a4026a505690a1e1eda2 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Mirror/Editor/NetworkAnimatorEditor.cs b/Assets/Mirror/Editor/NetworkAnimatorEditor.cs similarity index 100% rename from Mirror/Editor/NetworkAnimatorEditor.cs rename to Assets/Mirror/Editor/NetworkAnimatorEditor.cs diff --git a/Assets/Mirror/Editor/NetworkAnimatorEditor.cs.meta b/Assets/Mirror/Editor/NetworkAnimatorEditor.cs.meta new file mode 100644 index 000000000..1b537bc42 --- /dev/null +++ b/Assets/Mirror/Editor/NetworkAnimatorEditor.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 9589e903d4e98490fb1157762a307fd7 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Mirror/Editor/NetworkBehaviourInspector.cs b/Assets/Mirror/Editor/NetworkBehaviourInspector.cs similarity index 100% rename from Mirror/Editor/NetworkBehaviourInspector.cs rename to Assets/Mirror/Editor/NetworkBehaviourInspector.cs diff --git a/Assets/Mirror/Editor/NetworkBehaviourInspector.cs.meta b/Assets/Mirror/Editor/NetworkBehaviourInspector.cs.meta new file mode 100644 index 000000000..78d9fa8f6 --- /dev/null +++ b/Assets/Mirror/Editor/NetworkBehaviourInspector.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: f02853db46b6346e4866594a96c3b0e7 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Mirror/Editor/NetworkIdentityEditor.cs b/Assets/Mirror/Editor/NetworkIdentityEditor.cs similarity index 100% rename from Mirror/Editor/NetworkIdentityEditor.cs rename to Assets/Mirror/Editor/NetworkIdentityEditor.cs diff --git a/Assets/Mirror/Editor/NetworkIdentityEditor.cs.meta b/Assets/Mirror/Editor/NetworkIdentityEditor.cs.meta new file mode 100644 index 000000000..cb4a5cf55 --- /dev/null +++ b/Assets/Mirror/Editor/NetworkIdentityEditor.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 1b6e3680cc14b4769bff378e5dbc3544 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Mirror/Editor/NetworkInformationPreview.cs b/Assets/Mirror/Editor/NetworkInformationPreview.cs similarity index 100% rename from Mirror/Editor/NetworkInformationPreview.cs rename to Assets/Mirror/Editor/NetworkInformationPreview.cs diff --git a/Assets/Mirror/Editor/NetworkInformationPreview.cs.meta b/Assets/Mirror/Editor/NetworkInformationPreview.cs.meta new file mode 100644 index 000000000..9bf2de4d1 --- /dev/null +++ b/Assets/Mirror/Editor/NetworkInformationPreview.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 51a99294efe134232932c34606737356 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Mirror/Editor/NetworkManagerEditor.cs b/Assets/Mirror/Editor/NetworkManagerEditor.cs similarity index 100% rename from Mirror/Editor/NetworkManagerEditor.cs rename to Assets/Mirror/Editor/NetworkManagerEditor.cs diff --git a/Assets/Mirror/Editor/NetworkManagerEditor.cs.meta b/Assets/Mirror/Editor/NetworkManagerEditor.cs.meta new file mode 100644 index 000000000..7fe8dbc8b --- /dev/null +++ b/Assets/Mirror/Editor/NetworkManagerEditor.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 519712eb07f7a44039df57664811c2c5 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Mirror/Editor/NetworkScenePostProcess.cs b/Assets/Mirror/Editor/NetworkScenePostProcess.cs similarity index 100% rename from Mirror/Editor/NetworkScenePostProcess.cs rename to Assets/Mirror/Editor/NetworkScenePostProcess.cs diff --git a/Assets/Mirror/Editor/NetworkScenePostProcess.cs.meta b/Assets/Mirror/Editor/NetworkScenePostProcess.cs.meta new file mode 100644 index 000000000..b567cc954 --- /dev/null +++ b/Assets/Mirror/Editor/NetworkScenePostProcess.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: a3ec1c414d821444a9e77f18a2c130ea +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Mirror/Runtime.meta b/Assets/Mirror/Runtime.meta new file mode 100644 index 000000000..85ee3eb85 --- /dev/null +++ b/Assets/Mirror/Runtime.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 9f4328ccc5f724e45afe2215d275b5d5 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Mirror/Runtime/ClientScene.cs b/Assets/Mirror/Runtime/ClientScene.cs similarity index 100% rename from Mirror/Runtime/ClientScene.cs rename to Assets/Mirror/Runtime/ClientScene.cs diff --git a/Assets/Mirror/Runtime/ClientScene.cs.meta b/Assets/Mirror/Runtime/ClientScene.cs.meta new file mode 100644 index 000000000..c4f3a093c --- /dev/null +++ b/Assets/Mirror/Runtime/ClientScene.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 96fc7967f813e4960b9119d7c2118494 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Mirror/Runtime/CustomAttributes.cs b/Assets/Mirror/Runtime/CustomAttributes.cs similarity index 100% rename from Mirror/Runtime/CustomAttributes.cs rename to Assets/Mirror/Runtime/CustomAttributes.cs diff --git a/Assets/Mirror/Runtime/CustomAttributes.cs.meta b/Assets/Mirror/Runtime/CustomAttributes.cs.meta new file mode 100644 index 000000000..22a1db2cc --- /dev/null +++ b/Assets/Mirror/Runtime/CustomAttributes.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: c04c722ee2ffd49c8a56ab33667b10b0 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Mirror/Runtime/DotNetCompatibility.cs b/Assets/Mirror/Runtime/DotNetCompatibility.cs similarity index 100% rename from Mirror/Runtime/DotNetCompatibility.cs rename to Assets/Mirror/Runtime/DotNetCompatibility.cs diff --git a/Assets/Mirror/Runtime/DotNetCompatibility.cs.meta b/Assets/Mirror/Runtime/DotNetCompatibility.cs.meta new file mode 100644 index 000000000..874219760 --- /dev/null +++ b/Assets/Mirror/Runtime/DotNetCompatibility.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: b307f850ccbbe450295acf24d70e5c28 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Mirror/Runtime/ExponentialMovingAverage.cs b/Assets/Mirror/Runtime/ExponentialMovingAverage.cs similarity index 100% rename from Mirror/Runtime/ExponentialMovingAverage.cs rename to Assets/Mirror/Runtime/ExponentialMovingAverage.cs diff --git a/Assets/Mirror/Runtime/ExponentialMovingAverage.cs.meta b/Assets/Mirror/Runtime/ExponentialMovingAverage.cs.meta new file mode 100644 index 000000000..5ce305562 --- /dev/null +++ b/Assets/Mirror/Runtime/ExponentialMovingAverage.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 05e858cbaa54b4ce4a48c8c7f50c1914 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Mirror/Runtime/Extensions.cs b/Assets/Mirror/Runtime/Extensions.cs similarity index 100% rename from Mirror/Runtime/Extensions.cs rename to Assets/Mirror/Runtime/Extensions.cs diff --git a/Assets/Mirror/Runtime/Extensions.cs.meta b/Assets/Mirror/Runtime/Extensions.cs.meta new file mode 100644 index 000000000..6198581cd --- /dev/null +++ b/Assets/Mirror/Runtime/Extensions.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 733f020f9b76d453da841089579fd7a7 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Mirror/Runtime/LocalClient.cs b/Assets/Mirror/Runtime/LocalClient.cs similarity index 100% rename from Mirror/Runtime/LocalClient.cs rename to Assets/Mirror/Runtime/LocalClient.cs diff --git a/Assets/Mirror/Runtime/LocalClient.cs.meta b/Assets/Mirror/Runtime/LocalClient.cs.meta new file mode 100644 index 000000000..6c073e640 --- /dev/null +++ b/Assets/Mirror/Runtime/LocalClient.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 5c4d04450e91c438385de7300abef1b6 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Mirror/Runtime/LocalConnections.cs b/Assets/Mirror/Runtime/LocalConnections.cs similarity index 100% rename from Mirror/Runtime/LocalConnections.cs rename to Assets/Mirror/Runtime/LocalConnections.cs diff --git a/Assets/Mirror/Runtime/LocalConnections.cs.meta b/Assets/Mirror/Runtime/LocalConnections.cs.meta new file mode 100644 index 000000000..2a332c421 --- /dev/null +++ b/Assets/Mirror/Runtime/LocalConnections.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: a88758df7db2043d6a9d926e0b6d4191 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Mirror/Runtime/LogFilter.cs b/Assets/Mirror/Runtime/LogFilter.cs similarity index 100% rename from Mirror/Runtime/LogFilter.cs rename to Assets/Mirror/Runtime/LogFilter.cs diff --git a/Assets/Mirror/Runtime/LogFilter.cs.meta b/Assets/Mirror/Runtime/LogFilter.cs.meta new file mode 100644 index 000000000..41cab5059 --- /dev/null +++ b/Assets/Mirror/Runtime/LogFilter.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: f6928b080072948f7b2909b4025fcc79 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Mirror/Runtime/Messages.cs b/Assets/Mirror/Runtime/Messages.cs similarity index 100% rename from Mirror/Runtime/Messages.cs rename to Assets/Mirror/Runtime/Messages.cs diff --git a/Assets/Mirror/Runtime/Messages.cs.meta b/Assets/Mirror/Runtime/Messages.cs.meta new file mode 100644 index 000000000..9afe21b8e --- /dev/null +++ b/Assets/Mirror/Runtime/Messages.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 938f6f28a6c5b48a0bbd7782342d763b +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Mirror/Runtime/Mirror.asmdef b/Assets/Mirror/Runtime/Mirror.asmdef new file mode 100644 index 000000000..4f3dbbd32 --- /dev/null +++ b/Assets/Mirror/Runtime/Mirror.asmdef @@ -0,0 +1,8 @@ +{ + "name": "Mirror", + "references": [], + "optionalUnityReferences": [], + "includePlatforms": [], + "excludePlatforms": [], + "allowUnsafeCode": false +} \ No newline at end of file diff --git a/Assets/Mirror/Runtime/Mirror.asmdef.meta b/Assets/Mirror/Runtime/Mirror.asmdef.meta new file mode 100644 index 000000000..202009bd3 --- /dev/null +++ b/Assets/Mirror/Runtime/Mirror.asmdef.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 30817c1a0e6d646d99c048fc403f5979 +AssemblyDefinitionImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Mirror/Runtime/NetworkAnimator.cs b/Assets/Mirror/Runtime/NetworkAnimator.cs similarity index 100% rename from Mirror/Runtime/NetworkAnimator.cs rename to Assets/Mirror/Runtime/NetworkAnimator.cs diff --git a/Assets/Mirror/Runtime/NetworkAnimator.cs.meta b/Assets/Mirror/Runtime/NetworkAnimator.cs.meta new file mode 100644 index 000000000..5fb857694 --- /dev/null +++ b/Assets/Mirror/Runtime/NetworkAnimator.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 7f6f3bf89aa97405989c802ba270f815 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Mirror/Runtime/NetworkBehaviour.cs b/Assets/Mirror/Runtime/NetworkBehaviour.cs similarity index 100% rename from Mirror/Runtime/NetworkBehaviour.cs rename to Assets/Mirror/Runtime/NetworkBehaviour.cs diff --git a/Assets/Mirror/Runtime/NetworkBehaviour.cs.meta b/Assets/Mirror/Runtime/NetworkBehaviour.cs.meta new file mode 100644 index 000000000..84e619d45 --- /dev/null +++ b/Assets/Mirror/Runtime/NetworkBehaviour.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 655ee8cba98594f70880da5cc4dc442d +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Mirror/Runtime/NetworkClient.cs b/Assets/Mirror/Runtime/NetworkClient.cs similarity index 100% rename from Mirror/Runtime/NetworkClient.cs rename to Assets/Mirror/Runtime/NetworkClient.cs diff --git a/Assets/Mirror/Runtime/NetworkClient.cs.meta b/Assets/Mirror/Runtime/NetworkClient.cs.meta new file mode 100644 index 000000000..b43b514f7 --- /dev/null +++ b/Assets/Mirror/Runtime/NetworkClient.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: abe6be14204d94224a3e7cd99dd2ea73 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Mirror/Runtime/NetworkConnection.cs b/Assets/Mirror/Runtime/NetworkConnection.cs similarity index 100% rename from Mirror/Runtime/NetworkConnection.cs rename to Assets/Mirror/Runtime/NetworkConnection.cs diff --git a/Assets/Mirror/Runtime/NetworkConnection.cs.meta b/Assets/Mirror/Runtime/NetworkConnection.cs.meta new file mode 100644 index 000000000..3688d9c1b --- /dev/null +++ b/Assets/Mirror/Runtime/NetworkConnection.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 11ea41db366624109af1f0834bcdde2f +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Mirror/Runtime/NetworkIdentity.cs b/Assets/Mirror/Runtime/NetworkIdentity.cs similarity index 100% rename from Mirror/Runtime/NetworkIdentity.cs rename to Assets/Mirror/Runtime/NetworkIdentity.cs diff --git a/Assets/Mirror/Runtime/NetworkIdentity.cs.meta b/Assets/Mirror/Runtime/NetworkIdentity.cs.meta new file mode 100644 index 000000000..85a800701 --- /dev/null +++ b/Assets/Mirror/Runtime/NetworkIdentity.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 9b91ecbcc199f4492b9a91e820070131 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Mirror/Runtime/NetworkManager.cs b/Assets/Mirror/Runtime/NetworkManager.cs similarity index 100% rename from Mirror/Runtime/NetworkManager.cs rename to Assets/Mirror/Runtime/NetworkManager.cs diff --git a/Assets/Mirror/Runtime/NetworkManager.cs.meta b/Assets/Mirror/Runtime/NetworkManager.cs.meta new file mode 100644 index 000000000..3ca7c5576 --- /dev/null +++ b/Assets/Mirror/Runtime/NetworkManager.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 8aab4c8111b7c411b9b92cf3dbc5bd4e +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Mirror/Runtime/NetworkManagerHUD.cs b/Assets/Mirror/Runtime/NetworkManagerHUD.cs similarity index 100% rename from Mirror/Runtime/NetworkManagerHUD.cs rename to Assets/Mirror/Runtime/NetworkManagerHUD.cs diff --git a/Assets/Mirror/Runtime/NetworkManagerHUD.cs.meta b/Assets/Mirror/Runtime/NetworkManagerHUD.cs.meta new file mode 100644 index 000000000..fa08c3d3a --- /dev/null +++ b/Assets/Mirror/Runtime/NetworkManagerHUD.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 6442dc8070ceb41f094e44de0bf87274 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Mirror/Runtime/NetworkProximityChecker.cs b/Assets/Mirror/Runtime/NetworkProximityChecker.cs similarity index 100% rename from Mirror/Runtime/NetworkProximityChecker.cs rename to Assets/Mirror/Runtime/NetworkProximityChecker.cs diff --git a/Assets/Mirror/Runtime/NetworkProximityChecker.cs.meta b/Assets/Mirror/Runtime/NetworkProximityChecker.cs.meta new file mode 100644 index 000000000..79e50e8ae --- /dev/null +++ b/Assets/Mirror/Runtime/NetworkProximityChecker.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 1731d8de2d0c84333b08ebe1e79f4118 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Mirror/Runtime/NetworkReader.cs b/Assets/Mirror/Runtime/NetworkReader.cs similarity index 100% rename from Mirror/Runtime/NetworkReader.cs rename to Assets/Mirror/Runtime/NetworkReader.cs diff --git a/Assets/Mirror/Runtime/NetworkReader.cs.meta b/Assets/Mirror/Runtime/NetworkReader.cs.meta new file mode 100644 index 000000000..f5b0c1ed8 --- /dev/null +++ b/Assets/Mirror/Runtime/NetworkReader.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 1610f05ec5bd14d6882e689f7372596a +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Mirror/Runtime/NetworkServer.cs b/Assets/Mirror/Runtime/NetworkServer.cs similarity index 100% rename from Mirror/Runtime/NetworkServer.cs rename to Assets/Mirror/Runtime/NetworkServer.cs diff --git a/Assets/Mirror/Runtime/NetworkServer.cs.meta b/Assets/Mirror/Runtime/NetworkServer.cs.meta new file mode 100644 index 000000000..4d44a2622 --- /dev/null +++ b/Assets/Mirror/Runtime/NetworkServer.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: a5f5ec068f5604c32b160bc49ee97b75 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Mirror/Runtime/NetworkStartPosition.cs b/Assets/Mirror/Runtime/NetworkStartPosition.cs similarity index 100% rename from Mirror/Runtime/NetworkStartPosition.cs rename to Assets/Mirror/Runtime/NetworkStartPosition.cs diff --git a/Assets/Mirror/Runtime/NetworkStartPosition.cs.meta b/Assets/Mirror/Runtime/NetworkStartPosition.cs.meta new file mode 100644 index 000000000..97f5445df --- /dev/null +++ b/Assets/Mirror/Runtime/NetworkStartPosition.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 41f84591ce72545258ea98cb7518d8b9 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Mirror/Runtime/NetworkTime.cs b/Assets/Mirror/Runtime/NetworkTime.cs similarity index 100% rename from Mirror/Runtime/NetworkTime.cs rename to Assets/Mirror/Runtime/NetworkTime.cs diff --git a/Assets/Mirror/Runtime/NetworkTime.cs.meta b/Assets/Mirror/Runtime/NetworkTime.cs.meta new file mode 100644 index 000000000..f5c2b6c91 --- /dev/null +++ b/Assets/Mirror/Runtime/NetworkTime.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 09a0c241fc4a5496dbf4a0ab6e9a312c +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Mirror/Runtime/NetworkTransform.cs b/Assets/Mirror/Runtime/NetworkTransform.cs similarity index 100% rename from Mirror/Runtime/NetworkTransform.cs rename to Assets/Mirror/Runtime/NetworkTransform.cs diff --git a/Assets/Mirror/Runtime/NetworkTransform.cs.meta b/Assets/Mirror/Runtime/NetworkTransform.cs.meta new file mode 100644 index 000000000..d1af9ece3 --- /dev/null +++ b/Assets/Mirror/Runtime/NetworkTransform.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 2f74aedd71d9a4f55b3ce499326d45fb +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Mirror/Runtime/NetworkTransformBase.cs b/Assets/Mirror/Runtime/NetworkTransformBase.cs similarity index 100% rename from Mirror/Runtime/NetworkTransformBase.cs rename to Assets/Mirror/Runtime/NetworkTransformBase.cs diff --git a/Assets/Mirror/Runtime/NetworkTransformBase.cs.meta b/Assets/Mirror/Runtime/NetworkTransformBase.cs.meta new file mode 100644 index 000000000..2c3c3e1d6 --- /dev/null +++ b/Assets/Mirror/Runtime/NetworkTransformBase.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 2e77294d8ccbc4e7cb8ca2bd0d3e99ea +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Mirror/Runtime/NetworkTransformChild.cs b/Assets/Mirror/Runtime/NetworkTransformChild.cs similarity index 100% rename from Mirror/Runtime/NetworkTransformChild.cs rename to Assets/Mirror/Runtime/NetworkTransformChild.cs diff --git a/Assets/Mirror/Runtime/NetworkTransformChild.cs.meta b/Assets/Mirror/Runtime/NetworkTransformChild.cs.meta new file mode 100644 index 000000000..9c068f2ca --- /dev/null +++ b/Assets/Mirror/Runtime/NetworkTransformChild.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 734b48bea0b204338958ee3d885e11f0 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Mirror/Runtime/NetworkWriter.cs b/Assets/Mirror/Runtime/NetworkWriter.cs similarity index 100% rename from Mirror/Runtime/NetworkWriter.cs rename to Assets/Mirror/Runtime/NetworkWriter.cs diff --git a/Assets/Mirror/Runtime/NetworkWriter.cs.meta b/Assets/Mirror/Runtime/NetworkWriter.cs.meta new file mode 100644 index 000000000..240f74a69 --- /dev/null +++ b/Assets/Mirror/Runtime/NetworkWriter.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 48d2207bcef1f4477b624725f075f9bd +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Mirror/Runtime/SyncList.cs b/Assets/Mirror/Runtime/SyncList.cs similarity index 100% rename from Mirror/Runtime/SyncList.cs rename to Assets/Mirror/Runtime/SyncList.cs diff --git a/Assets/Mirror/Runtime/SyncList.cs.meta b/Assets/Mirror/Runtime/SyncList.cs.meta new file mode 100644 index 000000000..9b9387d4c --- /dev/null +++ b/Assets/Mirror/Runtime/SyncList.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 744fc71f748fe40d5940e04bf42b29f3 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Mirror/Runtime/SyncObject.cs b/Assets/Mirror/Runtime/SyncObject.cs similarity index 100% rename from Mirror/Runtime/SyncObject.cs rename to Assets/Mirror/Runtime/SyncObject.cs diff --git a/Assets/Mirror/Runtime/SyncObject.cs.meta b/Assets/Mirror/Runtime/SyncObject.cs.meta new file mode 100644 index 000000000..a67485de7 --- /dev/null +++ b/Assets/Mirror/Runtime/SyncObject.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: ae226d17a0c844041aa24cc2c023dd49 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Mirror/Runtime/Transport.meta b/Assets/Mirror/Runtime/Transport.meta new file mode 100644 index 000000000..fc29442a6 --- /dev/null +++ b/Assets/Mirror/Runtime/Transport.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 7825d46cd73fe47938869eb5427b40fa +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Mirror/Runtime/Transport/LLAPITransport.cs b/Assets/Mirror/Runtime/Transport/LLAPITransport.cs similarity index 100% rename from Mirror/Runtime/Transport/LLAPITransport.cs rename to Assets/Mirror/Runtime/Transport/LLAPITransport.cs diff --git a/Assets/Mirror/Runtime/Transport/LLAPITransport.cs.meta b/Assets/Mirror/Runtime/Transport/LLAPITransport.cs.meta new file mode 100644 index 000000000..2ab412010 --- /dev/null +++ b/Assets/Mirror/Runtime/Transport/LLAPITransport.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: d333dcc8c7bd34f35896f5a9b4c9e759 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Mirror/Runtime/Transport/Telepathy.1.0.252.meta b/Assets/Mirror/Runtime/Transport/Telepathy.1.0.252.meta new file mode 100644 index 000000000..ede2d0e4d --- /dev/null +++ b/Assets/Mirror/Runtime/Transport/Telepathy.1.0.252.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 552b3d8382916438d81fe7f39e18db72 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Mirror/Runtime/Transport/Telepathy.1.0.252/.signature.p7s b/Assets/Mirror/Runtime/Transport/Telepathy.1.0.252/.signature.p7s new file mode 100755 index 000000000..d7349fe55 Binary files /dev/null and b/Assets/Mirror/Runtime/Transport/Telepathy.1.0.252/.signature.p7s differ diff --git a/Assets/Mirror/Runtime/Transport/Telepathy.1.0.252/lib.meta b/Assets/Mirror/Runtime/Transport/Telepathy.1.0.252/lib.meta new file mode 100644 index 000000000..3458934c5 --- /dev/null +++ b/Assets/Mirror/Runtime/Transport/Telepathy.1.0.252/lib.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 8a8addbb8ba864e3ba92bb77c8e4b1b6 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Mirror/Runtime/Transport/Telepathy.1.0.252/lib/net35.meta b/Assets/Mirror/Runtime/Transport/Telepathy.1.0.252/lib/net35.meta new file mode 100644 index 000000000..7f1caf59e --- /dev/null +++ b/Assets/Mirror/Runtime/Transport/Telepathy.1.0.252/lib/net35.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 22ddcc765443b445088d60840472a9f0 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Mirror/Runtime/Transport/Telepathy.1.0.252/lib/net35/Telepathy.dll b/Assets/Mirror/Runtime/Transport/Telepathy.1.0.252/lib/net35/Telepathy.dll new file mode 100755 index 000000000..4bf6c486c Binary files /dev/null and b/Assets/Mirror/Runtime/Transport/Telepathy.1.0.252/lib/net35/Telepathy.dll differ diff --git a/Assets/Mirror/Runtime/Transport/Telepathy.1.0.252/lib/net35/Telepathy.dll.meta b/Assets/Mirror/Runtime/Transport/Telepathy.1.0.252/lib/net35/Telepathy.dll.meta new file mode 100644 index 000000000..57801d0e7 --- /dev/null +++ b/Assets/Mirror/Runtime/Transport/Telepathy.1.0.252/lib/net35/Telepathy.dll.meta @@ -0,0 +1,30 @@ +fileFormatVersion: 2 +guid: a0dd61e391eb844adb47df6dd4638c61 +PluginImporter: + externalObjects: {} + serializedVersion: 2 + iconMap: {} + executionOrder: {} + isPreloaded: 0 + isOverridable: 0 + platformData: + - first: + Any: + second: + enabled: 1 + settings: {} + - first: + Editor: Editor + second: + enabled: 0 + settings: + DefaultValueInitialized: true + - first: + Windows Store Apps: WindowsStoreApps + second: + enabled: 0 + settings: + CPU: AnyCPU + userData: + assetBundleName: + assetBundleVariant: diff --git a/Mirror/Runtime/Transport/TelepathyTransport.cs b/Assets/Mirror/Runtime/Transport/TelepathyTransport.cs similarity index 100% rename from Mirror/Runtime/Transport/TelepathyTransport.cs rename to Assets/Mirror/Runtime/Transport/TelepathyTransport.cs diff --git a/Assets/Mirror/Runtime/Transport/TelepathyTransport.cs.meta b/Assets/Mirror/Runtime/Transport/TelepathyTransport.cs.meta new file mode 100644 index 000000000..e66e10d41 --- /dev/null +++ b/Assets/Mirror/Runtime/Transport/TelepathyTransport.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: c7424c1070fad4ba2a7a96b02fbeb4bb +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Mirror/Runtime/Transport/TelepathyWebsocketsMultiplexTransport.cs b/Assets/Mirror/Runtime/Transport/TelepathyWebsocketsMultiplexTransport.cs similarity index 100% rename from Mirror/Runtime/Transport/TelepathyWebsocketsMultiplexTransport.cs rename to Assets/Mirror/Runtime/Transport/TelepathyWebsocketsMultiplexTransport.cs diff --git a/Assets/Mirror/Runtime/Transport/TelepathyWebsocketsMultiplexTransport.cs.meta b/Assets/Mirror/Runtime/Transport/TelepathyWebsocketsMultiplexTransport.cs.meta new file mode 100644 index 000000000..7cc514482 --- /dev/null +++ b/Assets/Mirror/Runtime/Transport/TelepathyWebsocketsMultiplexTransport.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 62cd2781a40204172b2624d9daf0b00a +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Mirror/Runtime/Transport/Transport.cs b/Assets/Mirror/Runtime/Transport/Transport.cs similarity index 100% rename from Mirror/Runtime/Transport/Transport.cs rename to Assets/Mirror/Runtime/Transport/Transport.cs diff --git a/Assets/Mirror/Runtime/Transport/Transport.cs.meta b/Assets/Mirror/Runtime/Transport/Transport.cs.meta new file mode 100644 index 000000000..2d451cfee --- /dev/null +++ b/Assets/Mirror/Runtime/Transport/Transport.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: cfffcac25d6d64ced9de620159e221b8 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Mirror/Runtime/UNetwork.cs b/Assets/Mirror/Runtime/UNetwork.cs similarity index 100% rename from Mirror/Runtime/UNetwork.cs rename to Assets/Mirror/Runtime/UNetwork.cs diff --git a/Assets/Mirror/Runtime/UNetwork.cs.meta b/Assets/Mirror/Runtime/UNetwork.cs.meta new file mode 100644 index 000000000..0ee79ed57 --- /dev/null +++ b/Assets/Mirror/Runtime/UNetwork.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: b530ce39098b54374a29ad308c8e4554 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Mirror/Tests.meta b/Assets/Mirror/Tests.meta new file mode 100644 index 000000000..a519cf7ae --- /dev/null +++ b/Assets/Mirror/Tests.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 4de157ac7e1594c758ce6dc401674f5c +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Mirror/Tests/ExponentialMovingAverageTest.cs b/Assets/Mirror/Tests/ExponentialMovingAverageTest.cs similarity index 100% rename from Mirror/Tests/ExponentialMovingAverageTest.cs rename to Assets/Mirror/Tests/ExponentialMovingAverageTest.cs diff --git a/Assets/Mirror/Tests/ExponentialMovingAverageTest.cs.meta b/Assets/Mirror/Tests/ExponentialMovingAverageTest.cs.meta new file mode 100644 index 000000000..535f33d77 --- /dev/null +++ b/Assets/Mirror/Tests/ExponentialMovingAverageTest.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 8e3f2ecadd13149f29cd3e83ef6a4bff +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Mirror/Tests/Mirror.Tests.asmdef b/Assets/Mirror/Tests/Mirror.Tests.asmdef new file mode 100644 index 000000000..ea484b24b --- /dev/null +++ b/Assets/Mirror/Tests/Mirror.Tests.asmdef @@ -0,0 +1,14 @@ +{ + "name": "Mirror.Tests", + "references": [ + "Mirror" + ], + "optionalUnityReferences": [ + "TestAssemblies" + ], + "includePlatforms": [ + "Editor" + ], + "excludePlatforms": [], + "allowUnsafeCode": false +} \ No newline at end of file diff --git a/Assets/Mirror/Tests/Mirror.Tests.asmdef.meta b/Assets/Mirror/Tests/Mirror.Tests.asmdef.meta new file mode 100644 index 000000000..4f2302303 --- /dev/null +++ b/Assets/Mirror/Tests/Mirror.Tests.asmdef.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 8b489029f75e64a7bbf6918bf1a49e39 +AssemblyDefinitionImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Mirror/Tests/NetworkWriterTest.cs b/Assets/Mirror/Tests/NetworkWriterTest.cs similarity index 100% rename from Mirror/Tests/NetworkWriterTest.cs rename to Assets/Mirror/Tests/NetworkWriterTest.cs diff --git a/Assets/Mirror/Tests/NetworkWriterTest.cs.meta b/Assets/Mirror/Tests/NetworkWriterTest.cs.meta new file mode 100644 index 000000000..394706e04 --- /dev/null +++ b/Assets/Mirror/Tests/NetworkWriterTest.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 9f7c59e9071cf4a64a9bd207465e3f1b +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Mirror/Tests/SyncListTest.cs b/Assets/Mirror/Tests/SyncListTest.cs similarity index 100% rename from Mirror/Tests/SyncListTest.cs rename to Assets/Mirror/Tests/SyncListTest.cs diff --git a/Assets/Mirror/Tests/SyncListTest.cs.meta b/Assets/Mirror/Tests/SyncListTest.cs.meta new file mode 100644 index 000000000..9b55701a4 --- /dev/null +++ b/Assets/Mirror/Tests/SyncListTest.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: a937d4274ff484d769209f2e0b0c1d8a +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Mirror/Tests/UtilsTest.cs b/Assets/Mirror/Tests/UtilsTest.cs similarity index 100% rename from Mirror/Tests/UtilsTest.cs rename to Assets/Mirror/Tests/UtilsTest.cs diff --git a/Assets/Mirror/Tests/UtilsTest.cs.meta b/Assets/Mirror/Tests/UtilsTest.cs.meta new file mode 100644 index 000000000..b0bff53a2 --- /dev/null +++ b/Assets/Mirror/Tests/UtilsTest.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: bc969b77de81645489d79ad1100a72a1 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Mirror/Weaver.meta b/Assets/Mirror/Weaver.meta new file mode 100644 index 000000000..665bc1582 --- /dev/null +++ b/Assets/Mirror/Weaver.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 1aefe424643e1419d903bf5679625c50 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Mirror/Weaver/Cecil.meta b/Assets/Mirror/Weaver/Cecil.meta new file mode 100644 index 000000000..a12486250 --- /dev/null +++ b/Assets/Mirror/Weaver/Cecil.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 55ebd56fe4ccf4cffaf3bbdfbc9c01d6 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Mirror/Weaver/Cecil/Unity.Cecil.Mdb.dll b/Assets/Mirror/Weaver/Cecil/Unity.Cecil.Mdb.dll new file mode 100644 index 000000000..6f856f746 Binary files /dev/null and b/Assets/Mirror/Weaver/Cecil/Unity.Cecil.Mdb.dll differ diff --git a/Assets/Mirror/Weaver/Cecil/Unity.Cecil.Mdb.dll.meta b/Assets/Mirror/Weaver/Cecil/Unity.Cecil.Mdb.dll.meta new file mode 100644 index 000000000..d329bc8aa --- /dev/null +++ b/Assets/Mirror/Weaver/Cecil/Unity.Cecil.Mdb.dll.meta @@ -0,0 +1,114 @@ +fileFormatVersion: 2 +guid: deac9369ec8ac41a9af0841f959544f5 +PluginImporter: + externalObjects: {} + serializedVersion: 2 + iconMap: {} + executionOrder: {} + isPreloaded: 0 + isOverridable: 0 + platformData: + - first: + '': Any + second: + enabled: 0 + settings: + Exclude Android: 0 + Exclude Editor: 0 + Exclude Linux: 0 + Exclude Linux64: 0 + Exclude LinuxUniversal: 0 + Exclude OSXUniversal: 0 + Exclude WebGL: 0 + Exclude Win: 0 + Exclude Win64: 0 + Exclude iOS: 0 + - first: + Android: Android + second: + enabled: 1 + settings: + CPU: ARMv7 + - first: + Any: + second: + enabled: 1 + settings: {} + - first: + Editor: Editor + second: + enabled: 1 + settings: + CPU: AnyCPU + DefaultValueInitialized: true + OS: AnyOS + - first: + Facebook: Win + second: + enabled: 0 + settings: + CPU: AnyCPU + - first: + Facebook: Win64 + second: + enabled: 0 + settings: + CPU: AnyCPU + - first: + Standalone: Linux + second: + enabled: 1 + settings: + CPU: x86 + - first: + Standalone: Linux64 + second: + enabled: 1 + settings: + CPU: x86_64 + - first: + Standalone: LinuxUniversal + second: + enabled: 1 + settings: + CPU: AnyCPU + - first: + Standalone: OSXUniversal + second: + enabled: 1 + settings: + CPU: AnyCPU + - first: + Standalone: Win + second: + enabled: 1 + settings: + CPU: AnyCPU + - first: + Standalone: Win64 + second: + enabled: 1 + settings: + CPU: AnyCPU + - first: + WebGL: WebGL + second: + enabled: 1 + settings: {} + - first: + Windows Store Apps: WindowsStoreApps + second: + enabled: 0 + settings: + CPU: AnyCPU + - first: + iPhone: iOS + second: + enabled: 1 + settings: + AddToEmbeddedBinaries: false + CompileFlags: + FrameworkDependencies: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Mirror/External/Unity.Cecil/lib/net35/Unity.Cecil.Pdb.dll b/Assets/Mirror/Weaver/Cecil/Unity.Cecil.Pdb.dll similarity index 99% rename from Mirror/External/Unity.Cecil/lib/net35/Unity.Cecil.Pdb.dll rename to Assets/Mirror/Weaver/Cecil/Unity.Cecil.Pdb.dll index 02d386dbe..eee6eb919 100644 Binary files a/Mirror/External/Unity.Cecil/lib/net35/Unity.Cecil.Pdb.dll and b/Assets/Mirror/Weaver/Cecil/Unity.Cecil.Pdb.dll differ diff --git a/Assets/Mirror/Weaver/Cecil/Unity.Cecil.Pdb.dll.meta b/Assets/Mirror/Weaver/Cecil/Unity.Cecil.Pdb.dll.meta new file mode 100644 index 000000000..43c937e47 --- /dev/null +++ b/Assets/Mirror/Weaver/Cecil/Unity.Cecil.Pdb.dll.meta @@ -0,0 +1,114 @@ +fileFormatVersion: 2 +guid: beb3327f2a47742c2ba64c2925e9f8bc +PluginImporter: + externalObjects: {} + serializedVersion: 2 + iconMap: {} + executionOrder: {} + isPreloaded: 0 + isOverridable: 0 + platformData: + - first: + '': Any + second: + enabled: 0 + settings: + Exclude Android: 0 + Exclude Editor: 0 + Exclude Linux: 0 + Exclude Linux64: 0 + Exclude LinuxUniversal: 0 + Exclude OSXUniversal: 0 + Exclude WebGL: 0 + Exclude Win: 0 + Exclude Win64: 0 + Exclude iOS: 0 + - first: + Android: Android + second: + enabled: 1 + settings: + CPU: ARMv7 + - first: + Any: + second: + enabled: 1 + settings: {} + - first: + Editor: Editor + second: + enabled: 1 + settings: + CPU: AnyCPU + DefaultValueInitialized: true + OS: AnyOS + - first: + Facebook: Win + second: + enabled: 0 + settings: + CPU: AnyCPU + - first: + Facebook: Win64 + second: + enabled: 0 + settings: + CPU: AnyCPU + - first: + Standalone: Linux + second: + enabled: 1 + settings: + CPU: x86 + - first: + Standalone: Linux64 + second: + enabled: 1 + settings: + CPU: x86_64 + - first: + Standalone: LinuxUniversal + second: + enabled: 1 + settings: + CPU: AnyCPU + - first: + Standalone: OSXUniversal + second: + enabled: 1 + settings: + CPU: AnyCPU + - first: + Standalone: Win + second: + enabled: 1 + settings: + CPU: AnyCPU + - first: + Standalone: Win64 + second: + enabled: 1 + settings: + CPU: AnyCPU + - first: + WebGL: WebGL + second: + enabled: 1 + settings: {} + - first: + Windows Store Apps: WindowsStoreApps + second: + enabled: 0 + settings: + CPU: AnyCPU + - first: + iPhone: iOS + second: + enabled: 1 + settings: + AddToEmbeddedBinaries: false + CompileFlags: + FrameworkDependencies: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Mirror/Weaver/Cecil/Unity.Cecil.dll b/Assets/Mirror/Weaver/Cecil/Unity.Cecil.dll new file mode 100644 index 000000000..4166cfc30 Binary files /dev/null and b/Assets/Mirror/Weaver/Cecil/Unity.Cecil.dll differ diff --git a/Assets/Mirror/Weaver/Cecil/Unity.Cecil.dll.meta b/Assets/Mirror/Weaver/Cecil/Unity.Cecil.dll.meta new file mode 100644 index 000000000..f3ffb2651 --- /dev/null +++ b/Assets/Mirror/Weaver/Cecil/Unity.Cecil.dll.meta @@ -0,0 +1,114 @@ +fileFormatVersion: 2 +guid: db118c7ed5cab4d24bd2c272a66555cf +PluginImporter: + externalObjects: {} + serializedVersion: 2 + iconMap: {} + executionOrder: {} + isPreloaded: 0 + isOverridable: 0 + platformData: + - first: + '': Any + second: + enabled: 0 + settings: + Exclude Android: 0 + Exclude Editor: 0 + Exclude Linux: 0 + Exclude Linux64: 0 + Exclude LinuxUniversal: 0 + Exclude OSXUniversal: 0 + Exclude WebGL: 0 + Exclude Win: 0 + Exclude Win64: 0 + Exclude iOS: 0 + - first: + Android: Android + second: + enabled: 1 + settings: + CPU: ARMv7 + - first: + Any: + second: + enabled: 1 + settings: {} + - first: + Editor: Editor + second: + enabled: 1 + settings: + CPU: AnyCPU + DefaultValueInitialized: true + OS: AnyOS + - first: + Facebook: Win + second: + enabled: 0 + settings: + CPU: AnyCPU + - first: + Facebook: Win64 + second: + enabled: 0 + settings: + CPU: AnyCPU + - first: + Standalone: Linux + second: + enabled: 1 + settings: + CPU: x86 + - first: + Standalone: Linux64 + second: + enabled: 1 + settings: + CPU: x86_64 + - first: + Standalone: LinuxUniversal + second: + enabled: 1 + settings: + CPU: AnyCPU + - first: + Standalone: OSXUniversal + second: + enabled: 1 + settings: + CPU: AnyCPU + - first: + Standalone: Win + second: + enabled: 1 + settings: + CPU: AnyCPU + - first: + Standalone: Win64 + second: + enabled: 1 + settings: + CPU: AnyCPU + - first: + WebGL: WebGL + second: + enabled: 1 + settings: {} + - first: + Windows Store Apps: WindowsStoreApps + second: + enabled: 0 + settings: + CPU: AnyCPU + - first: + iPhone: iOS + second: + enabled: 1 + settings: + AddToEmbeddedBinaries: false + CompileFlags: + FrameworkDependencies: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Mirror/Weaver/CompilationFinishedHook.cs b/Assets/Mirror/Weaver/CompilationFinishedHook.cs similarity index 64% rename from Mirror/Weaver/CompilationFinishedHook.cs rename to Assets/Mirror/Weaver/CompilationFinishedHook.cs index 7419b28fe..785d32910 100644 --- a/Mirror/Weaver/CompilationFinishedHook.cs +++ b/Assets/Mirror/Weaver/CompilationFinishedHook.cs @@ -28,6 +28,14 @@ static CompilationFinishedHook() return; } + string assemblyName = Path.GetFileName(assemblyPath); + + if (assemblyName == "Telepathy.dll" || assemblyName == "Mirror.dll" || assemblyName == "Mirror.Weaver.dll") + { + // don't weave mirror files + return; + } + // UnityEngineCoreModule.DLL path: string unityEngineCoreModuleDLL = UnityEditorInternal.InternalEditorUtility.GetEngineCoreModuleAssemblyPath(); @@ -37,13 +45,10 @@ static CompilationFinishedHook() string mirrorRuntimeDll = FindMirrorRuntime(); if (!File.Exists(mirrorRuntimeDll)) { - Debug.LogError("Could not find Mirror.Runtime.dll, make sure the file is in your project"); - return; - } - - if (assemblyPath == mirrorRuntimeDll) - { - Debug.Log("Cannot weave mirror runtime"); + // this is normal, it happens with any assembly that is built before mirror + // such as unity packages or your own assemblies + // those don't need to be weaved + // if any assembly depends on mirror, then it will be built after return; } @@ -93,52 +98,15 @@ static string[] GetExtraAssemblyPaths(string assemblyPath) static string FindMirrorRuntime() { - // we can't assume that Mirror.Runtime.dll is always at the same - // path, because some people might move the 'Mirror' folder into - // another folder, etc. - // -> can't check loaded assemblies/assets because this happens - // after compiling, before load - // -> search assets folder instead and cache result - // -> we have Runtime and Runtime-Editor dll. it doesn't matter - // which one we use, so let's always use the one that is found - // first + Assembly[] assemblies = CompilationPipeline.GetAssemblies(); - // searching huge project directories can be expensive, so let's use - // EditorPrefs to try the last working one first - // -> EditorPrefs are global across projects. we only care about the - // path for this project though. otherwise switching between two - // projects would need path to be searched again each time - // -> use project GUID to make project specific paths - string key = PlayerSettings.productGUID + ".LastMirrorRuntimeDll"; - if (EditorPrefs.HasKey(key)) + foreach (Assembly assembly in assemblies) { - string lastPath = EditorPrefs.GetString(key); - if (File.Exists(lastPath)) + if (assembly.name == "Mirror") { - return lastPath; + return assembly.outputPath; } } - - // search directory - string[] files = Directory.GetFiles("Assets", "Mirror.Runtime.dll", SearchOption.AllDirectories); - if (files.Length > 0) - { - // save path for next time, but only if it's a relative path. - // we don't want to use another project's dlls for weaving, that - // would be debugging hell. - // (Directory.GetFiles should return relative paths) - if (!Path.IsPathRooted(files[0])) - { - EditorPrefs.SetString(key, files[0]); - } - else - { - Debug.Log("Weaving doesn't cache path because it's absolute: " + files[0]); - } - - return files[0]; - } - return ""; } } diff --git a/Assets/Mirror/Weaver/CompilationFinishedHook.cs.meta b/Assets/Mirror/Weaver/CompilationFinishedHook.cs.meta new file mode 100644 index 000000000..d4ce3b3dc --- /dev/null +++ b/Assets/Mirror/Weaver/CompilationFinishedHook.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 542fe83297a9e42fd8785a259657739e +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Mirror/Weaver/Extensions.cs b/Assets/Mirror/Weaver/Extensions.cs similarity index 100% rename from Mirror/Weaver/Extensions.cs rename to Assets/Mirror/Weaver/Extensions.cs diff --git a/Assets/Mirror/Weaver/Extensions.cs.meta b/Assets/Mirror/Weaver/Extensions.cs.meta new file mode 100644 index 000000000..c30c1a580 --- /dev/null +++ b/Assets/Mirror/Weaver/Extensions.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 70e2f427a6259412b9e510788896c2ef +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Mirror/Weaver/Helpers.cs b/Assets/Mirror/Weaver/Helpers.cs similarity index 100% rename from Mirror/Weaver/Helpers.cs rename to Assets/Mirror/Weaver/Helpers.cs diff --git a/Assets/Mirror/Weaver/Helpers.cs.meta b/Assets/Mirror/Weaver/Helpers.cs.meta new file mode 100644 index 000000000..85286460d --- /dev/null +++ b/Assets/Mirror/Weaver/Helpers.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 012d1b15d769b4eeabee23619d143567 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Mirror/Weaver/Mirror.Weaver.asmdef b/Assets/Mirror/Weaver/Mirror.Weaver.asmdef new file mode 100644 index 000000000..f88859926 --- /dev/null +++ b/Assets/Mirror/Weaver/Mirror.Weaver.asmdef @@ -0,0 +1,10 @@ +{ + "name": "Mirror.Weaver", + "references": [], + "optionalUnityReferences": [], + "includePlatforms": [ + "Editor" + ], + "excludePlatforms": [], + "allowUnsafeCode": false +} \ No newline at end of file diff --git a/Assets/Mirror/Weaver/Mirror.Weaver.asmdef.meta b/Assets/Mirror/Weaver/Mirror.Weaver.asmdef.meta new file mode 100644 index 000000000..9b7048ab0 --- /dev/null +++ b/Assets/Mirror/Weaver/Mirror.Weaver.asmdef.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: cc99bf3e725cc4792a28c2a879ed451a +AssemblyDefinitionImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Mirror/Weaver/Processors.meta b/Assets/Mirror/Weaver/Processors.meta new file mode 100644 index 000000000..9740c6052 --- /dev/null +++ b/Assets/Mirror/Weaver/Processors.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: fa015259464474076971495e2e14585a +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Mirror/Weaver/Processors/CommandProcessor.cs b/Assets/Mirror/Weaver/Processors/CommandProcessor.cs similarity index 100% rename from Mirror/Weaver/Processors/CommandProcessor.cs rename to Assets/Mirror/Weaver/Processors/CommandProcessor.cs diff --git a/Assets/Mirror/Weaver/Processors/CommandProcessor.cs.meta b/Assets/Mirror/Weaver/Processors/CommandProcessor.cs.meta new file mode 100644 index 000000000..235e24320 --- /dev/null +++ b/Assets/Mirror/Weaver/Processors/CommandProcessor.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 52a2930ec4d0e46209986c0b43f1dfb7 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Mirror/Weaver/Processors/MessageClassProcessor.cs b/Assets/Mirror/Weaver/Processors/MessageClassProcessor.cs similarity index 100% rename from Mirror/Weaver/Processors/MessageClassProcessor.cs rename to Assets/Mirror/Weaver/Processors/MessageClassProcessor.cs diff --git a/Assets/Mirror/Weaver/Processors/MessageClassProcessor.cs.meta b/Assets/Mirror/Weaver/Processors/MessageClassProcessor.cs.meta new file mode 100644 index 000000000..fb724c80b --- /dev/null +++ b/Assets/Mirror/Weaver/Processors/MessageClassProcessor.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 0e4d32fe4b761468ab0e7174e829b8e3 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Mirror/Weaver/Processors/MonoBehaviourProcessor.cs b/Assets/Mirror/Weaver/Processors/MonoBehaviourProcessor.cs similarity index 100% rename from Mirror/Weaver/Processors/MonoBehaviourProcessor.cs rename to Assets/Mirror/Weaver/Processors/MonoBehaviourProcessor.cs diff --git a/Assets/Mirror/Weaver/Processors/MonoBehaviourProcessor.cs.meta b/Assets/Mirror/Weaver/Processors/MonoBehaviourProcessor.cs.meta new file mode 100644 index 000000000..b35491fd9 --- /dev/null +++ b/Assets/Mirror/Weaver/Processors/MonoBehaviourProcessor.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: e5e41f23a1ff24e09b0da167ce765908 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Mirror/Weaver/Processors/NetworkBehaviourProcessor.cs b/Assets/Mirror/Weaver/Processors/NetworkBehaviourProcessor.cs similarity index 100% rename from Mirror/Weaver/Processors/NetworkBehaviourProcessor.cs rename to Assets/Mirror/Weaver/Processors/NetworkBehaviourProcessor.cs diff --git a/Assets/Mirror/Weaver/Processors/NetworkBehaviourProcessor.cs.meta b/Assets/Mirror/Weaver/Processors/NetworkBehaviourProcessor.cs.meta new file mode 100644 index 000000000..c41363caa --- /dev/null +++ b/Assets/Mirror/Weaver/Processors/NetworkBehaviourProcessor.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: d6978f3dd38414099a050f5b63d7be60 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Mirror/Weaver/Processors/RpcProcessor.cs b/Assets/Mirror/Weaver/Processors/RpcProcessor.cs similarity index 100% rename from Mirror/Weaver/Processors/RpcProcessor.cs rename to Assets/Mirror/Weaver/Processors/RpcProcessor.cs diff --git a/Assets/Mirror/Weaver/Processors/RpcProcessor.cs.meta b/Assets/Mirror/Weaver/Processors/RpcProcessor.cs.meta new file mode 100644 index 000000000..3cf157453 --- /dev/null +++ b/Assets/Mirror/Weaver/Processors/RpcProcessor.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: ac088a92b3900496084d5809981152f5 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Mirror/Weaver/Processors/SyncEventProcessor.cs b/Assets/Mirror/Weaver/Processors/SyncEventProcessor.cs similarity index 100% rename from Mirror/Weaver/Processors/SyncEventProcessor.cs rename to Assets/Mirror/Weaver/Processors/SyncEventProcessor.cs diff --git a/Assets/Mirror/Weaver/Processors/SyncEventProcessor.cs.meta b/Assets/Mirror/Weaver/Processors/SyncEventProcessor.cs.meta new file mode 100644 index 000000000..f7dce71a1 --- /dev/null +++ b/Assets/Mirror/Weaver/Processors/SyncEventProcessor.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: d8b688a8707ff4125b3a3f8e509f9b15 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Mirror/Weaver/Processors/SyncListProcessor.cs b/Assets/Mirror/Weaver/Processors/SyncListProcessor.cs similarity index 100% rename from Mirror/Weaver/Processors/SyncListProcessor.cs rename to Assets/Mirror/Weaver/Processors/SyncListProcessor.cs diff --git a/Assets/Mirror/Weaver/Processors/SyncListProcessor.cs.meta b/Assets/Mirror/Weaver/Processors/SyncListProcessor.cs.meta new file mode 100644 index 000000000..ccc48cc0d --- /dev/null +++ b/Assets/Mirror/Weaver/Processors/SyncListProcessor.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: aa99fe1bd6f934f3280e10f06ab79d2b +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Mirror/Weaver/Processors/SyncListStructProcessor.cs b/Assets/Mirror/Weaver/Processors/SyncListStructProcessor.cs similarity index 100% rename from Mirror/Weaver/Processors/SyncListStructProcessor.cs rename to Assets/Mirror/Weaver/Processors/SyncListStructProcessor.cs diff --git a/Assets/Mirror/Weaver/Processors/SyncListStructProcessor.cs.meta b/Assets/Mirror/Weaver/Processors/SyncListStructProcessor.cs.meta new file mode 100644 index 000000000..9653c6db3 --- /dev/null +++ b/Assets/Mirror/Weaver/Processors/SyncListStructProcessor.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 3462eed5a6f8541d4ac2510a8eb88fda +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Mirror/Weaver/Processors/SyncObjectProcessor.cs b/Assets/Mirror/Weaver/Processors/SyncObjectProcessor.cs similarity index 100% rename from Mirror/Weaver/Processors/SyncObjectProcessor.cs rename to Assets/Mirror/Weaver/Processors/SyncObjectProcessor.cs diff --git a/Assets/Mirror/Weaver/Processors/SyncObjectProcessor.cs.meta b/Assets/Mirror/Weaver/Processors/SyncObjectProcessor.cs.meta new file mode 100644 index 000000000..353847f94 --- /dev/null +++ b/Assets/Mirror/Weaver/Processors/SyncObjectProcessor.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 4d7bd5213f74d4a658df99113a24b831 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Mirror/Weaver/Processors/SyncVarProcessor.cs b/Assets/Mirror/Weaver/Processors/SyncVarProcessor.cs similarity index 100% rename from Mirror/Weaver/Processors/SyncVarProcessor.cs rename to Assets/Mirror/Weaver/Processors/SyncVarProcessor.cs diff --git a/Assets/Mirror/Weaver/Processors/SyncVarProcessor.cs.meta b/Assets/Mirror/Weaver/Processors/SyncVarProcessor.cs.meta new file mode 100644 index 000000000..95d851973 --- /dev/null +++ b/Assets/Mirror/Weaver/Processors/SyncVarProcessor.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 224b3d785577d486395b24a6b70dd57f +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Mirror/Weaver/Processors/TargetRpcProcessor.cs b/Assets/Mirror/Weaver/Processors/TargetRpcProcessor.cs similarity index 100% rename from Mirror/Weaver/Processors/TargetRpcProcessor.cs rename to Assets/Mirror/Weaver/Processors/TargetRpcProcessor.cs diff --git a/Assets/Mirror/Weaver/Processors/TargetRpcProcessor.cs.meta b/Assets/Mirror/Weaver/Processors/TargetRpcProcessor.cs.meta new file mode 100644 index 000000000..07465967a --- /dev/null +++ b/Assets/Mirror/Weaver/Processors/TargetRpcProcessor.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: aac3ac00b1ae94536acd4b2a0aafd18e +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Mirror/Weaver/Program.cs b/Assets/Mirror/Weaver/Program.cs similarity index 100% rename from Mirror/Weaver/Program.cs rename to Assets/Mirror/Weaver/Program.cs diff --git a/Assets/Mirror/Weaver/Program.cs.meta b/Assets/Mirror/Weaver/Program.cs.meta new file mode 100644 index 000000000..147ca0c7d --- /dev/null +++ b/Assets/Mirror/Weaver/Program.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: ac849b6b8522d43f5ac1b091ad2ca1f8 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Mirror/Weaver/Resolvers.cs b/Assets/Mirror/Weaver/Resolvers.cs similarity index 100% rename from Mirror/Weaver/Resolvers.cs rename to Assets/Mirror/Weaver/Resolvers.cs diff --git a/Assets/Mirror/Weaver/Resolvers.cs.meta b/Assets/Mirror/Weaver/Resolvers.cs.meta new file mode 100644 index 000000000..dee8f4cb0 --- /dev/null +++ b/Assets/Mirror/Weaver/Resolvers.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: c946173abde3a4c68911643c8b0ab3f7 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Mirror/Weaver/Weaver.cs b/Assets/Mirror/Weaver/Weaver.cs similarity index 100% rename from Mirror/Weaver/Weaver.cs rename to Assets/Mirror/Weaver/Weaver.cs diff --git a/Assets/Mirror/Weaver/Weaver.cs.meta b/Assets/Mirror/Weaver/Weaver.cs.meta new file mode 100644 index 000000000..ae0c551f0 --- /dev/null +++ b/Assets/Mirror/Weaver/Weaver.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: bccd362332593443eaa7a4596d4797b2 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Mirror/Editor/Mirror.Editor.csproj b/Mirror/Editor/Mirror.Editor.csproj deleted file mode 100644 index eaef2fb2e..000000000 --- a/Mirror/Editor/Mirror.Editor.csproj +++ /dev/null @@ -1,86 +0,0 @@ - - - - - Debug - AnyCPU - {F290E7F0-596E-495F-BD1F-E66386A1C597} - Library - Properties - Mirror - Mirror.Editor - v3.5 - 512 - - - True - full - False - bin\Debug\ - TRACE;DEBUG;ENABLE_UNET - prompt - 4 - 4 - - - pdbonly - True - bin\Release\ - TRACE;ENABLE_UNET - prompt - 4 - - - True - full - False - bin\Debug-Editor - TRACE;DEBUG;ENABLE_UNET - prompt - 4 - - - pdbonly - True - bin\Release-Editor - TRACE;ENABLE_UNET - prompt - 4 - - - - - - ..\lib\UnityEditor.dll - - - ..\lib\UnityEngine.dll - - - - - - - - - - - - - {5F1B8F9B-4500-4D09-808B-F43E8337DF05} - Mirror.Runtime - - - - - - - - - - - - - \ No newline at end of file diff --git a/Mirror/External/Unity.Cecil/lib/net35/Unity.Cecil.Mdb.dll b/Mirror/External/Unity.Cecil/lib/net35/Unity.Cecil.Mdb.dll deleted file mode 100644 index 9e77dcfe0..000000000 Binary files a/Mirror/External/Unity.Cecil/lib/net35/Unity.Cecil.Mdb.dll and /dev/null differ diff --git a/Mirror/External/Unity.Cecil/lib/net35/Unity.Cecil.Mdb.pdb b/Mirror/External/Unity.Cecil/lib/net35/Unity.Cecil.Mdb.pdb deleted file mode 100644 index 8d0fa22d6..000000000 Binary files a/Mirror/External/Unity.Cecil/lib/net35/Unity.Cecil.Mdb.pdb and /dev/null differ diff --git a/Mirror/External/Unity.Cecil/lib/net35/Unity.Cecil.Pdb.pdb b/Mirror/External/Unity.Cecil/lib/net35/Unity.Cecil.Pdb.pdb deleted file mode 100644 index 9927515c0..000000000 Binary files a/Mirror/External/Unity.Cecil/lib/net35/Unity.Cecil.Pdb.pdb and /dev/null differ diff --git a/Mirror/External/Unity.Cecil/lib/net35/Unity.Cecil.Rocks.dll b/Mirror/External/Unity.Cecil/lib/net35/Unity.Cecil.Rocks.dll deleted file mode 100644 index 3003d9bcb..000000000 Binary files a/Mirror/External/Unity.Cecil/lib/net35/Unity.Cecil.Rocks.dll and /dev/null differ diff --git a/Mirror/External/Unity.Cecil/lib/net35/Unity.Cecil.Rocks.pdb b/Mirror/External/Unity.Cecil/lib/net35/Unity.Cecil.Rocks.pdb deleted file mode 100644 index 4ed07a9cb..000000000 Binary files a/Mirror/External/Unity.Cecil/lib/net35/Unity.Cecil.Rocks.pdb and /dev/null differ diff --git a/Mirror/External/Unity.Cecil/lib/net35/Unity.Cecil.dll b/Mirror/External/Unity.Cecil/lib/net35/Unity.Cecil.dll deleted file mode 100644 index 5052f8dee..000000000 Binary files a/Mirror/External/Unity.Cecil/lib/net35/Unity.Cecil.dll and /dev/null differ diff --git a/Mirror/External/Unity.Cecil/lib/net35/Unity.Cecil.pdb b/Mirror/External/Unity.Cecil/lib/net35/Unity.Cecil.pdb deleted file mode 100644 index ed67846ef..000000000 Binary files a/Mirror/External/Unity.Cecil/lib/net35/Unity.Cecil.pdb and /dev/null differ diff --git a/Mirror/External/Unity.Cecil/version.txt b/Mirror/External/Unity.Cecil/version.txt deleted file mode 100644 index 718f5d612..000000000 --- a/Mirror/External/Unity.Cecil/version.txt +++ /dev/null @@ -1,3 +0,0 @@ -Repository: https://github.com/Unity-Technologies/cecil.git -Branch: * unity-master -Commit: b28d33c7da63de8162b41338f4d408b77a59f4c9 \ No newline at end of file diff --git a/Mirror/Networking.sln b/Mirror/Networking.sln deleted file mode 100644 index 2fb62f4e1..000000000 --- a/Mirror/Networking.sln +++ /dev/null @@ -1,65 +0,0 @@ - -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 2012 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Mirror.Runtime", "Runtime\Mirror.Runtime.csproj", "{5F1B8F9B-4500-4D09-808B-F43E8337DF05}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Mirror.Editor", "Editor\Mirror.Editor.csproj", "{F290E7F0-596E-495F-BD1F-E66386A1C597}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Mirror.Weaver", "Weaver\Mirror.Weaver.csproj", "{709222FD-15C2-497D-8B31-366ADCC074CD}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Mirror.Tests", "Tests\Mirror.Tests.csproj", "{F57702C3-86F0-421C-8B29-AE00F0B84BAF}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Any CPU = Debug|Any CPU - Release|Any CPU = Release|Any CPU - Testing|Any CPU = Testing|Any CPU - Debug-Editor|Any CPU = Debug-Editor|Any CPU - Release-Editor|Any CPU = Release-Editor|Any CPU - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {5F1B8F9B-4500-4D09-808B-F43E8337DF05}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {5F1B8F9B-4500-4D09-808B-F43E8337DF05}.Debug|Any CPU.Build.0 = Debug|Any CPU - {5F1B8F9B-4500-4D09-808B-F43E8337DF05}.Release|Any CPU.ActiveCfg = Release|Any CPU - {5F1B8F9B-4500-4D09-808B-F43E8337DF05}.Release|Any CPU.Build.0 = Release|Any CPU - {5F1B8F9B-4500-4D09-808B-F43E8337DF05}.Testing|Any CPU.ActiveCfg = Release|Any CPU - {5F1B8F9B-4500-4D09-808B-F43E8337DF05}.Testing|Any CPU.Build.0 = Release|Any CPU - {5F1B8F9B-4500-4D09-808B-F43E8337DF05}.Debug-Editor|Any CPU.ActiveCfg = Debug-Editor|Any CPU - {5F1B8F9B-4500-4D09-808B-F43E8337DF05}.Debug-Editor|Any CPU.Build.0 = Debug-Editor|Any CPU - {5F1B8F9B-4500-4D09-808B-F43E8337DF05}.Release-Editor|Any CPU.ActiveCfg = Release-Editor|Any CPU - {5F1B8F9B-4500-4D09-808B-F43E8337DF05}.Release-Editor|Any CPU.Build.0 = Release-Editor|Any CPU - {709222FD-15C2-497D-8B31-366ADCC074CD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {709222FD-15C2-497D-8B31-366ADCC074CD}.Debug|Any CPU.Build.0 = Debug|Any CPU - {709222FD-15C2-497D-8B31-366ADCC074CD}.Release|Any CPU.ActiveCfg = Release|Any CPU - {709222FD-15C2-497D-8B31-366ADCC074CD}.Release|Any CPU.Build.0 = Release|Any CPU - {709222FD-15C2-497D-8B31-366ADCC074CD}.Testing|Any CPU.ActiveCfg = Release|Any CPU - {709222FD-15C2-497D-8B31-366ADCC074CD}.Testing|Any CPU.Build.0 = Release|Any CPU - {709222FD-15C2-497D-8B31-366ADCC074CD}.Debug-Editor|Any CPU.ActiveCfg = Debug|Any CPU - {709222FD-15C2-497D-8B31-366ADCC074CD}.Debug-Editor|Any CPU.Build.0 = Debug|Any CPU - {709222FD-15C2-497D-8B31-366ADCC074CD}.Release-Editor|Any CPU.ActiveCfg = Release|Any CPU - {709222FD-15C2-497D-8B31-366ADCC074CD}.Release-Editor|Any CPU.Build.0 = Release|Any CPU - {F290E7F0-596E-495F-BD1F-E66386A1C597}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F290E7F0-596E-495F-BD1F-E66386A1C597}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F290E7F0-596E-495F-BD1F-E66386A1C597}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F290E7F0-596E-495F-BD1F-E66386A1C597}.Release|Any CPU.Build.0 = Release|Any CPU - {F290E7F0-596E-495F-BD1F-E66386A1C597}.Testing|Any CPU.ActiveCfg = Release|Any CPU - {F290E7F0-596E-495F-BD1F-E66386A1C597}.Testing|Any CPU.Build.0 = Release|Any CPU - {F290E7F0-596E-495F-BD1F-E66386A1C597}.Debug-Editor|Any CPU.ActiveCfg = Debug|Any CPU - {F290E7F0-596E-495F-BD1F-E66386A1C597}.Debug-Editor|Any CPU.Build.0 = Debug|Any CPU - {F290E7F0-596E-495F-BD1F-E66386A1C597}.Release-Editor|Any CPU.ActiveCfg = Release|Any CPU - {F290E7F0-596E-495F-BD1F-E66386A1C597}.Release-Editor|Any CPU.Build.0 = Release|Any CPU - {F57702C3-86F0-421C-8B29-AE00F0B84BAF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F57702C3-86F0-421C-8B29-AE00F0B84BAF}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F57702C3-86F0-421C-8B29-AE00F0B84BAF}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F57702C3-86F0-421C-8B29-AE00F0B84BAF}.Release|Any CPU.Build.0 = Release|Any CPU - {F57702C3-86F0-421C-8B29-AE00F0B84BAF}.Testing|Any CPU.ActiveCfg = Debug|Any CPU - {F57702C3-86F0-421C-8B29-AE00F0B84BAF}.Testing|Any CPU.Build.0 = Debug|Any CPU - {F57702C3-86F0-421C-8B29-AE00F0B84BAF}.Debug-Editor|Any CPU.ActiveCfg = Debug|Any CPU - {F57702C3-86F0-421C-8B29-AE00F0B84BAF}.Debug-Editor|Any CPU.Build.0 = Debug|Any CPU - {F57702C3-86F0-421C-8B29-AE00F0B84BAF}.Release-Editor|Any CPU.ActiveCfg = Release|Any CPU - {F57702C3-86F0-421C-8B29-AE00F0B84BAF}.Release-Editor|Any CPU.Build.0 = Release|Any CPU - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection -EndGlobal diff --git a/Mirror/Runtime/Mirror.Runtime.csproj b/Mirror/Runtime/Mirror.Runtime.csproj deleted file mode 100644 index 6ee047466..000000000 --- a/Mirror/Runtime/Mirror.Runtime.csproj +++ /dev/null @@ -1,118 +0,0 @@ - - - - - Debug - AnyCPU - {5F1B8F9B-4500-4D09-808B-F43E8337DF05} - Library - Properties - Mirror - Mirror.Runtime - v3.5 - 512 - 12.0.0 - 2.0 - - - True - full - False - bin\Debug\ - TRACE;DEBUG;ENABLE_UNET - prompt - 4 - 4 - - - pdbonly - True - bin\Release\ - TRACE;ENABLE_UNET - prompt - 4 - - - True - full - False - bin\Debug-Editor - TRACE;DEBUG;ENABLE_UNET;UNITY_EDITOR - prompt - 4 - - - True - bin\Release-Editor - TRACE;ENABLE_UNET;UNITY_EDITOR - prompt - 4 - - - - - - ..\packages\Telepathy.1.0.252\lib\net35\Telepathy.dll - True - - - ..\lib\UnityEngine.dll - - - ..\lib\UnityEditor.dll - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/Mirror/Runtime/packages.config b/Mirror/Runtime/packages.config deleted file mode 100644 index e5320452e..000000000 --- a/Mirror/Runtime/packages.config +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/Mirror/Tests/Mirror.Tests.csproj b/Mirror/Tests/Mirror.Tests.csproj deleted file mode 100644 index bb3e3b9ee..000000000 --- a/Mirror/Tests/Mirror.Tests.csproj +++ /dev/null @@ -1,71 +0,0 @@ - - - - - Debug - AnyCPU - {F57702C3-86F0-421C-8B29-AE00F0B84BAF} - Library - Mirror - Mirror.Tests - v4.7 - - - true - full - false - bin\Debug - DEBUG; - prompt - 4 - 4 - - - true - bin\Release - prompt - 4 - - - true - full - false - bin\Debug-Editor - DEBUG; - prompt - 4 - - - true - bin\Release-Editor - prompt - 4 - - - - - ..\packages\NUnit.3.10.1\lib\net45\nunit.framework.dll - - - ..\lib\UnityEngine.dll - - - - - - - - - - - - - - - - {5F1B8F9B-4500-4D09-808B-F43E8337DF05} - Mirror.Runtime - - - - \ No newline at end of file diff --git a/Mirror/Tests/packages.config b/Mirror/Tests/packages.config deleted file mode 100644 index c5ff1ecef..000000000 --- a/Mirror/Tests/packages.config +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/Mirror/Weaver/Mirror.Weaver.csproj b/Mirror/Weaver/Mirror.Weaver.csproj deleted file mode 100644 index 8ccf4c025..000000000 --- a/Mirror/Weaver/Mirror.Weaver.csproj +++ /dev/null @@ -1,104 +0,0 @@ - - - - Debug - AnyCPU - {709222FD-15C2-497D-8B31-366ADCC074CD} - Library - Mirror.Weaver - Mirror.Weaver - v3.5 - - - True - full - False - bin\Debug - DEBUG; - prompt - 4 - true - 4 - - - none - True - bin\Release - prompt - 4 - true - - - True - full - False - bin\Debug-Editor - DEBUG; - prompt - 4 - true - - - none - True - bin\Release-Editor - prompt - 4 - true - - - - - - ..\External\Unity.Cecil\lib\net35\Unity.Cecil.dll - - - ..\External\Unity.Cecil\lib\net35\Unity.Cecil.Mdb.dll - - - ..\External\Unity.Cecil\lib\net35\Unity.Cecil.Pdb.dll - - - ..\lib\UnityEditor.dll - - - ..\lib\UnityEngine.dll - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/Mirror/lib/UnityEditor.dll b/Mirror/lib/UnityEditor.dll deleted file mode 100644 index 50e1c113f..000000000 Binary files a/Mirror/lib/UnityEditor.dll and /dev/null differ diff --git a/Mirror/lib/UnityEditor.dll.mdb b/Mirror/lib/UnityEditor.dll.mdb deleted file mode 100644 index 487ce6041..000000000 Binary files a/Mirror/lib/UnityEditor.dll.mdb and /dev/null differ diff --git a/Mirror/lib/UnityEngine.dll b/Mirror/lib/UnityEngine.dll deleted file mode 100644 index 53b97ee9d..000000000 Binary files a/Mirror/lib/UnityEngine.dll and /dev/null differ diff --git a/Mirror/lib/UnityEngine.dll.mdb b/Mirror/lib/UnityEngine.dll.mdb deleted file mode 100644 index 1408bf20e..000000000 Binary files a/Mirror/lib/UnityEngine.dll.mdb and /dev/null differ diff --git a/README.md b/README.md index 2f4e288d0..ba2927872 100644 --- a/README.md +++ b/README.md @@ -38,9 +38,7 @@ Import mirror from the [Asset Store](https://www.assetstore.unity3d.com/#!/conte Alternatively, you can install it manually: 1. [Download Mirror](https://github.com/vis2k/Mirror/releases) (for Unity 2017.4 and 2018). Use it at your own risk! -2. Drop the DLLs into your Project's Plugins folder -3. Select Runtime/Mirror.Runtime.dll and tell Unity to **Exclude** the Editor platform -4. Select Runtime-Editor/Mirror.Runtime.dll and tell Unity to **only Include** the Editor platform +2. Decompress the zip file in Assets ## Migration Guide If you are still using UNET and want to switch to Mirror, you should check out our [Migration Guide](https://vis2k.github.io/Mirror/General/Migration). Don't panic, it's very easy and won't take more than 5 minutes. @@ -58,9 +56,6 @@ If you don't want to use Telepathy or UNET's LLAPI as low level transport, then ## Donations Mirror is developed by volunteers. If you like what we are doing, consider leaving [a small donation](https://www.patreon.com/MirrorTelepathy). -## Build -Building Mirror yourself is very easy. Simply download the project, open it in Visual Studio or Rider, build it once for Release and once for Release-Editor. You will then find all the necessary DLLs in the Output directory. - ## Benchmarks * Telepathy [1000 connections](https://github.com/vis2k/Telepathy) test * [uMMORPG 207 CCU worst case test](https://docs.google.com/document/d/e/2PACX-1vQqf_iqOLlBRTUqqyor_OUx_rHlYx-SYvZWMvHGuLIuRuxJ-qX3s8JzrrBB5vxDdGfl-HhYZW3g5lLW/pub#h.h4wha2mpetsc) (everyone broadcasting to everyone else) diff --git a/appveyor.yml b/appveyor.yml index e52616a3a..4ebb03a35 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -14,9 +14,6 @@ install: - cd .. - cp c:\Tools\curl\bin\libcurl.dll C:\Ruby25-x64\bin -before_build: - - nuget restore Mirror/Networking.sln - #build: # project: Mirror/Networking.sln # verbosity: minimal @@ -25,41 +22,25 @@ before_build: skip_tags: true build_script: - - msbuild Mirror/Networking.sln /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll" /p:Configuration="Debug-Editor" /ConsoleLoggerParameters:Verbosity=quiet - - msbuild Mirror/Networking.sln /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll" /p:Configuration="Debug" /ConsoleLoggerParameters:Verbosity=quiet - cd docs - bundle exec jekyll build - ruby checksite.rb - cd .. artifacts: - - path: Mirror/Output + - path: Assets name: Mirror image: Visual Studio 2017 -test_script: - - Mirror\packages\OpenCover.4.6.519\tools\OpenCover.Console.exe -returntargetcode -register:user -target:"nunit3-console.exe" -targetargs:"Mirror\Tests\bin\Debug\Mirror.Tests.dll" -output:"coverage.xml" -filter:"+[Mirror*]* -[Mirror.Tests*]* " - -after_test: - - ps: | - $env:PATH = 'C:\msys64\usr\bin;' + $env:PATH - Invoke-WebRequest -Uri 'https://codecov.io/bash' -OutFile codecov.sh - bash codecov.sh -f "coverage.xml" - -#skip_commits: -# files: -# - '/*.md' -# - '**/*.txt' -# - '.gitignore' deploy: description: 'This is a bleeding edge release. BACKUP BEFORE USING THIS AUTOMATED BUILD\n$(APPVEYOR_REPO_COMMIT_MESSAGE)' provider: GitHub auth_token: secure: G42snf8s5fEos7UfoRSW6eW+8rqGGMH3iw1ZCjRUjcUSKupHUfrKJMXQ11wbjRuW # your encrypted token from GitHub - artifact: Mirror\Mirror.zip # upload all NuGet packages to release assets + artifact: Mirror.zip # upload all NuGet packages to release assets draft: false prerelease: false on: - branch: master + branch: master \ No newline at end of file