Merge branch 'master' of git@ooftooft.net:Racesm.git

# Conflicts: # Assets/Scenes/Racetrack.unity
2024-03-22 13:59:13 +01:00
parent c659e080ac 23d0baf052
commit 3c513ab972
11 changed files with 1042 additions and 593 deletions
--- a/Packages/manifest.json
+++ b/Packages/manifest.json
@@ -1,5 +1,6 @@
 {
  "dependencies": {
+    "com.unity.cinemachine": "2.9.7",
    "com.unity.collab-proxy": "2.3.1",
    "com.unity.feature.development": "1.0.1",
    "com.unity.textmeshpro": "3.0.6",
--- a/Packages/packages-lock.json
+++ b/Packages/packages-lock.json
@@ -1,5 +1,14 @@
 {
  "dependencies": {
+    "com.unity.cinemachine": {
+      "version": "2.9.7",
+      "depth": 0,
+      "source": "registry",
+      "dependencies": {
+        "com.unity.test-framework": "1.1.31"
+      },
+      "url": "https://packages.unity.com"
+    },
    "com.unity.collab-proxy": {
      "version": "2.3.1",
      "depth": 0,