Merge branch 'master' of https://github.com/MrHangover/WAVES

MrHangover · Jan 22, 2017 · 1285572 · 1285572
2 parents f6e62d5 + 8f1b8ef
commit 1285572
Show file tree

Hide file tree

Showing 30 changed files with 221 additions and 214 deletions.
diff --git a/.gitignore b/.gitignore
@@ -28,3 +28,6 @@ sysinfo.txt
 # Builds
 *.apk
 *.unitypackage
+*.meta
+Assets/Sprites/Obstacle Pillar/Bricks02.png.meta
+Assets/Sprites/Obstacle Pillar/Bricks02.png.meta
diff --git a/Assets/RandomSoundPlayer.cs b/Assets/RandomSoundPlayer.cs
@@ -0,0 +1,37 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public class RandomSoundPlayer : MonoBehaviour
+{
+    public AudioClip[] sounds;
+
+    public float minTime = 1f;
+    public float maxTime = 10f;
+
+    float timer = 3f;
+    AudioSource audio;
+
+
+    void Start()
+    {
+        audio = gameObject.GetComponent<AudioSource>();
+    }
+
+	void Update ()
+    {
+        if(timer > 0)
+        {
+            timer -= Time.deltaTime;
+        }
+        else
+        {
+            audio.clip = sounds[Random.Range(0, sounds.Length)];
+            audio.Play();
+            timer = Random.Range(minTime, maxTime);
+
+            //Debug.Log("win");
+        }
+
+	}
+}
diff --git a/Assets/RandomSoundPlayer.cs.meta b/Assets/RandomSoundPlayer.cs.meta
diff --git a/Assets/Scenes/MainMenu.unity b/Assets/Scenes/MainMenu.unity
diff --git a/Assets/Scenes/TheLevel - Tobias.unity b/Assets/Scenes/TheLevel - Tobias.unity
diff --git a/Assets/Scenes/TheLevel - Tobias.unity.meta b/Assets/Scenes/TheLevel - Tobias.unity.meta
diff --git a/Assets/Sprites/Obstacle Pillar.meta → Assets/Sounds.meta b/Assets/Sprites/Obstacle Pillar.meta → Assets/Sounds.meta
diff --git a/Assets/Sounds/endlessOOHHHRHHR.wav b/Assets/Sounds/endlessOOHHHRHHR.wav
diff --git a/Assets/Sounds/endlessOOHHHRHHR.wav.meta b/Assets/Sounds/endlessOOHHHRHHR.wav.meta
diff --git a/Assets/Sounds/oh1.wav b/Assets/Sounds/oh1.wav
diff --git a/Assets/Sounds/oh1.wav.meta b/Assets/Sounds/oh1.wav.meta
diff --git a/Assets/Sounds/oh2.wav b/Assets/Sounds/oh2.wav
diff --git a/Assets/Sounds/oh2.wav.meta b/Assets/Sounds/oh2.wav.meta
diff --git a/Assets/Sounds/oh3.wav b/Assets/Sounds/oh3.wav
diff --git a/Assets/Sounds/oh3.wav.meta b/Assets/Sounds/oh3.wav.meta
diff --git a/Assets/Sounds/oh4.wav b/Assets/Sounds/oh4.wav
diff --git a/Assets/Sounds/oh4.wav.meta b/Assets/Sounds/oh4.wav.meta
diff --git a/Assets/Sounds/oh5.wav b/Assets/Sounds/oh5.wav
diff --git a/Assets/Sounds/oh5.wav.meta b/Assets/Sounds/oh5.wav.meta
diff --git a/Assets/Sounds/shit.wav b/Assets/Sounds/shit.wav
diff --git a/Assets/Sounds/shit.wav.meta b/Assets/Sounds/shit.wav.meta
diff --git a/Assets/Sprites/Level/Temple.png.meta b/Assets/Sprites/Level/Temple.png.meta
diff --git a/Assets/Sprites/Obstacle Pillar/Bricks01.png.meta b/Assets/Sprites/Obstacle Pillar/Bricks01.png.meta
diff --git a/Assets/Sprites/Obstacle Pillar/Bricks02.png b/Assets/Sprites/Obstacle Pillar/Bricks02.png
diff --git a/Assets/Sprites/Obstacle Pillar/Flying_Pillar_Body.png b/Assets/Sprites/Obstacle Pillar/Flying_Pillar_Body.png
diff --git a/Assets/Sprites/Obstacle Pillar/Flying_Pillar_Long.png b/Assets/Sprites/Obstacle Pillar/Flying_Pillar_Long.png
diff --git a/Assets/Sprites/Obstacle Pillar/Flying_Pillar_Long_Ver_2.png b/Assets/Sprites/Obstacle Pillar/Flying_Pillar_Long_Ver_2.png
diff --git a/Assets/Sprites/Obstacle Pillar/Ground_Pillar.png.meta b/Assets/Sprites/Obstacle Pillar/Ground_Pillar.png.meta
diff --git a/Assets/Sprites/Obstacle Pillar/Ground_half_Pillar.png b/Assets/Sprites/Obstacle Pillar/Ground_half_Pillar.png