Modified launcher form

Former-commit-id: 6492bc1
Autodesk · Jan 5, 2018 · 502c7ed · 502c7ed
2 parents 17bb9a7 + 774fca0
commit 502c7ed
Show file tree

Hide file tree

Showing 21 changed files with 141 additions and 119 deletions.
diff --git a/engine/unity5/Assets/Scripts/FEA/ReplayExporter.cs b/engine/unity5/Assets/Scripts/FEA/ReplayExporter.cs
@@ -24,7 +24,7 @@ public static class ReplayExporter
         public static void Write(string fileName, string fieldPath, List<Tracker> trackers, List<List<ContactDescriptor>> contacts)
         {
             using (XmlWriter writer = XmlWriter.Create(
-                Environment.GetFolderPath(Environment.SpecialFolder.MyDocuments) + "\\Synthesis\\Replays\\" + fileName + ".replay",
+                Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData) + "\\Synthesis\\Replays\\" + fileName + ".replay",
                 new XmlWriterSettings()))
             {
                 writer.WriteStartElement("replay");

diff --git a/engine/unity5/Assets/Scripts/FEA/ReplayImporter.cs b/engine/unity5/Assets/Scripts/FEA/ReplayImporter.cs
@@ -33,7 +33,7 @@ public static void Read(string fileName, out string fieldPath,
             contacts = new List<List<KeyValuePair<ContactDescriptor, int>>>();
 
             using (XmlReader reader = XmlReader.Create(
-                Environment.GetFolderPath(Environment.SpecialFolder.MyDocuments) + "\\Synthesis\\Replays\\" + fileName + ".replay"))
+                Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData) + "\\Synthesis\\Replays\\" + fileName + ".replay"))
             {
                 foreach (string name in AllElements(reader))
                 {

diff --git a/engine/unity5/Assets/Scripts/GUI/FileBrowser.cs b/engine/unity5/Assets/Scripts/GUI/FileBrowser.cs
@@ -59,7 +59,7 @@ public bool Active
     /// <summary>
     /// Default Directory Path
     /// </summary>
-    private string directoryPath = System.Environment.GetFolderPath(System.Environment.SpecialFolder.MyDocuments);
+    private string directoryPath = System.Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData);
     private string backupPath = new DirectoryInfo(Application.dataPath).FullName;
 
     /// <summary>

diff --git a/engine/unity5/Assets/Scripts/GUI/MainMenu.cs b/engine/unity5/Assets/Scripts/GUI/MainMenu.cs
@@ -628,7 +628,7 @@ public void SelectDeleteReplay()
 
         if (entry != null)
         {
-            File.Delete(Environment.GetFolderPath(Environment.SpecialFolder.MyDocuments) + "\\Synthesis\\Replays\\" + entry + ".replay");
+            File.Delete(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData) + "\\Synthesis\\Replays\\" + entry + ".replay");
             replayList.SetActive(false);
             replayList.SetActive(true);
         }
@@ -647,23 +647,23 @@ void Start()
         robots = new ArrayList();
 
         //Creates the replay directory
-        FileInfo file = new FileInfo(Environment.GetFolderPath(Environment.SpecialFolder.MyDocuments) + "\\Synthesis\\Replays\\");
+        FileInfo file = new FileInfo(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData) + "\\Synthesis\\Replays\\");
         file.Directory.Create();
 
         //Assigns the currently store registry values or default file path to the proper variables if they exist.
-        robotDirectory = PlayerPrefs.GetString("RobotDirectory", (System.Environment.GetFolderPath(System.Environment.SpecialFolder.MyDocuments) + "//synthesis//Robots"));
-        fieldDirectory = PlayerPrefs.GetString("FieldDirectory", (System.Environment.GetFolderPath(System.Environment.SpecialFolder.MyDocuments) + "//synthesis//Fields"));
+        robotDirectory = PlayerPrefs.GetString("RobotDirectory", (System.Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData) + "//synthesis//Robots"));
+        fieldDirectory = PlayerPrefs.GetString("FieldDirectory", (System.Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData) + "//synthesis//Fields"));
 
         //If the directory doesn't exist, create it.
         if (!Directory.Exists(robotDirectory))
         {
-            file = new FileInfo(Environment.GetFolderPath(Environment.SpecialFolder.MyDocuments) + "\\Synthesis\\Robots\\");
+            file = new FileInfo(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData) + "\\Synthesis\\Robots\\");
             file.Directory.Create();
             robotDirectory = file.Directory.FullName;
         }
         if (!Directory.Exists(fieldDirectory))
         {
-            file = new FileInfo(Environment.GetFolderPath(Environment.SpecialFolder.MyDocuments) + "\\Synthesis\\Fields\\");
+            file = new FileInfo(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData) + "\\Synthesis\\Fields\\");
             file.Directory.Create();
             fieldDirectory = file.Directory.FullName;
         }

diff --git a/engine/unity5/Assets/Scripts/GUI/Scrollables/ChangeFieldScrollable.cs b/engine/unity5/Assets/Scripts/GUI/Scrollables/ChangeFieldScrollable.cs
@@ -24,7 +24,7 @@ protected override void Start()
 
     void OnEnable()
     {
-        directory = PlayerPrefs.GetString("FieldDirectory", (System.Environment.GetFolderPath(System.Environment.SpecialFolder.MyDocuments) + "//synthesis//fields"));
+        directory = PlayerPrefs.GetString("FieldDirectory", (System.Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData) + "//synthesis//fields"));
         items = new List<string>();
         items.Clear();
     }

diff --git a/engine/unity5/Assets/Scripts/GUI/Scrollables/ChangeRobotScrollable.cs b/engine/unity5/Assets/Scripts/GUI/Scrollables/ChangeRobotScrollable.cs
@@ -25,7 +25,7 @@ protected override void Start()
 
     void OnEnable()
     {
-        directory = PlayerPrefs.GetString("RobotDirectory", (System.Environment.GetFolderPath(System.Environment.SpecialFolder.MyDocuments) + "//synthesis//Robots"));
+        directory = PlayerPrefs.GetString("RobotDirectory", (System.Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData) + "//synthesis//Robots"));
         items = new List<string>();
         items.Clear();
 

diff --git a/engine/unity5/Assets/Scripts/GUI/Scrollables/ScrollableList.cs b/engine/unity5/Assets/Scripts/GUI/Scrollables/ScrollableList.cs
@@ -50,7 +50,7 @@ void OnGUI()
     {
         if (listType.Equals("Replays") && items.Count == 0)
         {
-            string[] files = Directory.GetFiles(Environment.GetFolderPath(Environment.SpecialFolder.MyDocuments) + "\\Synthesis\\Replays\\", "*.replay");
+            string[] files = Directory.GetFiles(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData) + "\\Synthesis\\Replays\\", "*.replay");
 
             foreach (string file in files)
                 items.Add(new FileInfo(file).Name.Split('.')[0]);

diff --git a/engine/unity5/Assets/Scripts/MixAndMatch/MaMGetters.cs b/engine/unity5/Assets/Scripts/MixAndMatch/MaMGetters.cs
@@ -14,19 +14,19 @@ public string GetDriveBase(int baseID)
         {
             case 0: //Default Drive Base
                 RobotTypeManager.IsMecanum = false;
-                return (System.Environment.GetFolderPath(System.Environment.SpecialFolder.MyDocuments) + "\\Synthesis\\MixAndMatch\\DriveBases\\Default");
+                return (System.Environment.GetFolderPath(System.Environment.SpecialFolder.ApplicationData) + "\\Synthesis\\MixAndMatch\\DriveBases\\Default");
             case 1: //Mech Drive Base
                 RobotTypeManager.IsMecanum = true;
-                return (System.Environment.GetFolderPath(System.Environment.SpecialFolder.MyDocuments) + "\\Synthesis\\MixAndMatch\\DriveBases\\SyntheMac");
+                return (System.Environment.GetFolderPath(System.Environment.SpecialFolder.ApplicationData) + "\\Synthesis\\MixAndMatch\\DriveBases\\SyntheMac");
             case 2: //Swerve Drive
                 RobotTypeManager.IsMecanum = false;
-                return (System.Environment.GetFolderPath(System.Environment.SpecialFolder.MyDocuments) + "\\Synthesis\\MixAndMatch\\DriveBases\\SyntheSwerve");
+                return (System.Environment.GetFolderPath(System.Environment.SpecialFolder.ApplicationData) + "\\Synthesis\\MixAndMatch\\DriveBases\\SyntheSwerve");
             case 3: //Narrow Drive
                 RobotTypeManager.IsMecanum = false;
-                return (System.Environment.GetFolderPath(System.Environment.SpecialFolder.MyDocuments) + "\\Synthesis\\MixAndMatch\\DriveBases\\Non");
+                return (System.Environment.GetFolderPath(System.Environment.SpecialFolder.ApplicationData) + "\\Synthesis\\MixAndMatch\\DriveBases\\Non");
         }
 
-        return (System.Environment.GetFolderPath(System.Environment.SpecialFolder.MyDocuments) + "\\Synthesis\\MixAndMatch\\DriveBases\\DriveBase2557");
+        return (System.Environment.GetFolderPath(System.Environment.SpecialFolder.ApplicationData) + "\\Synthesis\\MixAndMatch\\DriveBases\\DriveBase2557");
     }
 
     /// <summary>
@@ -42,15 +42,15 @@ public string GetManipulator(int manipulatorID)
                 break;
             case 1: //SyntheClaw
                 RobotTypeManager.HasManipulator = true;
-                return (System.Environment.GetFolderPath(System.Environment.SpecialFolder.MyDocuments) + "\\Synthesis\\MixAndMatch\\Manipulators\\Claw");
+                return (System.Environment.GetFolderPath(System.Environment.SpecialFolder.ApplicationData) + "\\Synthesis\\MixAndMatch\\Manipulators\\Claw");
             case 2: //SyntheShot
                 RobotTypeManager.HasManipulator = true;
-                return (System.Environment.GetFolderPath(System.Environment.SpecialFolder.MyDocuments) + "\\Synthesis\\MixAndMatch\\Manipulators\\SyntheShot");
+                return (System.Environment.GetFolderPath(System.Environment.SpecialFolder.ApplicationData) + "\\Synthesis\\MixAndMatch\\Manipulators\\SyntheShot");
             case 3: //Lift
                 RobotTypeManager.HasManipulator = true;
-                return (System.Environment.GetFolderPath(System.Environment.SpecialFolder.MyDocuments) + "\\Synthesis\\MixAndMatch\\Manipulators\\SyntheLift");
+                return (System.Environment.GetFolderPath(System.Environment.SpecialFolder.ApplicationData) + "\\Synthesis\\MixAndMatch\\Manipulators\\SyntheLift");
         }
-        return (System.Environment.GetFolderPath(System.Environment.SpecialFolder.MyDocuments) + "\\Synthesis\\MixAndMatch\\Manipulators\\Claw");
+        return (System.Environment.GetFolderPath(System.Environment.SpecialFolder.ApplicationData) + "\\Synthesis\\MixAndMatch\\Manipulators\\Claw");
     }
 
     ///<summary>
@@ -61,17 +61,17 @@ public string GetWheel(int wheelID)
         switch (wheelID)
         {
             case 0: //traction wheel
-                return (System.Environment.GetFolderPath(System.Environment.SpecialFolder.MyDocuments) + "\\Synthesis\\MixAndMatch\\Wheels\\Traction");
+                return (System.Environment.GetFolderPath(System.Environment.SpecialFolder.ApplicationData) + "\\Synthesis\\MixAndMatch\\Wheels\\Traction");
             case 1: //colson wheel
-                return (System.Environment.GetFolderPath(System.Environment.SpecialFolder.MyDocuments) + "\\Synthesis\\MixAndMatch\\Wheels\\Colson");
+                return (System.Environment.GetFolderPath(System.Environment.SpecialFolder.ApplicationData) + "\\Synthesis\\MixAndMatch\\Wheels\\Colson");
             case 2: //omni wheel
-                return (System.Environment.GetFolderPath(System.Environment.SpecialFolder.MyDocuments) + "\\Synthesis\\MixAndMatch\\Wheels\\Omni");
+                return (System.Environment.GetFolderPath(System.Environment.SpecialFolder.ApplicationData) + "\\Synthesis\\MixAndMatch\\Wheels\\Omni");
             case 3: //pnemuatic wheel
-                return (System.Environment.GetFolderPath(System.Environment.SpecialFolder.MyDocuments) + "\\Synthesis\\MixAndMatch\\Wheels\\Pneumatic");
+                return (System.Environment.GetFolderPath(System.Environment.SpecialFolder.ApplicationData) + "\\Synthesis\\MixAndMatch\\Wheels\\Pneumatic");
 
         }
 
-        return (System.Environment.GetFolderPath(System.Environment.SpecialFolder.MyDocuments) + "\\Synthesis\\MixAndMatch\\Wheels\\Colson");
+        return (System.Environment.GetFolderPath(System.Environment.SpecialFolder.ApplicationData) + "\\Synthesis\\MixAndMatch\\Wheels\\Colson");
     }
 
     ///<summary> 

diff --git a/engine/unity5/Assets/Standard Assets.meta b/engine/unity5/Assets/Standard Assets.meta
diff --git a/engine/unity5/Assets/Standard Assets/Cameras.meta b/engine/unity5/Assets/Standard Assets/Cameras.meta
diff --git a/engine/unity5/Assets/Standard Assets/CrossPlatformInput.meta b/engine/unity5/Assets/Standard Assets/CrossPlatformInput.meta
diff --git a/engine/unity5/ProjectSettings/ProjectSettings.asset b/engine/unity5/ProjectSettings/ProjectSettings.asset
@@ -364,6 +364,9 @@ PlayerSettings:
   switchUdpSendBufferSize: 9
   switchUdpReceiveBufferSize: 42
   switchSocketBufferEfficiency: 4
+  switchSocketInitializeEnabled: 1
+  switchNetworkInterfaceManagerInitializeEnabled: 1
+  switchPlayerConnectionEnabled: 1
   ps4NPAgeRating: 12
   ps4NPTitleSecret: 
   ps4NPTrophyPackPath: 

diff --git a/engine/unity5/ProjectSettings/ProjectVersion.txt b/engine/unity5/ProjectSettings/ProjectVersion.txt
@@ -1 +1 @@
-m_EditorVersion: 5.6.3p1
+m_EditorVersion: 5.6.3p2
diff --git a/engine/unity5/unity5.Editor.csproj b/engine/unity5/unity5.Editor.csproj
@@ -16,7 +16,7 @@
     <CompilerResponseFile></CompilerResponseFile>
     <UnityProjectType>Editor:5</UnityProjectType>
     <UnityBuildTarget>StandaloneWindows:5</UnityBuildTarget>
-    <UnityVersion>5.6.3p1</UnityVersion>
+    <UnityVersion>5.6.3p2</UnityVersion>
     <RootNamespace></RootNamespace>
     <LangVersion>4</LangVersion>
   </PropertyGroup>
@@ -50,70 +50,70 @@
     <Reference Include="System.Runtime.Serialization" />
     <Reference Include="System.Xml.Linq" />
     <Reference Include="UnityEngine">
-      <HintPath>Library\UnityAssemblies\UnityEngine.dll</HintPath>
+      <HintPath>C:/Program Files/Unity/Editor/Data/Managed/UnityEngine.dll</HintPath>
     </Reference>
     <Reference Include="UnityEditor">
-      <HintPath>Library\UnityAssemblies\UnityEditor.dll</HintPath>
+      <HintPath>C:/Program Files/Unity/Editor/Data/Managed/UnityEditor.dll</HintPath>
     </Reference>
     <Reference Include="UnityEditor.Advertisements">
-      <HintPath>Library\UnityAssemblies\UnityEditor.Advertisements.dll</HintPath>
+      <HintPath>C:/Program Files/Unity/Editor/Data/UnityExtensions/Unity/Advertisements/Editor/UnityEditor.Advertisements.dll</HintPath>
     </Reference>
     <Reference Include="UnityEngine.UI">
-      <HintPath>Library\UnityAssemblies\UnityEngine.UI.dll</HintPath>
+      <HintPath>C:/Program Files/Unity/Editor/Data/UnityExtensions/Unity/GUISystem/UnityEngine.UI.dll</HintPath>
     </Reference>
     <Reference Include="UnityEditor.UI">
-      <HintPath>Library\UnityAssemblies\UnityEditor.UI.dll</HintPath>
+      <HintPath>C:/Program Files/Unity/Editor/Data/UnityExtensions/Unity/GUISystem/Editor/UnityEditor.UI.dll</HintPath>
     </Reference>
     <Reference Include="UnityEngine.Networking">
-      <HintPath>Library\UnityAssemblies\UnityEngine.Networking.dll</HintPath>
+      <HintPath>C:/Program Files/Unity/Editor/Data/UnityExtensions/Unity/Networking/UnityEngine.Networking.dll</HintPath>
     </Reference>
     <Reference Include="UnityEditor.Networking">
-      <HintPath>Library\UnityAssemblies\UnityEditor.Networking.dll</HintPath>
+      <HintPath>C:/Program Files/Unity/Editor/Data/UnityExtensions/Unity/Networking/Editor/UnityEditor.Networking.dll</HintPath>
     </Reference>
     <Reference Include="UnityEditor.TestRunner">
-      <HintPath>Library\UnityAssemblies\UnityEditor.TestRunner.dll</HintPath>
+      <HintPath>C:/Program Files/Unity/Editor/Data/UnityExtensions/Unity/TestRunner/Editor/UnityEditor.TestRunner.dll</HintPath>
     </Reference>
     <Reference Include="UnityEngine.TestRunner">
-      <HintPath>Library\UnityAssemblies\UnityEngine.TestRunner.dll</HintPath>
+      <HintPath>C:/Program Files/Unity/Editor/Data/UnityExtensions/Unity/TestRunner/UnityEngine.TestRunner.dll</HintPath>
     </Reference>
     <Reference Include="nunit.framework">
-      <HintPath>Library\UnityAssemblies\nunit.framework.dll</HintPath>
+      <HintPath>C:/Program Files/Unity/Editor/Data/UnityExtensions/Unity/TestRunner/net35/unity-custom/nunit.framework.dll</HintPath>
     </Reference>
     <Reference Include="UnityEditor.TreeEditor">
-      <HintPath>Library\UnityAssemblies\UnityEditor.TreeEditor.dll</HintPath>
+      <HintPath>C:/Program Files/Unity/Editor/Data/UnityExtensions/Unity/TreeEditor/Editor/UnityEditor.TreeEditor.dll</HintPath>
     </Reference>
     <Reference Include="UnityEngine.Analytics">
-      <HintPath>Library\UnityAssemblies\UnityEngine.Analytics.dll</HintPath>
+      <HintPath>C:/Program Files/Unity/Editor/Data/UnityExtensions/Unity/UnityAnalytics/UnityEngine.Analytics.dll</HintPath>
     </Reference>
     <Reference Include="UnityEditor.Analytics">
-      <HintPath>Library\UnityAssemblies\UnityEditor.Analytics.dll</HintPath>
+      <HintPath>C:/Program Files/Unity/Editor/Data/UnityExtensions/Unity/UnityAnalytics/Editor/UnityEditor.Analytics.dll</HintPath>
     </Reference>
     <Reference Include="UnityEditor.HoloLens">
-      <HintPath>Library\UnityAssemblies\UnityEditor.HoloLens.dll</HintPath>
+      <HintPath>C:/Program Files/Unity/Editor/Data/UnityExtensions/Unity/UnityHoloLens/Editor/UnityEditor.HoloLens.dll</HintPath>
     </Reference>
     <Reference Include="UnityEngine.HoloLens">
-      <HintPath>Library\UnityAssemblies\UnityEngine.HoloLens.dll</HintPath>
+      <HintPath>C:/Program Files/Unity/Editor/Data/UnityExtensions/Unity/UnityHoloLens/RuntimeEditor/UnityEngine.HoloLens.dll</HintPath>
     </Reference>
     <Reference Include="UnityEditor.Purchasing">
-      <HintPath>Library\UnityAssemblies\UnityEditor.Purchasing.dll</HintPath>
+      <HintPath>C:/Program Files/Unity/Editor/Data/UnityExtensions/Unity/UnityPurchasing/Editor/UnityEditor.Purchasing.dll</HintPath>
     </Reference>
     <Reference Include="UnityEditor.VR">
-      <HintPath>Library\UnityAssemblies\UnityEditor.VR.dll</HintPath>
+      <HintPath>C:/Program Files/Unity/Editor/Data/UnityExtensions/Unity/UnityVR/Editor/UnityEditor.VR.dll</HintPath>
     </Reference>
     <Reference Include="UnityEngine.VR">
-      <HintPath>Library\UnityAssemblies\UnityEngine.VR.dll</HintPath>
+      <HintPath>C:/Program Files/Unity/Editor/Data/UnityExtensions/Unity/UnityVR/RuntimeEditor/UnityEngine.VR.dll</HintPath>
     </Reference>
     <Reference Include="UnityEditor.Graphs">
-      <HintPath>Library\UnityAssemblies\UnityEditor.Graphs.dll</HintPath>
+      <HintPath>C:/Program Files/Unity/Editor/Data/Managed/UnityEditor.Graphs.dll</HintPath>
     </Reference>
     <Reference Include="UnityEditor.WindowsStandalone.Extensions">
-      <HintPath>Library\UnityAssemblies\UnityEditor.WindowsStandalone.Extensions.dll</HintPath>
+      <HintPath>C:/Program Files/Unity/Editor/Data/PlaybackEngines/windowsstandalonesupport/UnityEditor.WindowsStandalone.Extensions.dll</HintPath>
     </Reference>
     <Reference Include="SyntaxTree.VisualStudio.Unity.Bridge">
-      <HintPath>Library\UnityAssemblies\SyntaxTree.VisualStudio.Unity.Bridge.dll</HintPath>
+      <HintPath>C:/Program Files (x86)/Microsoft Visual Studio Tools for Unity/15.0/Editor/SyntaxTree.VisualStudio.Unity.Bridge.dll</HintPath>
     </Reference>
     <Reference Include="SimulatorAPI">
-      <HintPath>Assets\Scripts\SimulatorAPI.dll</HintPath>
+      <HintPath>Assets/Scripts/SimulatorAPI.dll</HintPath>
     </Reference>
   </ItemGroup>
   <ItemGroup>