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

# Conflicts: # Assets/Scenes/Racetrack mini.unity
2024-04-12 13:05:02 +02:00
parent 4733c91233 6d95696418
commit ac5fad3141
119 changed files with 14379 additions and 27 deletions
--- a/Assets/Scenes/Racetrack
+++ b/Assets/Scenes/Racetrack
@@ -123,6 +123,11 @@ NavMeshSettings:
    debug:
      m_Flags: 0
  m_NavMeshData: {fileID: 0}
+--- !u!1 &16893714 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: 5711380006811689493, guid: 5851f609a58dc884a99030da0105c6db, type: 3}
+  m_PrefabInstance: {fileID: 1427960684}
+  m_PrefabAsset: {fileID: 0}
 --- !u!1 &19977952
 GameObject:
  m_ObjectHideFlags: 0
@@ -5923,3 +5928,6 @@ SceneRoots:
  - {fileID: 802517270703114805}
  - {fileID: 1427960684}
  - {fileID: 1495114367}
+  - {fileID: 1605662800}
+  - {fileID: 2105306304}
+  - {fileID: 753416033}