diff --git a/.gitignore b/.gitignore index 942b31d..d3a1eea 100644 --- a/.gitignore +++ b/.gitignore @@ -1,28 +1,41 @@ # This .gitignore file should be placed at the root of your Unity project directory # -# Get latest from https://github.com/github/gitignore/blob/master/Unity.gitignore +# Get latest from https://github.com/github/gitignore/blob/main/Unity.gitignore # +.utmp/ /[Ll]ibrary/ /[Tt]emp/ /[Oo]bj/ /[Bb]uild/ /[Bb]uilds/ /[Ll]ogs/ +/[Uu]ser[Ss]ettings/ +*.log + +# By default unity supports Blender asset imports, *.blend1 blender files do not need to be commited to version control. +*.blend1 +*.blend1.meta + +# MemoryCaptures can get excessive in size. +# They also could contain extremely sensitive data /[Mm]emoryCaptures/ -/[Uu]serSettings/ -# Asset meta data should only be ignored when the corresponding asset is also ignored -!/[Aa]ssets/**/*.meta +# Recordings can get excessive in size +/[Rr]ecordings/ # Uncomment this line if you wish to ignore the asset store tools plugin # /[Aa]ssets/AssetStoreTools* # Autogenerated Jetbrains Rider plugin -[Aa]ssets/Plugins/Editor/JetBrains* +/[Aa]ssets/Plugins/Editor/JetBrains* +# Jetbrains Rider personal-layer settings +*.DotSettings.user + +.DS_Store # Visual Studio cache directory .vs/ -.vscode/settings.json +.vscode/ # Gradle cache directory .gradle/ @@ -53,14 +66,37 @@ ExportedObj/ # Unity3D generated file on crash reports sysinfo.txt +# Mono auto generated files +mono_crash.* + # Builds *.apk +*.aab *.unitypackage +*.unitypackage.meta +*.app # Crashlytics generated file crashlytics-build.properties -# Mac OS metadata -.DS_Store +# TestRunner generated files +InitTestScene*.unity* + +# Addressables default ignores, before user customizations +/ServerData +/[Aa]ssets/StreamingAssets/aa* +/[Aa]ssets/AddressableAssetsData/link.xml* +/[Aa]ssets/Addressables_Temp* +# By default, Addressables content builds will generate addressables_content_state.bin +# files in platform-specific subfolders, for example: +# /Assets/AddressableAssetsData/OSX/addressables_content_state.bin +/[Aa]ssets/AddressableAssetsData/*/*.bin* + +# Visual Scripting auto-generated files +/[Aa]ssets/Unity.VisualScripting.Generated/VisualScripting.Flow/UnitOptions.db +/[Aa]ssets/Unity.VisualScripting.Generated/VisualScripting.Flow/UnitOptions.db.meta +/[Aa]ssets/Unity.VisualScripting.Generated/VisualScripting.Core/Property Providers +/[Aa]ssets/Unity.VisualScripting.Generated/VisualScripting.Core/Property Providers.meta -.vsconfig +# Auto-generated scenes by play mode tests +/[Aa]ssets/[Ii]nit[Tt]est[Ss]cene*.unity* \ No newline at end of file diff --git a/Assets/Scripts/GpsSensor.cs b/Assets/Scripts/GpsSensor.cs index ed42ef8..9ed8281 100644 --- a/Assets/Scripts/GpsSensor.cs +++ b/Assets/Scripts/GpsSensor.cs @@ -34,7 +34,7 @@ public class GpsSensor : MonoBehaviour private void Awake() { - _socket = FindObjectOfType(); + _socket = FindAnyObjectByType(); } private void OnEnable() diff --git a/Assets/Scripts/ImuSensor.cs b/Assets/Scripts/ImuSensor.cs index 4251204..b314ee5 100644 --- a/Assets/Scripts/ImuSensor.cs +++ b/Assets/Scripts/ImuSensor.cs @@ -22,7 +22,7 @@ public class ImuSensor : MonoBehaviour private void Awake() { - _socket = FindObjectOfType(); + _socket = FindAnyObjectByType(); } private void OnEnable() diff --git a/Assets/Scripts/Motor.cs b/Assets/Scripts/Motor.cs index 6ec279a..381799b 100644 --- a/Assets/Scripts/Motor.cs +++ b/Assets/Scripts/Motor.cs @@ -269,7 +269,7 @@ protected void ReportLimitSwitchTriggered(Limit limit) protected virtual void Awake() { - _socket = FindObjectOfType(); + _socket = FindAnyObjectByType(); } protected virtual void OnEnable() diff --git a/Assets/Scripts/RoverCamera.cs b/Assets/Scripts/RoverCamera.cs index 8f0b155..afbcd58 100644 --- a/Assets/Scripts/RoverCamera.cs +++ b/Assets/Scripts/RoverCamera.cs @@ -93,7 +93,7 @@ public bool IsStreaming private void Awake() { _camera = GetComponent(); - _socket = FindObjectOfType(); + _socket = FindAnyObjectByType(); } private void OnEnable() diff --git a/Assets/Scripts/RoverPoseReporter.cs b/Assets/Scripts/RoverPoseReporter.cs index dc98d07..e2cd397 100644 --- a/Assets/Scripts/RoverPoseReporter.cs +++ b/Assets/Scripts/RoverPoseReporter.cs @@ -14,7 +14,7 @@ public class RoverPoseReporter : MonoBehaviour private void Awake() { - _socket = FindObjectOfType(); + _socket = FindAnyObjectByType(); } private void OnEnable() diff --git a/Packages/manifest.json b/Packages/manifest.json index ee071f7..867d6d6 100644 --- a/Packages/manifest.json +++ b/Packages/manifest.json @@ -1,13 +1,12 @@ { "dependencies": { - "com.unity.collab-proxy": "1.15.7", - "com.unity.ide.rider": "3.0.9", - "com.unity.ide.visualstudio": "2.0.14", - "com.unity.ide.vscode": "1.2.4", - "com.unity.test-framework": "1.1.29", - "com.unity.textmeshpro": "3.0.6", - "com.unity.timeline": "1.6.3", - "com.unity.ugui": "1.0.0", + "com.unity.collab-proxy": "2.8.2", + "com.unity.ide.rider": "3.0.36", + "com.unity.ide.visualstudio": "2.0.23", + "com.unity.nuget.newtonsoft-json": "3.2.1", + "com.unity.test-framework": "1.5.1", + "com.unity.timeline": "1.8.8", + "com.unity.ugui": "2.0.0", "com.unity.modules.ai": "1.0.0", "com.unity.modules.androidjni": "1.0.0", "com.unity.modules.animation": "1.0.0", diff --git a/Packages/packages-lock.json b/Packages/packages-lock.json index 3874c4a..aecb996 100644 --- a/Packages/packages-lock.json +++ b/Packages/packages-lock.json @@ -1,24 +1,20 @@ { "dependencies": { "com.unity.collab-proxy": { - "version": "1.15.7", + "version": "2.8.2", "depth": 0, "source": "registry", - "dependencies": { - "com.unity.nuget.newtonsoft-json": "2.0.0", - "com.unity.services.core": "1.0.1" - }, + "dependencies": {}, "url": "https://packages.unity.com" }, "com.unity.ext.nunit": { - "version": "1.0.6", + "version": "2.0.5", "depth": 1, - "source": "registry", - "dependencies": {}, - "url": "https://packages.unity.com" + "source": "builtin", + "dependencies": {} }, "com.unity.ide.rider": { - "version": "3.0.9", + "version": "3.0.36", "depth": 0, "source": "registry", "dependencies": { @@ -27,7 +23,7 @@ "url": "https://packages.unity.com" }, "com.unity.ide.visualstudio": { - "version": "2.0.14", + "version": "2.0.23", "depth": 0, "source": "registry", "dependencies": { @@ -35,63 +31,45 @@ }, "url": "https://packages.unity.com" }, - "com.unity.ide.vscode": { - "version": "1.2.4", - "depth": 0, - "source": "registry", - "dependencies": {}, - "url": "https://packages.unity.com" - }, "com.unity.nuget.newtonsoft-json": { - "version": "2.0.0", - "depth": 1, + "version": "3.2.1", + "depth": 0, "source": "registry", "dependencies": {}, "url": "https://packages.unity.com" }, - "com.unity.services.core": { - "version": "1.0.1", - "depth": 1, - "source": "registry", - "dependencies": { - "com.unity.modules.unitywebrequest": "1.0.0" - }, - "url": "https://packages.unity.com" - }, "com.unity.test-framework": { - "version": "1.1.29", + "version": "1.5.1", "depth": 0, - "source": "registry", + "source": "builtin", "dependencies": { - "com.unity.ext.nunit": "1.0.6", + "com.unity.ext.nunit": "2.0.3", "com.unity.modules.imgui": "1.0.0", "com.unity.modules.jsonserialize": "1.0.0" - }, - "url": "https://packages.unity.com" + } }, "com.unity.textmeshpro": { - "version": "3.0.6", + "version": "5.0.0", "depth": 0, - "source": "registry", + "source": "builtin", "dependencies": { - "com.unity.ugui": "1.0.0" - }, - "url": "https://packages.unity.com" + "com.unity.ugui": "2.0.0" + } }, "com.unity.timeline": { - "version": "1.6.3", + "version": "1.8.8", "depth": 0, "source": "registry", "dependencies": { + "com.unity.modules.audio": "1.0.0", "com.unity.modules.director": "1.0.0", "com.unity.modules.animation": "1.0.0", - "com.unity.modules.audio": "1.0.0", "com.unity.modules.particlesystem": "1.0.0" }, "url": "https://packages.unity.com" }, "com.unity.ugui": { - "version": "1.0.0", + "version": "2.0.0", "depth": 0, "source": "builtin", "dependencies": { @@ -146,6 +124,12 @@ "com.unity.modules.animation": "1.0.0" } }, + "com.unity.modules.hierarchycore": { + "version": "1.0.0", + "depth": 1, + "source": "builtin", + "dependencies": {} + }, "com.unity.modules.imageconversion": { "version": "1.0.0", "depth": 0, @@ -235,17 +219,7 @@ "com.unity.modules.ui": "1.0.0", "com.unity.modules.imgui": "1.0.0", "com.unity.modules.jsonserialize": "1.0.0", - "com.unity.modules.uielementsnative": "1.0.0" - } - }, - "com.unity.modules.uielementsnative": { - "version": "1.0.0", - "depth": 1, - "source": "builtin", - "dependencies": { - "com.unity.modules.ui": "1.0.0", - "com.unity.modules.imgui": "1.0.0", - "com.unity.modules.jsonserialize": "1.0.0" + "com.unity.modules.hierarchycore": "1.0.0" } }, "com.unity.modules.umbra": { diff --git a/ProjectSettings/ProjectVersion.txt b/ProjectSettings/ProjectVersion.txt index 495468b..93366d5 100644 --- a/ProjectSettings/ProjectVersion.txt +++ b/ProjectSettings/ProjectVersion.txt @@ -1,2 +1,2 @@ -m_EditorVersion: 2020.3.24f1 -m_EditorVersionWithRevision: 2020.3.24f1 (79c78de19888) +m_EditorVersion: 6000.1.8f1 +m_EditorVersionWithRevision: 6000.1.8f1 (2a5b1522e5ab) diff --git a/ProjectSettings/boot.config b/ProjectSettings/boot.config deleted file mode 100644 index e69de29..0000000