diff --git a/.vs/206CDE/v16/.suo b/.vs/206CDE/v16/.suo index 525c574..081bf01 100644 Binary files a/.vs/206CDE/v16/.suo and b/.vs/206CDE/v16/.suo differ diff --git a/Assembly-CSharp-Editor-firstpass.csproj b/Assembly-CSharp-Editor-firstpass.csproj index 046dcca..3c3258c 100644 --- a/Assembly-CSharp-Editor-firstpass.csproj +++ b/Assembly-CSharp-Editor-firstpass.csproj @@ -66,52 +66,52 @@ - C:/Users/Vihan/Documents/GitHub/New/206CDE/Library/ScriptAssemblies/UnityEditor.TestRunner.dll + C:/Users/Humza/Desktop/GitHub/206CDE/Library/ScriptAssemblies/UnityEditor.TestRunner.dll - C:/Users/Vihan/Documents/GitHub/New/206CDE/Library/ScriptAssemblies/UnityEngine.TestRunner.dll + C:/Users/Humza/Desktop/GitHub/206CDE/Library/ScriptAssemblies/UnityEngine.TestRunner.dll - C:/Users/Vihan/Documents/GitHub/New/206CDE/Library/ScriptAssemblies/Unity.XR.Management.dll + C:/Users/Humza/Desktop/GitHub/206CDE/Library/ScriptAssemblies/Unity.XR.Management.dll - C:/Users/Vihan/Documents/GitHub/New/206CDE/Library/ScriptAssemblies/Unity.Timeline.Editor.dll + C:/Users/Humza/Desktop/GitHub/206CDE/Library/ScriptAssemblies/Unity.Timeline.Editor.dll - C:/Users/Vihan/Documents/GitHub/New/206CDE/Library/ScriptAssemblies/Unity.Subsystem.Registration.dll + C:/Users/Humza/Desktop/GitHub/206CDE/Library/ScriptAssemblies/Unity.Subsystem.Registration.dll - C:/Users/Vihan/Documents/GitHub/New/206CDE/Library/ScriptAssemblies/Unity.VSCode.Editor.dll + C:/Users/Humza/Desktop/GitHub/206CDE/Library/ScriptAssemblies/Unity.VSCode.Editor.dll - C:/Users/Vihan/Documents/GitHub/New/206CDE/Library/ScriptAssemblies/VuforiaScripts.dll + C:/Users/Humza/Desktop/GitHub/206CDE/Library/ScriptAssemblies/VuforiaScripts.dll - C:/Users/Vihan/Documents/GitHub/New/206CDE/Library/ScriptAssemblies/Unity.TextMeshPro.Editor.dll + C:/Users/Humza/Desktop/GitHub/206CDE/Library/ScriptAssemblies/Unity.TextMeshPro.Editor.dll - C:/Users/Vihan/Documents/GitHub/New/206CDE/Library/ScriptAssemblies/UnityEngine.UI.dll + C:/Users/Humza/Desktop/GitHub/206CDE/Library/ScriptAssemblies/UnityEngine.UI.dll - C:/Users/Vihan/Documents/GitHub/New/206CDE/Library/ScriptAssemblies/Unity.Timeline.dll + C:/Users/Humza/Desktop/GitHub/206CDE/Library/ScriptAssemblies/Unity.Timeline.dll - C:/Users/Vihan/Documents/GitHub/New/206CDE/Library/ScriptAssemblies/VuforiaEditorScripts.dll + C:/Users/Humza/Desktop/GitHub/206CDE/Library/ScriptAssemblies/VuforiaEditorScripts.dll - C:/Users/Vihan/Documents/GitHub/New/206CDE/Library/ScriptAssemblies/Unity.CollabProxy.Editor.dll + C:/Users/Humza/Desktop/GitHub/206CDE/Library/ScriptAssemblies/Unity.CollabProxy.Editor.dll - C:/Users/Vihan/Documents/GitHub/New/206CDE/Library/ScriptAssemblies/Unity.XR.Management.Editor.dll + C:/Users/Humza/Desktop/GitHub/206CDE/Library/ScriptAssemblies/Unity.XR.Management.Editor.dll - C:/Users/Vihan/Documents/GitHub/New/206CDE/Library/ScriptAssemblies/Unity.Rider.Editor.dll + C:/Users/Humza/Desktop/GitHub/206CDE/Library/ScriptAssemblies/Unity.Rider.Editor.dll - C:/Users/Vihan/Documents/GitHub/New/206CDE/Library/ScriptAssemblies/Unity.TextMeshPro.dll + C:/Users/Humza/Desktop/GitHub/206CDE/Library/ScriptAssemblies/Unity.TextMeshPro.dll - C:/Users/Vihan/Documents/GitHub/New/206CDE/Library/ScriptAssemblies/UnityEditor.UI.dll + C:/Users/Humza/Desktop/GitHub/206CDE/Library/ScriptAssemblies/UnityEditor.UI.dll C:/Program Files/Unity/Hub/Editor/2019.3.4f1/Editor/Data/Managed/UnityEngine/UnityEngine.AIModule.dll @@ -299,59 +299,41 @@ C:/Program Files/Unity/Hub/Editor/2019.3.4f1/Editor/Data/PlaybackEngines/WindowsStandaloneSupport/UnityEditor.WindowsStandalone.Extensions.dll - - C:/Program Files/Unity/Hub/Editor/2019.3.4f1/Editor/Data/PlaybackEngines/WebGLSupport/UnityEditor.WebGL.Extensions.dll - C:/Program Files/Unity/Hub/Editor/2019.3.4f1/Editor/Data/PlaybackEngines/AndroidPlayer/UnityEditor.Android.Extensions.dll - - C:/Program Files/Unity/Hub/Editor/2019.3.4f1/Editor/Data/PlaybackEngines/MetroSupport/UnityEditor.UWP.Extensions.dll - - - C:/Program Files/Unity/Hub/Editor/2019.3.4f1/Editor/Data/PlaybackEngines/iOSSupport/UnityEditor.iOS.Extensions.dll - - - C:/Program Files/Unity/Hub/Editor/2019.3.4f1/Editor/Data/PlaybackEngines/LuminSupport/UnityEditor.Lumin.Extensions.dll - C:/Program Files (x86)/Microsoft Visual Studio Tools for Unity/16.0/Editor/SyntaxTree.VisualStudio.Unity.Bridge.dll - C:/Users/Vihan/Documents/GitHub/New/206CDE/Assets/Plugins/MySql.Data.DLL + C:/Users/Humza/Desktop/GitHub/206CDE/Assets/Plugins/MySql.Data.DLL - C:/Users/Vihan/Documents/GitHub/New/206CDE/Assets/Plugins/Renci.SshNet.dll + C:/Users/Humza/Desktop/GitHub/206CDE/Assets/Plugins/Renci.SshNet.dll - C:/Users/Vihan/Documents/GitHub/New/206CDE/Assets/Plugins/GitHub/Editor/GitHub.Api.45.dll + C:/Users/Humza/Desktop/GitHub/206CDE/Assets/Plugins/GitHub/Editor/GitHub.Api.45.dll - C:/Users/Vihan/Documents/GitHub/New/206CDE/Assets/Plugins/GitHub/Editor/GitHub.Logging.dll + C:/Users/Humza/Desktop/GitHub/206CDE/Assets/Plugins/GitHub/Editor/GitHub.Logging.dll - C:/Users/Vihan/Documents/GitHub/New/206CDE/Assets/Plugins/GitHub/Editor/GitHub.Unity.45.dll + C:/Users/Humza/Desktop/GitHub/206CDE/Assets/Plugins/GitHub/Editor/GitHub.Unity.45.dll - C:/Users/Vihan/Documents/GitHub/New/206CDE/Assets/Plugins/GitHub/Editor/GitHub.UnityShim.dll + C:/Users/Humza/Desktop/GitHub/206CDE/Assets/Plugins/GitHub/Editor/GitHub.UnityShim.dll - C:/Users/Vihan/Documents/GitHub/New/206CDE/Assets/Plugins/GitHub/Editor/sfw.net.dll + C:/Users/Humza/Desktop/GitHub/206CDE/Assets/Plugins/GitHub/Editor/sfw.net.dll - C:/Users/Vihan/Documents/GitHub/New/206CDE/Library/PackageCache/com.ptc.vuforia.engine@8.6.7/Vuforia/Plugins/Managed/Editor/Vuforia.UnityExtensions.Editor.dll + C:/Users/Humza/Desktop/GitHub/206CDE/Library/PackageCache/com.ptc.vuforia.engine@8.6.7/Vuforia/Plugins/Managed/Editor/Vuforia.UnityExtensions.Editor.dll - C:/Users/Vihan/Documents/GitHub/New/206CDE/Library/PackageCache/com.ptc.vuforia.engine@8.6.7/Vuforia/Plugins/Managed/Runtime/Vuforia.UnityExtensions.dll + C:/Users/Humza/Desktop/GitHub/206CDE/Library/PackageCache/com.ptc.vuforia.engine@8.6.7/Vuforia/Plugins/Managed/Runtime/Vuforia.UnityExtensions.dll - C:/Users/Vihan/Documents/GitHub/New/206CDE/Library/PackageCache/com.unity.ext.nunit@1.0.0/net35/unity-custom/nunit.framework.dll - - - C:/Program Files/Unity/Hub/Editor/2019.3.4f1/Editor/Data/PlaybackEngines/iOSSupport/UnityEditor.iOS.Extensions.Xcode.dll - - - C:/Program Files/Unity/Hub/Editor/2019.3.4f1/Editor/Data/PlaybackEngines/iOSSupport/UnityEditor.iOS.Extensions.Common.dll + C:/Users/Humza/Desktop/GitHub/206CDE/Library/PackageCache/com.unity.ext.nunit@1.0.0/net35/unity-custom/nunit.framework.dll C:/Program Files/Unity/Hub/Editor/2019.3.4f1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/mscorlib.dll diff --git a/Assembly-CSharp-Editor.csproj b/Assembly-CSharp-Editor.csproj index f73328c..b10c3e1 100644 --- a/Assembly-CSharp-Editor.csproj +++ b/Assembly-CSharp-Editor.csproj @@ -66,52 +66,52 @@ - C:/Users/Vihan/Documents/GitHub/New/206CDE/Library/ScriptAssemblies/UnityEditor.TestRunner.dll + C:/Users/Humza/Desktop/GitHub/206CDE/Library/ScriptAssemblies/UnityEditor.TestRunner.dll - C:/Users/Vihan/Documents/GitHub/New/206CDE/Library/ScriptAssemblies/UnityEngine.TestRunner.dll + C:/Users/Humza/Desktop/GitHub/206CDE/Library/ScriptAssemblies/UnityEngine.TestRunner.dll - C:/Users/Vihan/Documents/GitHub/New/206CDE/Library/ScriptAssemblies/Unity.XR.Management.dll + C:/Users/Humza/Desktop/GitHub/206CDE/Library/ScriptAssemblies/Unity.XR.Management.dll - C:/Users/Vihan/Documents/GitHub/New/206CDE/Library/ScriptAssemblies/Unity.Timeline.Editor.dll + C:/Users/Humza/Desktop/GitHub/206CDE/Library/ScriptAssemblies/Unity.Timeline.Editor.dll - C:/Users/Vihan/Documents/GitHub/New/206CDE/Library/ScriptAssemblies/Unity.Subsystem.Registration.dll + C:/Users/Humza/Desktop/GitHub/206CDE/Library/ScriptAssemblies/Unity.Subsystem.Registration.dll - C:/Users/Vihan/Documents/GitHub/New/206CDE/Library/ScriptAssemblies/Unity.VSCode.Editor.dll + C:/Users/Humza/Desktop/GitHub/206CDE/Library/ScriptAssemblies/Unity.VSCode.Editor.dll - C:/Users/Vihan/Documents/GitHub/New/206CDE/Library/ScriptAssemblies/VuforiaScripts.dll + C:/Users/Humza/Desktop/GitHub/206CDE/Library/ScriptAssemblies/VuforiaScripts.dll - C:/Users/Vihan/Documents/GitHub/New/206CDE/Library/ScriptAssemblies/Unity.TextMeshPro.Editor.dll + C:/Users/Humza/Desktop/GitHub/206CDE/Library/ScriptAssemblies/Unity.TextMeshPro.Editor.dll - C:/Users/Vihan/Documents/GitHub/New/206CDE/Library/ScriptAssemblies/UnityEngine.UI.dll + C:/Users/Humza/Desktop/GitHub/206CDE/Library/ScriptAssemblies/UnityEngine.UI.dll - C:/Users/Vihan/Documents/GitHub/New/206CDE/Library/ScriptAssemblies/Unity.Timeline.dll + C:/Users/Humza/Desktop/GitHub/206CDE/Library/ScriptAssemblies/Unity.Timeline.dll - C:/Users/Vihan/Documents/GitHub/New/206CDE/Library/ScriptAssemblies/VuforiaEditorScripts.dll + C:/Users/Humza/Desktop/GitHub/206CDE/Library/ScriptAssemblies/VuforiaEditorScripts.dll - C:/Users/Vihan/Documents/GitHub/New/206CDE/Library/ScriptAssemblies/Unity.CollabProxy.Editor.dll + C:/Users/Humza/Desktop/GitHub/206CDE/Library/ScriptAssemblies/Unity.CollabProxy.Editor.dll - C:/Users/Vihan/Documents/GitHub/New/206CDE/Library/ScriptAssemblies/Unity.XR.Management.Editor.dll + C:/Users/Humza/Desktop/GitHub/206CDE/Library/ScriptAssemblies/Unity.XR.Management.Editor.dll - C:/Users/Vihan/Documents/GitHub/New/206CDE/Library/ScriptAssemblies/Unity.Rider.Editor.dll + C:/Users/Humza/Desktop/GitHub/206CDE/Library/ScriptAssemblies/Unity.Rider.Editor.dll - C:/Users/Vihan/Documents/GitHub/New/206CDE/Library/ScriptAssemblies/Unity.TextMeshPro.dll + C:/Users/Humza/Desktop/GitHub/206CDE/Library/ScriptAssemblies/Unity.TextMeshPro.dll - C:/Users/Vihan/Documents/GitHub/New/206CDE/Library/ScriptAssemblies/UnityEditor.UI.dll + C:/Users/Humza/Desktop/GitHub/206CDE/Library/ScriptAssemblies/UnityEditor.UI.dll C:/Program Files/Unity/Hub/Editor/2019.3.4f1/Editor/Data/Managed/UnityEngine/UnityEngine.AIModule.dll @@ -299,59 +299,41 @@ C:/Program Files/Unity/Hub/Editor/2019.3.4f1/Editor/Data/PlaybackEngines/WindowsStandaloneSupport/UnityEditor.WindowsStandalone.Extensions.dll - - C:/Program Files/Unity/Hub/Editor/2019.3.4f1/Editor/Data/PlaybackEngines/WebGLSupport/UnityEditor.WebGL.Extensions.dll - C:/Program Files/Unity/Hub/Editor/2019.3.4f1/Editor/Data/PlaybackEngines/AndroidPlayer/UnityEditor.Android.Extensions.dll - - C:/Program Files/Unity/Hub/Editor/2019.3.4f1/Editor/Data/PlaybackEngines/MetroSupport/UnityEditor.UWP.Extensions.dll - - - C:/Program Files/Unity/Hub/Editor/2019.3.4f1/Editor/Data/PlaybackEngines/iOSSupport/UnityEditor.iOS.Extensions.dll - - - C:/Program Files/Unity/Hub/Editor/2019.3.4f1/Editor/Data/PlaybackEngines/LuminSupport/UnityEditor.Lumin.Extensions.dll - C:/Program Files (x86)/Microsoft Visual Studio Tools for Unity/16.0/Editor/SyntaxTree.VisualStudio.Unity.Bridge.dll - C:/Users/Vihan/Documents/GitHub/New/206CDE/Assets/Plugins/MySql.Data.DLL + C:/Users/Humza/Desktop/GitHub/206CDE/Assets/Plugins/MySql.Data.DLL - C:/Users/Vihan/Documents/GitHub/New/206CDE/Assets/Plugins/Renci.SshNet.dll + C:/Users/Humza/Desktop/GitHub/206CDE/Assets/Plugins/Renci.SshNet.dll - C:/Users/Vihan/Documents/GitHub/New/206CDE/Assets/Plugins/GitHub/Editor/GitHub.Api.45.dll + C:/Users/Humza/Desktop/GitHub/206CDE/Assets/Plugins/GitHub/Editor/GitHub.Api.45.dll - C:/Users/Vihan/Documents/GitHub/New/206CDE/Assets/Plugins/GitHub/Editor/GitHub.Logging.dll + C:/Users/Humza/Desktop/GitHub/206CDE/Assets/Plugins/GitHub/Editor/GitHub.Logging.dll - C:/Users/Vihan/Documents/GitHub/New/206CDE/Assets/Plugins/GitHub/Editor/GitHub.Unity.45.dll + C:/Users/Humza/Desktop/GitHub/206CDE/Assets/Plugins/GitHub/Editor/GitHub.Unity.45.dll - C:/Users/Vihan/Documents/GitHub/New/206CDE/Assets/Plugins/GitHub/Editor/GitHub.UnityShim.dll + C:/Users/Humza/Desktop/GitHub/206CDE/Assets/Plugins/GitHub/Editor/GitHub.UnityShim.dll - C:/Users/Vihan/Documents/GitHub/New/206CDE/Assets/Plugins/GitHub/Editor/sfw.net.dll + C:/Users/Humza/Desktop/GitHub/206CDE/Assets/Plugins/GitHub/Editor/sfw.net.dll - C:/Users/Vihan/Documents/GitHub/New/206CDE/Library/PackageCache/com.ptc.vuforia.engine@8.6.7/Vuforia/Plugins/Managed/Editor/Vuforia.UnityExtensions.Editor.dll + C:/Users/Humza/Desktop/GitHub/206CDE/Library/PackageCache/com.ptc.vuforia.engine@8.6.7/Vuforia/Plugins/Managed/Editor/Vuforia.UnityExtensions.Editor.dll - C:/Users/Vihan/Documents/GitHub/New/206CDE/Library/PackageCache/com.ptc.vuforia.engine@8.6.7/Vuforia/Plugins/Managed/Runtime/Vuforia.UnityExtensions.dll + C:/Users/Humza/Desktop/GitHub/206CDE/Library/PackageCache/com.ptc.vuforia.engine@8.6.7/Vuforia/Plugins/Managed/Runtime/Vuforia.UnityExtensions.dll - C:/Users/Vihan/Documents/GitHub/New/206CDE/Library/PackageCache/com.unity.ext.nunit@1.0.0/net35/unity-custom/nunit.framework.dll - - - C:/Program Files/Unity/Hub/Editor/2019.3.4f1/Editor/Data/PlaybackEngines/iOSSupport/UnityEditor.iOS.Extensions.Xcode.dll - - - C:/Program Files/Unity/Hub/Editor/2019.3.4f1/Editor/Data/PlaybackEngines/iOSSupport/UnityEditor.iOS.Extensions.Common.dll + C:/Users/Humza/Desktop/GitHub/206CDE/Library/PackageCache/com.unity.ext.nunit@1.0.0/net35/unity-custom/nunit.framework.dll C:/Program Files/Unity/Hub/Editor/2019.3.4f1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/mscorlib.dll diff --git a/Assembly-CSharp.csproj b/Assembly-CSharp.csproj index 2da8f2d..9db67ba 100644 --- a/Assembly-CSharp.csproj +++ b/Assembly-CSharp.csproj @@ -77,6 +77,7 @@ + @@ -134,52 +135,53 @@ + - C:/Users/Vihan/Documents/GitHub/New/206CDE/Library/ScriptAssemblies/Unity.XR.Management.dll + C:/Users/Humza/Desktop/GitHub/206CDE/Library/ScriptAssemblies/Unity.XR.Management.dll - C:/Users/Vihan/Documents/GitHub/New/206CDE/Library/ScriptAssemblies/Unity.Timeline.Editor.dll + C:/Users/Humza/Desktop/GitHub/206CDE/Library/ScriptAssemblies/Unity.Timeline.Editor.dll - C:/Users/Vihan/Documents/GitHub/New/206CDE/Library/ScriptAssemblies/Unity.Subsystem.Registration.dll + C:/Users/Humza/Desktop/GitHub/206CDE/Library/ScriptAssemblies/Unity.Subsystem.Registration.dll - C:/Users/Vihan/Documents/GitHub/New/206CDE/Library/ScriptAssemblies/Unity.VSCode.Editor.dll + C:/Users/Humza/Desktop/GitHub/206CDE/Library/ScriptAssemblies/Unity.VSCode.Editor.dll - C:/Users/Vihan/Documents/GitHub/New/206CDE/Library/ScriptAssemblies/VuforiaScripts.dll + C:/Users/Humza/Desktop/GitHub/206CDE/Library/ScriptAssemblies/VuforiaScripts.dll - C:/Users/Vihan/Documents/GitHub/New/206CDE/Library/ScriptAssemblies/Unity.TextMeshPro.Editor.dll + C:/Users/Humza/Desktop/GitHub/206CDE/Library/ScriptAssemblies/Unity.TextMeshPro.Editor.dll - C:/Users/Vihan/Documents/GitHub/New/206CDE/Library/ScriptAssemblies/UnityEngine.UI.dll + C:/Users/Humza/Desktop/GitHub/206CDE/Library/ScriptAssemblies/UnityEngine.UI.dll - C:/Users/Vihan/Documents/GitHub/New/206CDE/Library/ScriptAssemblies/Unity.Timeline.dll + C:/Users/Humza/Desktop/GitHub/206CDE/Library/ScriptAssemblies/Unity.Timeline.dll - C:/Users/Vihan/Documents/GitHub/New/206CDE/Library/ScriptAssemblies/VuforiaEditorScripts.dll + C:/Users/Humza/Desktop/GitHub/206CDE/Library/ScriptAssemblies/VuforiaEditorScripts.dll - C:/Users/Vihan/Documents/GitHub/New/206CDE/Library/ScriptAssemblies/Unity.CollabProxy.Editor.dll + C:/Users/Humza/Desktop/GitHub/206CDE/Library/ScriptAssemblies/Unity.CollabProxy.Editor.dll - C:/Users/Vihan/Documents/GitHub/New/206CDE/Library/ScriptAssemblies/Unity.XR.Management.Editor.dll + C:/Users/Humza/Desktop/GitHub/206CDE/Library/ScriptAssemblies/Unity.XR.Management.Editor.dll - C:/Users/Vihan/Documents/GitHub/New/206CDE/Library/ScriptAssemblies/Unity.Rider.Editor.dll + C:/Users/Humza/Desktop/GitHub/206CDE/Library/ScriptAssemblies/Unity.Rider.Editor.dll - C:/Users/Vihan/Documents/GitHub/New/206CDE/Library/ScriptAssemblies/Unity.TextMeshPro.dll + C:/Users/Humza/Desktop/GitHub/206CDE/Library/ScriptAssemblies/Unity.TextMeshPro.dll - C:/Users/Vihan/Documents/GitHub/New/206CDE/Library/ScriptAssemblies/UnityEditor.UI.dll + C:/Users/Humza/Desktop/GitHub/206CDE/Library/ScriptAssemblies/UnityEditor.UI.dll C:/Program Files/Unity/Hub/Editor/2019.3.4f1/Editor/Data/Managed/UnityEngine/UnityEngine.AIModule.dll @@ -359,19 +361,13 @@ C:/Program Files/Unity/Hub/Editor/2019.3.4f1/Editor/Data/Managed/UnityEngine/UnityEngine.XRModule.dll - C:/Users/Vihan/Documents/GitHub/New/206CDE/Assets/Plugins/MySql.Data.DLL + C:/Users/Humza/Desktop/GitHub/206CDE/Assets/Plugins/MySql.Data.DLL - C:/Users/Vihan/Documents/GitHub/New/206CDE/Assets/Plugins/Renci.SshNet.dll + C:/Users/Humza/Desktop/GitHub/206CDE/Assets/Plugins/Renci.SshNet.dll - C:/Users/Vihan/Documents/GitHub/New/206CDE/Library/PackageCache/com.ptc.vuforia.engine@8.6.7/Vuforia/Plugins/Managed/Runtime/Vuforia.UnityExtensions.dll - - - C:/Program Files/Unity/Hub/Editor/2019.3.4f1/Editor/Data/PlaybackEngines/iOSSupport/UnityEditor.iOS.Extensions.Xcode.dll - - - C:/Program Files/Unity/Hub/Editor/2019.3.4f1/Editor/Data/PlaybackEngines/iOSSupport/UnityEditor.iOS.Extensions.Common.dll + C:/Users/Humza/Desktop/GitHub/206CDE/Library/PackageCache/com.ptc.vuforia.engine@8.6.7/Vuforia/Plugins/Managed/Runtime/Vuforia.UnityExtensions.dll C:/Program Files/Unity/Hub/Editor/2019.3.4f1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/mscorlib.dll diff --git a/Assets/Scripts/BuildingDescriptionSet.cs b/Assets/Scripts/BuildingDescriptionSet.cs new file mode 100644 index 0000000..9d1cbf3 --- /dev/null +++ b/Assets/Scripts/BuildingDescriptionSet.cs @@ -0,0 +1,122 @@ +using UnityEngine; +using UnityEngine.UI; +using System; +using System.Collections.Generic; +using System.Data; +using System.Configuration; +using MySql.Data.MySqlClient; +using Renci.SshNet; +using System.Xml.Linq; +using System.Linq; + +public class BuildingDescriptionSet : MonoBehaviour +{ + //this function pings server to see if we can connect to db + void Start() + { + //create ping to test server connectivity + var ping = new System.Net.NetworkInformation.Ping(); + //send the ping to the server + var internetCheck = ping.Send("68.183.39.178"); + + if (internetCheck.Status == System.Net.NetworkInformation.IPStatus.Success) + { + //if we can connect to server, get data from database + GetDataDB(); + } + else + { + //if we cannot connect to server, get data from XML file + GetDataXML(); + } + } + + //get data from XML file + public void GetDataXML() + { + //load xml file + XElement buildings = XElement.Load("Building.xml"); + + //run query so only get node with matching buildingName + IEnumerable buildingInfo = + from el in buildings.Elements("building") + where (string)el.Element("Name") == GlobalData.buildingName + select el; + + //string list to store information in + List buildingData = new List(); + + //loop to append information to list + foreach (var item in buildingInfo) + { + buildingData.Add(item.Value.ToString()); //append item to list + } + + //call function to show data on screen + SetData(buildingData); + } + + //get data from database + public void GetDataDB() + { + using (var client = new SshClient("68.183.39.178", "root", "206CDEcde")) // establishing ssh connection to server where MySql is hosted + { + client.Connect(); + if (client.IsConnected) + { + //string list to store building data from db + List buildingData = new List(); + + var portForwarded = new ForwardedPortLocal("127.0.0.1", 3306, "127.0.0.1", 3306); + client.AddForwardedPort(portForwarded); + portForwarded.Start(); + using (MySqlConnection con = new MySqlConnection("SERVER = 127.0.0.1; PORT = 3306; UID = admin; PASSWORD = f8d992fe9ec1b8f44795a4486c9ddf6a3e40b328a6a29ece; DATABASE = DB")) + { + + /* set SQL query + * SELECT Name, Address, Hstory (because these are the attributes we need to display + * FROM Buildings (the table where the fields are) + * WHERE Name = 'GlobalData.buildingName' (filter data so only get required building). */ + using (MySqlCommand com = new MySqlCommand("SELECT Name, Address, History FROM `Buildings` WHERE Name = '" + GlobalData.buildingName + "'", con)) + { + + DataSet ds = new DataSet(); + MySqlDataAdapter da = new MySqlDataAdapter(com); + da.Fill(ds); + foreach (DataRow drow in ds.Tables[0].Rows) + { + foreach (DataColumn dCol in ds.Tables[0].Columns) + { + //append information from databases to list + buildingData.Add(drow[dCol].ToString()); + } + } + //after for loop ends, call function to write list to text object + SetData(buildingData); + } + } + client.Disconnect(); + } + else + { + Console.WriteLine("Client cannot be reached..."); + } + } + } + + //write data on screen after retrieving from either method + public void SetData(List buildingData) + { + //get object containing component + GameObject buildingText = GameObject.Find("BuildingText"); + + //get component from within object so it can be modified + var textObject = buildingText.GetComponent(); + + //add items from list to text component with new lines for formatting + foreach (var item in buildingData) + { + textObject.text = textObject.text + item + "\n\n"; + } + } +} diff --git a/Assets/Scripts/BuildingDescriptionSet.cs.meta b/Assets/Scripts/BuildingDescriptionSet.cs.meta new file mode 100644 index 0000000..d25c89b --- /dev/null +++ b/Assets/Scripts/BuildingDescriptionSet.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: e4495ede6a733c5448285021fc5319e9 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/building description.unity b/Assets/building description.unity index f476e20..c547d03 100644 --- a/Assets/building description.unity +++ b/Assets/building description.unity @@ -649,6 +649,8 @@ GameObject: - component: {fileID: 1134404012} - component: {fileID: 1134404011} - component: {fileID: 1134404014} + - component: {fileID: 1134404015} + - component: {fileID: 1134404016} m_Layer: 0 m_Name: Main Camera m_TagString: MainCamera @@ -733,6 +735,30 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 68862d82212bcbf438ee81e4b3c8694f, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!114 &1134404015 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1134404010} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 256063c6304c1e34caae47e00ee82405, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!114 &1134404016 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1134404010} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e4495ede6a733c5448285021fc5319e9, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &1175117413 GameObject: m_ObjectHideFlags: 0 @@ -993,7 +1019,7 @@ MonoBehaviour: m_TargetGraphic: {fileID: 111855700} m_HandleRect: {fileID: 111855699} m_Direction: 2 - m_Value: 0.99999297 + m_Value: 0.99999285 m_Size: 0.45593825 m_NumberOfSteps: 0 m_OnValueChanged: @@ -1120,7 +1146,7 @@ GameObject: - component: {fileID: 1528175432} - component: {fileID: 1528175431} m_Layer: 5 - m_Name: Text + m_Name: BuildingText m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -1176,43 +1202,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: 'data from data base - - - The juxtaposition of boyfriend and panda is - truly inspired." - - - The Daily Tale - - "I don''t like short poems. So why - am I reviewing a haiku, you may wonder? Well, I liked the title - ''Boyfriend''. - It went down hill from there." - - - Enid Kibbler - - "Amazing how so few words - can set a scene so perfectly. I close my eyes and all I can see is the loving - wintertime." - - - Hit the Spoof - - "I felt that I was a boyfriend. It was - spooky. I hope to read more by Anon. Perhaps next time, something longer." - - - - Zob Gloop - - "I''ve always wanted to write a haiku about a boyfriend. I can''t - belive Anon has beaten me to it." - - - Betty Borison - - "Loving wintertime - is a popular first line for a haiku. It''s incredible how much diversity can - be achieved with those final lines." - - - Chris Critic, otherwise known as - Cristic' + m_Text: --- !u!222 &1528175432 CanvasRenderer: m_ObjectHideFlags: 0 diff --git a/Assets/building.xml b/Assets/building.xml new file mode 100644 index 0000000..4e1173f --- /dev/null +++ b/Assets/building.xml @@ -0,0 +1,2 @@ + +Alma
Alma St, Coventry CV1 5QA
This was built in the 1920s and is the home of our professional services such as Estates and Finance. This was the site of the Singer Works, out of which the Singer Penny Farthing was born and it also holds the origins to Coventry City Football Club.Bugatti
Grove St, Coventry CV1 5PH
This building funded by the Bugatti trust was built in 2002 and provides a valuable space for our Faculty of Arts and Humanities. In particular this is used in the areas of Automotive & Transport Design with very strong industry links.Charles Ward
Cope St, Coventry CV1 5FD
Built in the 1950s this building is used mainly by our Faculty of Health and Life Sciences. The building was named after a key figure for the University, who was a University Governor, and became Vice Chair of the Board of Governors in 1982.Engineering & Computing Building
3 Gulson Rd, Coventry CV1 2JH
This building was cleted in 2012 and is used solely by our Faculty of Engineering, Environment and Computing. The 50m project delivered a highly sustainable building that uses a range of technologies including rainwater harvesting, solar thermal energy and biomass boilers. Facilities include a high precision wind-tunnel, a 3m high-performance engineering centre, a Harrier Jump Jet, three flight simulators and the UKs largest magnet.Ellen Terry
34-35 Jordan Well, Coventry CV1 5RW
This is used by our Faculty of Arts and Humanities, specifically for the performing arts, media and music. Built in 1880, the building underwent a major refurbishment in 2000. Fittingly, it was previously a cinema, and is named after Dame Ellen Terry, a star of the Victorian stage and a leading Shakespearean actress.George Eliot
Priory St, Coventry CV1 5FB
This building was built in 1960 and is used solely by our Faculty of Business and Law. George Eliot is the pen name of the novelist Mary Anne Evans (1819-1880) and was one of the leading writers of the Victorian era.Graham Sutherland
Cox St, Coventry CV1 5PH
Built in 1959, this building is currently undergoing an extensive internal redevelopment. Once completed, it will continue to be used by the Faculty of Arts and Humanities, predominantly by design and visual art students. It is aptly named after the painter and printmaker Graham Sutherland, who created the world-famous tapestry Christ in Glory in Coventry Cathedral.TheHub
Priory St, Coventry CV1 5FB
Completed in 2011 TheHubis a modern, hi-tech building providing a welcoming social space for our students. Facilities in the building include a doctors surgery, a multi-cultural faith centre, employment services, catering services, as well as hairdressers, food court and the Students Union offices. This building also has a large fully licensed function space with bars and a multi-purpose venue space. The building achieved a BREEAM status of Excellent.Jaguar
113A Gosford St, Coventry CV1 5DL
This building was built in the late 1970s and sponsored by the Coventry based car manufacturer. It has recently undergone a significant refurbishment, with additional improvements planned. It is now home to our Postgraduate students, as well as our researchers within the Centre for Business in Society (CBiS).John Laing
Much Park St, Coventry CV1 2LT
This building is primarily used by the Faculty of Engineering, Environment and Computing, offering courses relating to the construction sector. It was built in 1970, and is named after Sir John Laing, a British entrepreneur in the construction industry.Lanchester Library
Gosford St, Coventry CV1 5DD
This striking building houses the main university library. It was opened in 2001, and in 2019 was upgraded to bring together all elements of academic support into one location, with a new entrance, cafe and collaboration spaces on the ground floor. It is named after Frederick Lanchester, the Coventry-based designer of the first British petrol-driven car. It is equipped with more than 350 computers, group and individual study rooms, books, journals, and electronic resources across five floors.Maurice Foss
Cox St, Coventry CV1 5PH
Built in 1978, this building is currently undergoing an extensive internal redevelopment. Once completed, it will continue to be used by the Faculty of Arts and Humanities, primarily for industrial design courses. The building is named after Maurice Foss, the former Deputy Director of Coventry Polytechnic and one of the universitys Honorary Life Fellows.Mile Lane
8 Mile Ln, Coventry CV1 2TU
This is the new state-of-the-art campus for CU Coventry, which offers an innovative education model designed to integrate study into your life. The building is a cutting-edge learning environment designed to enable collaboration, creativity and innovation to flourish, with on-site parking, energy-efficient features and high quality catering facilities.Multi-Storey Car Park
Gosford St, Coventry CV1 5DL
This is our impressive multi-storey car park, opened for staff and visitors in 2010. It has 457 spaces over 15 floors, including spaces for electric vehicles.Priory Building
Priory Building, Coventry CV1 5FJ
Built in 1964, this is occupied by the Cambridge Education Group, which runs its Coventry foundation campus from here, offering university pathway courses for overseas students who wish to gain entry to UK universities. The building also houses a large sports hall.Richard Crossman
Jordan Well, Road, Coventry CV1 5RW
This was built in 1971 and is named after the political journalist and Labour politician Richard Crossman, who represented Coventry East from 1945 to 1974. It is used by the Faculty of Health and Life Sciences, primarily for psychology, criminology and social sciences subjects, and includes mock prison cells and psychology labs.Student Centre
1 Gulson Rd, Coventry CV1 2JH
Opened in 2006, the centre is home to many of our key student services as well as our International Office. This is where our students enrol and is also a main information point for student accommodation and finance queries.Whaitfriars
62 Whitefriars St, Coventry CV1 2DS
This is a small office used by our Faculty of Health and Life Sciences. Built in 1922, its name is drawn from the Carmelite Friary founded in 1342 in Coventry.William Lyons
Gosford St, Coventry CV1 5DL
Constructed in 1980, this building is used by a number of our professional services teams. It is named after Sir William Lyons, the co-founder of the Swallow Sidecar Company, which subsequently became Jaguar Cars Limited.William Morris
Gosford St, Coventry CV1 5DL
This building began life in 1910 as a factory and is named after the founder of the Morris car company, which used this building as part of its engine production unit. It was converted for use by the university and is now occupied by our Faculty of Business and Law. diff --git a/Assets/building.xml.meta b/Assets/building.xml.meta new file mode 100644 index 0000000..61f601a --- /dev/null +++ b/Assets/building.xml.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 0e2e16c410f76544e9a8e6b4e33aede5 +TextScriptImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/QCAR/somedata16 b/QCAR/somedata16 index 1e16d57..4be8564 100644 --- a/QCAR/somedata16 +++ b/QCAR/somedata16 @@ -1 +1 @@ -AAABmQ1o0BTodwvBDSSh3Q6YxFSxkjSuca8ENqC/47Jd8iDBFUPWyt2o/ZzVRVgbYIOjCPWtBDKFe7XDyePkEcPHr+Lw5lPoIlILKOfTamT/4IggddPQR6GS2aEO5reP3zW+10DSpw+bQiVvBAk+Hm9/QwSsx8EfYuL3noKZBn4R8liYX8aE9T5Xg0BdWwLh1hqlqfClWlAoyVvEUIQ2eYQYnQrENRhlLx4jPDulrAUwzIrSp5mJpYeP+X2aXH+W8nQlukRnuN6sEdOeW88OzYjYLVizCUwXqMJwIkUI7Jvf6tkTLytABM9+CsgDKy3uok9qxZWiCeK+LfIjxqFr25u7WXE= \ No newline at end of file +AAABmQYoNDR3xsyIBiBRDrvLOCHMuydFxDxuHRyaRz7pJ/p/xxQOQWpvIg+wTjkKQYWw00kqKrbJucV8C60fm9DJirsOBp9VnaQGlqTTcXi0jBdf0ZTkqqQgZ2U8VN76LoGodsFnf90Vgi1z9WM3yeWFB+qJKLflnHa96SoudCejQbgZGONMw1rJUzPJgw0lXZcBQyjoopwVeC0A27f0v1Z4eD3G8UJCfjGi3vdcfjzhBqWyS3gzSeCAT2BzdxGvIELEZAXjA5s2MGo7/WQm44Rkt9OsIZrmQhCIUKpT0mJrKnW53qaXeM9YvcHzL33w6zjPkUcMJdlspyV3QUYBN2GiWts= \ No newline at end of file diff --git a/obj/Debug/Assembly-CSharp-Editor-firstpass.csprojAssemblyReference.cache b/obj/Debug/Assembly-CSharp-Editor-firstpass.csprojAssemblyReference.cache index 1584b18..3ffd8e1 100644 Binary files a/obj/Debug/Assembly-CSharp-Editor-firstpass.csprojAssemblyReference.cache and b/obj/Debug/Assembly-CSharp-Editor-firstpass.csprojAssemblyReference.cache differ diff --git a/obj/Debug/Assembly-CSharp-Editor.csprojAssemblyReference.cache b/obj/Debug/Assembly-CSharp-Editor.csprojAssemblyReference.cache index 9058fd5..6544d70 100644 Binary files a/obj/Debug/Assembly-CSharp-Editor.csprojAssemblyReference.cache and b/obj/Debug/Assembly-CSharp-Editor.csprojAssemblyReference.cache differ diff --git a/obj/Debug/Assembly-CSharp.csprojAssemblyReference.cache b/obj/Debug/Assembly-CSharp.csprojAssemblyReference.cache index a7d5103..547a5a3 100644 Binary files a/obj/Debug/Assembly-CSharp.csprojAssemblyReference.cache and b/obj/Debug/Assembly-CSharp.csprojAssemblyReference.cache differ diff --git a/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache index 25bbc1f..8a8a4a4 100644 Binary files a/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache and b/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache differ