Merge branch 'master' of https://github.com/saibotk/Bildschirmflausch.LD41

Assets/Scripts/UIController.cs

@@ -12,5 +12,22 @@ public class UIController : MonoBehaviour {
 	// Update is called once per frame
 	void Update () {
 		
-	}
+	}
+    public static UIController instance;
+
+    private GameObject score;
+    private GameObject pauseMenu;
+    private GameObject GameOverPanel;
+
+    public UIController()
+    {
+        UIController.instance = this;
+    }
+    public void quitGame()
+    {
+        Application.Quit();
+    }
+ 
+    
 }
+

Assets/graphics/textures/car.meta

@@ -1,5 +1,9 @@
 fileFormatVersion: 2
+<<<<<<< Updated upstream
 guid: 881d455850ed7ea4bb621a90b3c6ca20
+=======
+guid: 4b89e87ec5e05d84187201364e8c6ad2
+>>>>>>> Stashed changes
 folderAsset: yes
 DefaultImporter:
   externalObjects: {}

Assets/graphics/textures/car/car_vorläufig.png.meta

@@ -1,5 +1,9 @@
 fileFormatVersion: 2
+<<<<<<< Updated upstream
 guid: 12533260c77040343bf5174a0d0d33a8
+=======
+guid: 436428cf08967fa40ae61b14aec73356
+>>>>>>> Stashed changes
 TextureImporter:
   fileIDToRecycleName: {}
   externalObjects: {}
@@ -73,7 +77,11 @@ TextureImporter:
     outline: []
     physicsShape: []
     bones: []
+<<<<<<< Updated upstream
     spriteID: beca343519669dd45b1f003629cc37da
+=======
+    spriteID: 02bd9af2a69b3ca4fa9a56e639077f6a
+>>>>>>> Stashed changes
     vertices: []
     indices: 
     edges: []

Assets/graphics/textures/tmp/Thumbs.db.meta

@@ -1,5 +1,9 @@
 fileFormatVersion: 2
+<<<<<<< Updated upstream
 guid: 17f2c62e0d0a0bc42b634bcfcc193dd8
+=======
+guid: c9805fee8f9255941ac3d9e1e313cab6
+>>>>>>> Stashed changes
 DefaultImporter:
   externalObjects: {}
   userData: