Merge branch 'master' of ooftooft.net:Racesm

# Conflicts: # ProjectSettings/EditorBuildSettings.asset
2024-04-24 18:18:29 +02:00
parent 571f82abae c03c0beb8f
commit 31d431cd34
16 changed files with 1633 additions and 2 deletions
--- a/ProjectSettings/EditorBuildSettings.asset
+++ b/ProjectSettings/EditorBuildSettings.asset
@@ -8,7 +8,13 @@ EditorBuildSettings:
  - enabled: 0
    path: Assets/Scenes/Car Customization.unity
    guid: 46fb4d69ffddef24abd332313bb5f4d8
-  - enabled: 0
+  - enabled: 1
+    path: Assets/Scenes/Map selector.unity
+    guid: 3bfd8ede691814e41941f96acfa07d03
+  - enabled: 1
    path: Assets/Scenes/Racetrack mini.unity
    guid: 9b5f77be9dfb7c14cba3af351597ec83
+  - enabled: 1
+    path: Assets/Scenes/mini_racetrack3.unity
+    guid: 2d4634271c08833499c8478f17c7a330
  m_configObjects: {}
--- a/ProjectSettings/TagManager.asset
+++ b/ProjectSettings/TagManager.asset
@@ -7,6 +7,7 @@ TagManager:
  - Wall
  - NPC
  - Checkpoint
+  - Button1
  layers:
  - Default
  - TransparentFX