From 9e411043cf8fefe182ffb7cf55dd1067a05f8a66 Mon Sep 17 00:00:00 2001
From: Jakob Stendahl <jakob.stendahl@outlook.com>
Date: Sat, 30 Sep 2017 01:45:23 +0200
Subject: Added font, going to bed

---
 td/Assets/Prefabs/UI/msgBoxYesNo.prefab      | Bin 0 -> 16912 bytes
 td/Assets/Prefabs/UI/msgBoxYesNo.prefab.meta |   9 +++++++++
 2 files changed, 9 insertions(+)
 create mode 100644 td/Assets/Prefabs/UI/msgBoxYesNo.prefab
 create mode 100644 td/Assets/Prefabs/UI/msgBoxYesNo.prefab.meta

(limited to 'td/Assets/Prefabs/UI')

diff --git a/td/Assets/Prefabs/UI/msgBoxYesNo.prefab b/td/Assets/Prefabs/UI/msgBoxYesNo.prefab
new file mode 100644
index 0000000..bb1a31f
Binary files /dev/null and b/td/Assets/Prefabs/UI/msgBoxYesNo.prefab differ
diff --git a/td/Assets/Prefabs/UI/msgBoxYesNo.prefab.meta b/td/Assets/Prefabs/UI/msgBoxYesNo.prefab.meta
new file mode 100644
index 0000000..b881c23
--- /dev/null
+++ b/td/Assets/Prefabs/UI/msgBoxYesNo.prefab.meta
@@ -0,0 +1,9 @@
+fileFormatVersion: 2
+guid: 21dda97ff00d54fca8607f4d476e82e3
+timeCreated: 1506728240
+licenseType: Free
+NativeFormatImporter:
+  mainObjectFileID: 100100000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
-- 
cgit v1.2.3


From 149bd76007f3c1edcda05ae6bc9bf0b48cf28aae Mon Sep 17 00:00:00 2001
From: Jakob Stendahl <jakob.stendahl@outlook.com>
Date: Sat, 30 Sep 2017 23:12:37 +0200
Subject: Started with towerPlacements

---
 td/Assets/Prefabs/Enemies.meta              |   9 +++++++
 td/Assets/Prefabs/Enemies/Enemy.prefab      | Bin 0 -> 7824 bytes
 td/Assets/Prefabs/Enemies/Enemy.prefab.meta |   9 +++++++
 td/Assets/Prefabs/Enemy.prefab              | Bin 7752 -> 0 bytes
 td/Assets/Prefabs/Enemy.prefab.meta         |   9 -------
 td/Assets/Prefabs/Grass-dirt.prefab         | Bin 7776 -> 6828 bytes
 td/Assets/Prefabs/Path straigth.prefab      | Bin 9096 -> 7900 bytes
 td/Assets/Prefabs/Path turn.prefab          | Bin 10392 -> 8972 bytes
 td/Assets/Prefabs/UI/GUI.prefab             | Bin 0 -> 37856 bytes
 td/Assets/Prefabs/UI/GUI.prefab.meta        |   9 +++++++
 td/Assets/Prefabs/grassPart.prefab          | Bin 6848 -> 6004 bytes
 td/Assets/Scenes/Level 1.unity              | Bin 86048 -> 54344 bytes
 td/Assets/Scripts/touchScript.cs            |  37 ++++++++++++++++++++++++++++
 td/Assets/Scripts/touchScript.cs.meta       |  12 +++++++++
 14 files changed, 76 insertions(+), 9 deletions(-)
 create mode 100644 td/Assets/Prefabs/Enemies.meta
 create mode 100644 td/Assets/Prefabs/Enemies/Enemy.prefab
 create mode 100644 td/Assets/Prefabs/Enemies/Enemy.prefab.meta
 delete mode 100644 td/Assets/Prefabs/Enemy.prefab
 delete mode 100644 td/Assets/Prefabs/Enemy.prefab.meta
 create mode 100644 td/Assets/Prefabs/UI/GUI.prefab
 create mode 100644 td/Assets/Prefabs/UI/GUI.prefab.meta
 create mode 100644 td/Assets/Scripts/touchScript.cs
 create mode 100644 td/Assets/Scripts/touchScript.cs.meta

(limited to 'td/Assets/Prefabs/UI')

diff --git a/td/Assets/Prefabs/Enemies.meta b/td/Assets/Prefabs/Enemies.meta
new file mode 100644
index 0000000..1ce4814
--- /dev/null
+++ b/td/Assets/Prefabs/Enemies.meta
@@ -0,0 +1,9 @@
+fileFormatVersion: 2
+guid: 8ff814333a59b4fd7a4b225615761cc5
+folderAsset: yes
+timeCreated: 1506804364
+licenseType: Free
+DefaultImporter:
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/td/Assets/Prefabs/Enemies/Enemy.prefab b/td/Assets/Prefabs/Enemies/Enemy.prefab
new file mode 100644
index 0000000..5d65c2c
Binary files /dev/null and b/td/Assets/Prefabs/Enemies/Enemy.prefab differ
diff --git a/td/Assets/Prefabs/Enemies/Enemy.prefab.meta b/td/Assets/Prefabs/Enemies/Enemy.prefab.meta
new file mode 100644
index 0000000..f39477f
--- /dev/null
+++ b/td/Assets/Prefabs/Enemies/Enemy.prefab.meta
@@ -0,0 +1,9 @@
+fileFormatVersion: 2
+guid: f46c18e8539e0474e9e6e164212d57e3
+timeCreated: 1506607135
+licenseType: Free
+NativeFormatImporter:
+  mainObjectFileID: 100100000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/td/Assets/Prefabs/Enemy.prefab b/td/Assets/Prefabs/Enemy.prefab
deleted file mode 100644
index e2f8a96..0000000
Binary files a/td/Assets/Prefabs/Enemy.prefab and /dev/null differ
diff --git a/td/Assets/Prefabs/Enemy.prefab.meta b/td/Assets/Prefabs/Enemy.prefab.meta
deleted file mode 100644
index f39477f..0000000
--- a/td/Assets/Prefabs/Enemy.prefab.meta
+++ /dev/null
@@ -1,9 +0,0 @@
-fileFormatVersion: 2
-guid: f46c18e8539e0474e9e6e164212d57e3
-timeCreated: 1506607135
-licenseType: Free
-NativeFormatImporter:
-  mainObjectFileID: 100100000
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
diff --git a/td/Assets/Prefabs/Grass-dirt.prefab b/td/Assets/Prefabs/Grass-dirt.prefab
index 5952387..d943f20 100644
Binary files a/td/Assets/Prefabs/Grass-dirt.prefab and b/td/Assets/Prefabs/Grass-dirt.prefab differ
diff --git a/td/Assets/Prefabs/Path straigth.prefab b/td/Assets/Prefabs/Path straigth.prefab
index cb8cac2..75c688d 100644
Binary files a/td/Assets/Prefabs/Path straigth.prefab and b/td/Assets/Prefabs/Path straigth.prefab differ
diff --git a/td/Assets/Prefabs/Path turn.prefab b/td/Assets/Prefabs/Path turn.prefab
index fc78ac9..28d95c1 100644
Binary files a/td/Assets/Prefabs/Path turn.prefab and b/td/Assets/Prefabs/Path turn.prefab differ
diff --git a/td/Assets/Prefabs/UI/GUI.prefab b/td/Assets/Prefabs/UI/GUI.prefab
new file mode 100644
index 0000000..b7a47fa
Binary files /dev/null and b/td/Assets/Prefabs/UI/GUI.prefab differ
diff --git a/td/Assets/Prefabs/UI/GUI.prefab.meta b/td/Assets/Prefabs/UI/GUI.prefab.meta
new file mode 100644
index 0000000..856ac47
--- /dev/null
+++ b/td/Assets/Prefabs/UI/GUI.prefab.meta
@@ -0,0 +1,9 @@
+fileFormatVersion: 2
+guid: fd69470eb7f824e3bbf2f6bac2d09ec7
+timeCreated: 1506804183
+licenseType: Free
+NativeFormatImporter:
+  mainObjectFileID: 100100000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/td/Assets/Prefabs/grassPart.prefab b/td/Assets/Prefabs/grassPart.prefab
index b525984..442bbc5 100644
Binary files a/td/Assets/Prefabs/grassPart.prefab and b/td/Assets/Prefabs/grassPart.prefab differ
diff --git a/td/Assets/Scenes/Level 1.unity b/td/Assets/Scenes/Level 1.unity
index 80bebb6..44a726e 100644
Binary files a/td/Assets/Scenes/Level 1.unity and b/td/Assets/Scenes/Level 1.unity differ
diff --git a/td/Assets/Scripts/touchScript.cs b/td/Assets/Scripts/touchScript.cs
new file mode 100644
index 0000000..c8cdd6a
--- /dev/null
+++ b/td/Assets/Scripts/touchScript.cs
@@ -0,0 +1,37 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public class touchScript : MonoBehaviour {
+
+
+	private RuntimePlatform platform = Application.platform;
+
+	void Update(){
+		if(platform == RuntimePlatform.Android || platform == RuntimePlatform.IPhonePlayer){
+			if(Input.touchCount > 0) {
+				if(Input.GetTouch(0).phase == TouchPhase.Began){
+					checkTouch(Input.GetTouch(0).position);
+				}
+			}
+		}else if(platform == RuntimePlatform.WindowsEditor){
+			if(Input.GetMouseButtonDown(0)) {
+				checkTouch(Input.mousePosition);
+			}
+		}
+	}
+
+	void checkTouch(Vector3 pos){
+		Vector3 wp = Camera.main.ScreenToWorldPoint(pos);
+		Vector2 touchPos = new Vector2(wp.x, wp.y);
+		Collider2D hit = Physics2D.OverlapPoint(touchPos);
+		Debug.Log("Checking");
+		if(hit){
+			//hit.transform.gameObject.SendMessage("Clicked",0,SendMessageOptions.DontRequireReceiver);
+			Debug.Log("CLICKED");
+		}
+	}
+
+
+
+}
diff --git a/td/Assets/Scripts/touchScript.cs.meta b/td/Assets/Scripts/touchScript.cs.meta
new file mode 100644
index 0000000..ab0ba6c
--- /dev/null
+++ b/td/Assets/Scripts/touchScript.cs.meta
@@ -0,0 +1,12 @@
+fileFormatVersion: 2
+guid: 8b15d2b1b4d2f4f7fadf48b92f7edec2
+timeCreated: 1506804974
+licenseType: Free
+MonoImporter:
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
-- 
cgit v1.2.3


From c7d2d5cdb20d42a2014ff99d2fdffae68657e02e Mon Sep 17 00:00:00 2001
From: Jakob Stendahl <jakob.stendahl@outlook.com>
Date: Sun, 1 Oct 2017 19:15:40 +0200
Subject: Started on settings menu

---
 td/Assets/Prefabs/UI/msgBoxYesNo.prefab      | Bin 16912 -> 16912 bytes
 td/Assets/Prefabs/UI/msgBoxYesNo.prefab.meta |   2 +-
 td/Assets/Scenes/Level 1.unity               | Bin 54344 -> 69440 bytes
 td/Assets/Scripts/mainGUI.cs                 |  21 +++++++++++++++++++++
 4 files changed, 22 insertions(+), 1 deletion(-)

(limited to 'td/Assets/Prefabs/UI')

diff --git a/td/Assets/Prefabs/UI/msgBoxYesNo.prefab b/td/Assets/Prefabs/UI/msgBoxYesNo.prefab
index bb1a31f..d5b775a 100644
Binary files a/td/Assets/Prefabs/UI/msgBoxYesNo.prefab and b/td/Assets/Prefabs/UI/msgBoxYesNo.prefab differ
diff --git a/td/Assets/Prefabs/UI/msgBoxYesNo.prefab.meta b/td/Assets/Prefabs/UI/msgBoxYesNo.prefab.meta
index b881c23..3c4996f 100644
--- a/td/Assets/Prefabs/UI/msgBoxYesNo.prefab.meta
+++ b/td/Assets/Prefabs/UI/msgBoxYesNo.prefab.meta
@@ -1,6 +1,6 @@
 fileFormatVersion: 2
 guid: 21dda97ff00d54fca8607f4d476e82e3
-timeCreated: 1506728240
+timeCreated: 1506877151
 licenseType: Free
 NativeFormatImporter:
   mainObjectFileID: 100100000
diff --git a/td/Assets/Scenes/Level 1.unity b/td/Assets/Scenes/Level 1.unity
index 44a726e..7c17039 100644
Binary files a/td/Assets/Scenes/Level 1.unity and b/td/Assets/Scenes/Level 1.unity differ
diff --git a/td/Assets/Scripts/mainGUI.cs b/td/Assets/Scripts/mainGUI.cs
index 3c135b2..d9f7ee0 100644
--- a/td/Assets/Scripts/mainGUI.cs
+++ b/td/Assets/Scripts/mainGUI.cs
@@ -7,10 +7,13 @@ public class mainGUI : MonoBehaviour {
 
 	GameObject pnlMenu;
 	GameObject pnlSidebar;
+	GameObject pnlSettings;
 	RectTransform pnlSidebarTransform;
 	Button btnToggleSidebar;
 	Button btnPauseGame;
 	Button btnResumeGame;
+	Button btnExitGame;
+	Button btnSettings;
 
 	bool sidebarExpanded;
 	float[] sidebarStates = new float[2] {0f, -202.4f};  // The x position of the sidebar expanded or collapsed
@@ -21,19 +24,26 @@ public class mainGUI : MonoBehaviour {
 		/* Panels */
 		pnlMenu = transform.Find ("menu").gameObject;
 		pnlSidebar = transform.Find ("sidebarWrapper").gameObject;
+		pnlSettings = transform.Find ("settings").gameObject;
 		pnlSidebarTransform = pnlSidebar.GetComponent <RectTransform> ();
 
 		/* Buttons */
 		btnToggleSidebar = pnlSidebar.transform.Find("toggleSidebar").gameObject.GetComponent <Button> ();
 		btnPauseGame = pnlSidebar.transform.Find ("pauseGame").gameObject.GetComponent <Button> ();
 		btnResumeGame = pnlMenu.transform.Find ("resumeGame").gameObject.GetComponent <Button> ();
+		btnExitGame = pnlMenu.transform.Find ("exitGame").gameObject.GetComponent <Button> ();
+		btnSettings = pnlMenu.transform.Find ("settings").gameObject.GetComponent <Button> ();
 		if (btnToggleSidebar != null) { btnToggleSidebar.onClick.AddListener (toggleSidebarHandler); }
 		if (btnPauseGame != null) { btnPauseGame.onClick.AddListener (pauseGameHandler); }
 		if (btnResumeGame != null) { btnResumeGame.onClick.AddListener (btnResumeGameHandler); }
+		if (btnExitGame != null) { btnExitGame.onClick.AddListener (btnExitGameHandler); }
+		if (btnSettings != null) { btnSettings.onClick.AddListener (btnSettingsHandler); }
+
 
 		/* Set up initial states */
 		updateSidebarPosandBtn ();
 		pnlMenu.SetActive (false);
+		pnlSettings.SetActive (false);
 	}
 
 	void toggleSidebarHandler() {
@@ -60,6 +70,17 @@ public class mainGUI : MonoBehaviour {
 		btnPauseGame.interactable = true;
 	}
 
+	void btnExitGameHandler() {
+		/* handler for btnExitGame */
+		Application.Quit ();
+	}
+
+	void btnSettingsHandler() {
+		/* handler for btnSettings */
+		pnlMenu.SetActive (false);
+		pnlSettings.SetActive (true);
+	}
+
 	void updateSidebarPosandBtn() {
 		/* update state of sidebar based on the expanded var */
 		if (sidebarExpanded) {
-- 
cgit v1.2.3


From e13fd4cf1fc0ad9eff857295fd5abc15ab01462c Mon Sep 17 00:00:00 2001
From: Jakob Stendahl <jakob.stendahl@outlook.com>
Date: Fri, 6 Oct 2017 16:04:38 +0200
Subject: Startet på tårn, fiksa dev-mode, laga stats UI
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 td/Assets/Materials/placementIndicatorDanger.mat   | Bin 0 -> 5084 bytes
 .../Materials/placementIndicatorDanger.mat.meta    |   9 ++
 td/Assets/Materials/placementIndicatorSuccess.mat  | Bin 0 -> 5088 bytes
 .../Materials/placementIndicatorSuccess.mat.meta   |   9 ++
 td/Assets/Prefabs/Enemies/Enemy.prefab             | Bin 7824 -> 7824 bytes
 td/Assets/Prefabs/Grass-dirt.prefab                | Bin 6828 -> 0 bytes
 td/Assets/Prefabs/Grass-dirt.prefab.meta           |   9 --
 td/Assets/Prefabs/Path straigth.prefab             | Bin 7900 -> 0 bytes
 td/Assets/Prefabs/Path straigth.prefab.meta        |   9 --
 td/Assets/Prefabs/Path turn.prefab                 | Bin 8972 -> 0 bytes
 td/Assets/Prefabs/Path turn.prefab.meta            |   9 --
 td/Assets/Prefabs/Towers.meta                      |   9 ++
 td/Assets/Prefabs/Towers/Guy One.prefab            | Bin 0 -> 11536 bytes
 td/Assets/Prefabs/Towers/Guy One.prefab.meta       |   9 ++
 td/Assets/Prefabs/UI/GUI.prefab                    | Bin 37856 -> 0 bytes
 td/Assets/Prefabs/UI/GUI.prefab.meta               |   9 --
 td/Assets/Prefabs/grassPart.prefab                 | Bin 6004 -> 0 bytes
 td/Assets/Prefabs/grassPart.prefab.meta            |   9 --
 td/Assets/Prefabs/level design.meta                |   9 ++
 td/Assets/Prefabs/level design/Grass-dirt.prefab   | Bin 0 -> 7672 bytes
 .../Prefabs/level design/Grass-dirt.prefab.meta    |   9 ++
 .../Prefabs/level design/Path straigth.prefab      | Bin 0 -> 8656 bytes
 .../Prefabs/level design/Path straigth.prefab.meta |   9 ++
 td/Assets/Prefabs/level design/Path turn.prefab    | Bin 0 -> 8972 bytes
 .../Prefabs/level design/Path turn.prefab.meta     |   9 ++
 td/Assets/Prefabs/level design/grassPart.prefab    | Bin 0 -> 6004 bytes
 .../Prefabs/level design/grassPart.prefab.meta     |   9 ++
 td/Assets/Prefabs/projectiles.meta                 |   9 ++
 td/Assets/Scenes/Level 1.unity                     | Bin 83072 -> 111964 bytes
 td/Assets/Scripts/developerMode.cs                 |  36 +++++-
 td/Assets/Scripts/gameStats.cs                     |  43 +++++++
 td/Assets/Scripts/gameStats.cs.meta                |  12 ++
 td/Assets/Scripts/player.cs                        |  48 ++++++++
 td/Assets/Scripts/player.cs.meta                   |  12 ++
 td/Assets/Scripts/touchScript.cs                   |  37 ------
 td/Assets/Scripts/touchScript.cs.meta              |  12 --
 td/Assets/Scripts/tower.cs                         | 137 +++++++++++++++++++++
 td/Assets/Scripts/tower.cs.meta                    |  12 ++
 td/Assets/Scripts/waveSpawner.cs                   |  76 ++++++++++++
 td/Assets/Scripts/waveSpawner.cs.meta              |  12 ++
 td/ProjectSettings/ProjectSettings.asset           | Bin 52178 -> 52238 bytes
 td/ProjectSettings/TagManager.asset                | Bin 4308 -> 4320 bytes
 42 files changed, 474 insertions(+), 98 deletions(-)
 create mode 100644 td/Assets/Materials/placementIndicatorDanger.mat
 create mode 100644 td/Assets/Materials/placementIndicatorDanger.mat.meta
 create mode 100644 td/Assets/Materials/placementIndicatorSuccess.mat
 create mode 100644 td/Assets/Materials/placementIndicatorSuccess.mat.meta
 delete mode 100644 td/Assets/Prefabs/Grass-dirt.prefab
 delete mode 100644 td/Assets/Prefabs/Grass-dirt.prefab.meta
 delete mode 100644 td/Assets/Prefabs/Path straigth.prefab
 delete mode 100644 td/Assets/Prefabs/Path straigth.prefab.meta
 delete mode 100644 td/Assets/Prefabs/Path turn.prefab
 delete mode 100644 td/Assets/Prefabs/Path turn.prefab.meta
 create mode 100644 td/Assets/Prefabs/Towers.meta
 create mode 100644 td/Assets/Prefabs/Towers/Guy One.prefab
 create mode 100644 td/Assets/Prefabs/Towers/Guy One.prefab.meta
 delete mode 100644 td/Assets/Prefabs/UI/GUI.prefab
 delete mode 100644 td/Assets/Prefabs/UI/GUI.prefab.meta
 delete mode 100644 td/Assets/Prefabs/grassPart.prefab
 delete mode 100644 td/Assets/Prefabs/grassPart.prefab.meta
 create mode 100644 td/Assets/Prefabs/level design.meta
 create mode 100644 td/Assets/Prefabs/level design/Grass-dirt.prefab
 create mode 100644 td/Assets/Prefabs/level design/Grass-dirt.prefab.meta
 create mode 100644 td/Assets/Prefabs/level design/Path straigth.prefab
 create mode 100644 td/Assets/Prefabs/level design/Path straigth.prefab.meta
 create mode 100644 td/Assets/Prefabs/level design/Path turn.prefab
 create mode 100644 td/Assets/Prefabs/level design/Path turn.prefab.meta
 create mode 100644 td/Assets/Prefabs/level design/grassPart.prefab
 create mode 100644 td/Assets/Prefabs/level design/grassPart.prefab.meta
 create mode 100644 td/Assets/Prefabs/projectiles.meta
 create mode 100644 td/Assets/Scripts/gameStats.cs
 create mode 100644 td/Assets/Scripts/gameStats.cs.meta
 create mode 100644 td/Assets/Scripts/player.cs
 create mode 100644 td/Assets/Scripts/player.cs.meta
 delete mode 100644 td/Assets/Scripts/touchScript.cs
 delete mode 100644 td/Assets/Scripts/touchScript.cs.meta
 create mode 100644 td/Assets/Scripts/tower.cs
 create mode 100644 td/Assets/Scripts/tower.cs.meta
 create mode 100644 td/Assets/Scripts/waveSpawner.cs
 create mode 100644 td/Assets/Scripts/waveSpawner.cs.meta

(limited to 'td/Assets/Prefabs/UI')

diff --git a/td/Assets/Materials/placementIndicatorDanger.mat b/td/Assets/Materials/placementIndicatorDanger.mat
new file mode 100644
index 0000000..37e9e47
Binary files /dev/null and b/td/Assets/Materials/placementIndicatorDanger.mat differ
diff --git a/td/Assets/Materials/placementIndicatorDanger.mat.meta b/td/Assets/Materials/placementIndicatorDanger.mat.meta
new file mode 100644
index 0000000..ea86123
--- /dev/null
+++ b/td/Assets/Materials/placementIndicatorDanger.mat.meta
@@ -0,0 +1,9 @@
+fileFormatVersion: 2
+guid: fdaa960eb417543e29a712fa18d4a65f
+timeCreated: 1507034809
+licenseType: Free
+NativeFormatImporter:
+  mainObjectFileID: 2100000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/td/Assets/Materials/placementIndicatorSuccess.mat b/td/Assets/Materials/placementIndicatorSuccess.mat
new file mode 100644
index 0000000..36c1413
Binary files /dev/null and b/td/Assets/Materials/placementIndicatorSuccess.mat differ
diff --git a/td/Assets/Materials/placementIndicatorSuccess.mat.meta b/td/Assets/Materials/placementIndicatorSuccess.mat.meta
new file mode 100644
index 0000000..6e21620
--- /dev/null
+++ b/td/Assets/Materials/placementIndicatorSuccess.mat.meta
@@ -0,0 +1,9 @@
+fileFormatVersion: 2
+guid: e03c0257685414ec9a62b58f6eb7dbde
+timeCreated: 1507039389
+licenseType: Free
+NativeFormatImporter:
+  mainObjectFileID: 2100000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/td/Assets/Prefabs/Enemies/Enemy.prefab b/td/Assets/Prefabs/Enemies/Enemy.prefab
index 5d65c2c..fc3e820 100644
Binary files a/td/Assets/Prefabs/Enemies/Enemy.prefab and b/td/Assets/Prefabs/Enemies/Enemy.prefab differ
diff --git a/td/Assets/Prefabs/Grass-dirt.prefab b/td/Assets/Prefabs/Grass-dirt.prefab
deleted file mode 100644
index d943f20..0000000
Binary files a/td/Assets/Prefabs/Grass-dirt.prefab and /dev/null differ
diff --git a/td/Assets/Prefabs/Grass-dirt.prefab.meta b/td/Assets/Prefabs/Grass-dirt.prefab.meta
deleted file mode 100644
index 0c2256d..0000000
--- a/td/Assets/Prefabs/Grass-dirt.prefab.meta
+++ /dev/null
@@ -1,9 +0,0 @@
-fileFormatVersion: 2
-guid: dceb27e95f4d342f4abed553a9a0f5d2
-timeCreated: 1506603189
-licenseType: Free
-NativeFormatImporter:
-  mainObjectFileID: 100100000
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
diff --git a/td/Assets/Prefabs/Path straigth.prefab b/td/Assets/Prefabs/Path straigth.prefab
deleted file mode 100644
index 75c688d..0000000
Binary files a/td/Assets/Prefabs/Path straigth.prefab and /dev/null differ
diff --git a/td/Assets/Prefabs/Path straigth.prefab.meta b/td/Assets/Prefabs/Path straigth.prefab.meta
deleted file mode 100644
index 875d25e..0000000
--- a/td/Assets/Prefabs/Path straigth.prefab.meta	
+++ /dev/null
@@ -1,9 +0,0 @@
-fileFormatVersion: 2
-guid: a27ee2cf3aa6840dc98f35b567f52e2f
-timeCreated: 1506603963
-licenseType: Free
-NativeFormatImporter:
-  mainObjectFileID: 100100000
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
diff --git a/td/Assets/Prefabs/Path turn.prefab b/td/Assets/Prefabs/Path turn.prefab
deleted file mode 100644
index 28d95c1..0000000
Binary files a/td/Assets/Prefabs/Path turn.prefab and /dev/null differ
diff --git a/td/Assets/Prefabs/Path turn.prefab.meta b/td/Assets/Prefabs/Path turn.prefab.meta
deleted file mode 100644
index ea595d4..0000000
--- a/td/Assets/Prefabs/Path turn.prefab.meta	
+++ /dev/null
@@ -1,9 +0,0 @@
-fileFormatVersion: 2
-guid: 5e7563b197d6342e880523cb297bf4d3
-timeCreated: 1506603961
-licenseType: Free
-NativeFormatImporter:
-  mainObjectFileID: 100100000
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
diff --git a/td/Assets/Prefabs/Towers.meta b/td/Assets/Prefabs/Towers.meta
new file mode 100644
index 0000000..84da145
--- /dev/null
+++ b/td/Assets/Prefabs/Towers.meta
@@ -0,0 +1,9 @@
+fileFormatVersion: 2
+guid: bcbc671350f2542efb1691d76fa90f9e
+folderAsset: yes
+timeCreated: 1507213929
+licenseType: Free
+DefaultImporter:
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/td/Assets/Prefabs/Towers/Guy One.prefab b/td/Assets/Prefabs/Towers/Guy One.prefab
new file mode 100644
index 0000000..de1c753
Binary files /dev/null and b/td/Assets/Prefabs/Towers/Guy One.prefab differ
diff --git a/td/Assets/Prefabs/Towers/Guy One.prefab.meta b/td/Assets/Prefabs/Towers/Guy One.prefab.meta
new file mode 100644
index 0000000..2747a06
--- /dev/null
+++ b/td/Assets/Prefabs/Towers/Guy One.prefab.meta	
@@ -0,0 +1,9 @@
+fileFormatVersion: 2
+guid: b3217bd5a74a9409e85e183b0e707047
+timeCreated: 1507213924
+licenseType: Free
+NativeFormatImporter:
+  mainObjectFileID: 100100000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/td/Assets/Prefabs/UI/GUI.prefab b/td/Assets/Prefabs/UI/GUI.prefab
deleted file mode 100644
index b7a47fa..0000000
Binary files a/td/Assets/Prefabs/UI/GUI.prefab and /dev/null differ
diff --git a/td/Assets/Prefabs/UI/GUI.prefab.meta b/td/Assets/Prefabs/UI/GUI.prefab.meta
deleted file mode 100644
index 856ac47..0000000
--- a/td/Assets/Prefabs/UI/GUI.prefab.meta
+++ /dev/null
@@ -1,9 +0,0 @@
-fileFormatVersion: 2
-guid: fd69470eb7f824e3bbf2f6bac2d09ec7
-timeCreated: 1506804183
-licenseType: Free
-NativeFormatImporter:
-  mainObjectFileID: 100100000
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
diff --git a/td/Assets/Prefabs/grassPart.prefab b/td/Assets/Prefabs/grassPart.prefab
deleted file mode 100644
index 442bbc5..0000000
Binary files a/td/Assets/Prefabs/grassPart.prefab and /dev/null differ
diff --git a/td/Assets/Prefabs/grassPart.prefab.meta b/td/Assets/Prefabs/grassPart.prefab.meta
deleted file mode 100644
index 0c263b8..0000000
--- a/td/Assets/Prefabs/grassPart.prefab.meta
+++ /dev/null
@@ -1,9 +0,0 @@
-fileFormatVersion: 2
-guid: d2995460fd67949fba6e21a4fd492692
-timeCreated: 1506603208
-licenseType: Free
-NativeFormatImporter:
-  mainObjectFileID: 100100000
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
diff --git a/td/Assets/Prefabs/level design.meta b/td/Assets/Prefabs/level design.meta
new file mode 100644
index 0000000..5fa139f
--- /dev/null
+++ b/td/Assets/Prefabs/level design.meta	
@@ -0,0 +1,9 @@
+fileFormatVersion: 2
+guid: f4efb8722711a4322b5c809507092aa6
+folderAsset: yes
+timeCreated: 1507240816
+licenseType: Free
+DefaultImporter:
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/td/Assets/Prefabs/level design/Grass-dirt.prefab b/td/Assets/Prefabs/level design/Grass-dirt.prefab
new file mode 100644
index 0000000..dd9cf57
Binary files /dev/null and b/td/Assets/Prefabs/level design/Grass-dirt.prefab differ
diff --git a/td/Assets/Prefabs/level design/Grass-dirt.prefab.meta b/td/Assets/Prefabs/level design/Grass-dirt.prefab.meta
new file mode 100644
index 0000000..0c2256d
--- /dev/null
+++ b/td/Assets/Prefabs/level design/Grass-dirt.prefab.meta	
@@ -0,0 +1,9 @@
+fileFormatVersion: 2
+guid: dceb27e95f4d342f4abed553a9a0f5d2
+timeCreated: 1506603189
+licenseType: Free
+NativeFormatImporter:
+  mainObjectFileID: 100100000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/td/Assets/Prefabs/level design/Path straigth.prefab b/td/Assets/Prefabs/level design/Path straigth.prefab
new file mode 100644
index 0000000..78ad75f
Binary files /dev/null and b/td/Assets/Prefabs/level design/Path straigth.prefab differ
diff --git a/td/Assets/Prefabs/level design/Path straigth.prefab.meta b/td/Assets/Prefabs/level design/Path straigth.prefab.meta
new file mode 100644
index 0000000..875d25e
--- /dev/null
+++ b/td/Assets/Prefabs/level design/Path straigth.prefab.meta	
@@ -0,0 +1,9 @@
+fileFormatVersion: 2
+guid: a27ee2cf3aa6840dc98f35b567f52e2f
+timeCreated: 1506603963
+licenseType: Free
+NativeFormatImporter:
+  mainObjectFileID: 100100000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/td/Assets/Prefabs/level design/Path turn.prefab b/td/Assets/Prefabs/level design/Path turn.prefab
new file mode 100644
index 0000000..28d95c1
Binary files /dev/null and b/td/Assets/Prefabs/level design/Path turn.prefab differ
diff --git a/td/Assets/Prefabs/level design/Path turn.prefab.meta b/td/Assets/Prefabs/level design/Path turn.prefab.meta
new file mode 100644
index 0000000..ea595d4
--- /dev/null
+++ b/td/Assets/Prefabs/level design/Path turn.prefab.meta	
@@ -0,0 +1,9 @@
+fileFormatVersion: 2
+guid: 5e7563b197d6342e880523cb297bf4d3
+timeCreated: 1506603961
+licenseType: Free
+NativeFormatImporter:
+  mainObjectFileID: 100100000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/td/Assets/Prefabs/level design/grassPart.prefab b/td/Assets/Prefabs/level design/grassPart.prefab
new file mode 100644
index 0000000..442bbc5
Binary files /dev/null and b/td/Assets/Prefabs/level design/grassPart.prefab differ
diff --git a/td/Assets/Prefabs/level design/grassPart.prefab.meta b/td/Assets/Prefabs/level design/grassPart.prefab.meta
new file mode 100644
index 0000000..0c263b8
--- /dev/null
+++ b/td/Assets/Prefabs/level design/grassPart.prefab.meta	
@@ -0,0 +1,9 @@
+fileFormatVersion: 2
+guid: d2995460fd67949fba6e21a4fd492692
+timeCreated: 1506603208
+licenseType: Free
+NativeFormatImporter:
+  mainObjectFileID: 100100000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/td/Assets/Prefabs/projectiles.meta b/td/Assets/Prefabs/projectiles.meta
new file mode 100644
index 0000000..b66e7d3
--- /dev/null
+++ b/td/Assets/Prefabs/projectiles.meta
@@ -0,0 +1,9 @@
+fileFormatVersion: 2
+guid: 1fd8e4afa918142cf86708ca153cfa3c
+folderAsset: yes
+timeCreated: 1507240769
+licenseType: Free
+DefaultImporter:
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/td/Assets/Scenes/Level 1.unity b/td/Assets/Scenes/Level 1.unity
index cf659ae..fbf4717 100644
Binary files a/td/Assets/Scenes/Level 1.unity and b/td/Assets/Scenes/Level 1.unity differ
diff --git a/td/Assets/Scripts/developerMode.cs b/td/Assets/Scripts/developerMode.cs
index b0d7704..4f241cf 100644
--- a/td/Assets/Scripts/developerMode.cs
+++ b/td/Assets/Scripts/developerMode.cs
@@ -7,16 +7,35 @@ public class developerMode : MonoBehaviour {
 
 	public string output = "";
 	public string stack = "";
+	public bool cheatsAllowed;
 
-	bool developerModeActive;
 	GameObject pnlCanvas;
+	GameObject pnlCheats;
+	Button btnToggleCheats;
 	Text lblConsoleLog;
 
+	bool developerModeActive;
+	bool cheatMenuOpen;
+
 	void Start () {
-		pnlCanvas = transform.Find ("Canvas").gameObject;
+		/* Panels */
+		pnlCanvas = this.gameObject.transform.GetChild (0).gameObject;
+		pnlCheats = pnlCanvas.transform.Find ("cheatMenu").gameObject;
+		/* Buttons */
+		/* Button handlers */
+		/* Lablels */
 		lblConsoleLog = pnlCanvas.transform.Find ("consoleLog").gameObject.GetComponent <Text>();
-
+		/* Do setup */
 		lblConsoleLog.text = "";
+
+		if (cheatsAllowed) {
+			btnToggleCheats = pnlCanvas.transform.Find ("toggleCheats").gameObject.GetComponent <Button> ();
+			if (btnToggleCheats != null) { btnToggleCheats.onClick.AddListener (btnToggleCheatsHandler); }
+			cheatMenuOpen = false;
+		} else {
+			pnlCanvas.transform.Find ("toggleCheats").gameObject.SetActive (false);
+		}
+		pnlCheats.SetActive (false);
 	}
 
 	void Update () {
@@ -32,8 +51,16 @@ public class developerMode : MonoBehaviour {
 			this.gameObject.transform.GetChild (0).gameObject.SetActive (false);
 		}
 	}
-		
 
+	void btnToggleCheatsHandler() {
+		/* Handler for btnToggleCheats */
+		if (cheatsAllowed) {
+			cheatMenuOpen = !cheatMenuOpen;
+			pnlCheats.SetActive (cheatMenuOpen);
+		}
+	}
+		
+	#region GetDebugLog
 	void OnEnable() {
 		Application.logMessageReceived += HandleLog;
 	}
@@ -44,5 +71,6 @@ public class developerMode : MonoBehaviour {
 		string backLog = lblConsoleLog.text;
 		lblConsoleLog.text = logString + "\n" + backLog;
 	}
+	#endregion
 
 }
diff --git a/td/Assets/Scripts/gameStats.cs b/td/Assets/Scripts/gameStats.cs
new file mode 100644
index 0000000..af13f99
--- /dev/null
+++ b/td/Assets/Scripts/gameStats.cs
@@ -0,0 +1,43 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine.UI;
+using UnityEngine;
+
+public class gameStats : MonoBehaviour {
+
+	public player Player;
+    GameObject canvas;
+    Text txtMoney;
+    Text txtScore;
+    int displayedScore;
+    int displayedMoney;
+
+    void Start() {
+		canvas = transform.GetChild (0).gameObject;
+		txtMoney = canvas.transform.Find ("playerMoney").gameObject.GetComponent <Text>();
+		txtScore = canvas.transform.Find ("playerScore").gameObject.GetComponent <Text>();
+    }
+
+	void Update () {
+
+		if (Player.money () != displayedMoney) {
+			displayedMoney = Player.money ();
+			updateMoney (displayedMoney);
+		}
+
+		if (Player.score () != displayedScore) {
+			displayedScore = Player.score ();
+			updateScore (displayedScore);
+		}
+
+	}
+
+	void updateScore(int newScore) {
+		txtScore.text = ("Score: " + newScore.ToString ());
+	}
+
+	void updateMoney(int newMoney) {
+		txtMoney.text = ("Money: " + newMoney.ToString () + "$");
+	}
+
+}
diff --git a/td/Assets/Scripts/gameStats.cs.meta b/td/Assets/Scripts/gameStats.cs.meta
new file mode 100644
index 0000000..cd4989c
--- /dev/null
+++ b/td/Assets/Scripts/gameStats.cs.meta
@@ -0,0 +1,12 @@
+fileFormatVersion: 2
+guid: 48789fb36d2d543209c2f6540f1442d9
+timeCreated: 1507127936
+licenseType: Free
+MonoImporter:
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/td/Assets/Scripts/player.cs b/td/Assets/Scripts/player.cs
new file mode 100644
index 0000000..b972477
--- /dev/null
+++ b/td/Assets/Scripts/player.cs
@@ -0,0 +1,48 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public class player : MonoBehaviour {
+
+    public int startingMoney;
+
+	GameObject[] towers;
+
+    int playerMoney;
+    int playerScore;
+
+	bool placingTower;
+
+    void Awake() {
+        playerMoney = startingMoney;
+    }
+
+	#region stats
+    public int score() {
+        return playerScore;
+    }
+
+    public void score(int points) {
+        playerScore += points;
+    }
+
+    public int money() {
+        return playerMoney;
+    }
+
+    public void moneyAdd(int sum) {
+        playerMoney += sum;
+    }
+
+    public void moneySubtract(int sum) {
+        playerMoney -= sum;
+    }
+	#endregion
+
+	public void spawnTower(GameObject towerType) {
+		GameObject tower = Instantiate (towerType, new Vector3 (0, 0, 0), Quaternion.identity, transform.Find ("towers").transform);
+		tower script = tower.GetComponent <tower>();
+		script.player = this;
+	}
+
+}
diff --git a/td/Assets/Scripts/player.cs.meta b/td/Assets/Scripts/player.cs.meta
new file mode 100644
index 0000000..c57a461
--- /dev/null
+++ b/td/Assets/Scripts/player.cs.meta
@@ -0,0 +1,12 @@
+fileFormatVersion: 2
+guid: b033e147f0b23409bb5c7a98a7208d6b
+timeCreated: 1507125120
+licenseType: Free
+MonoImporter:
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/td/Assets/Scripts/touchScript.cs b/td/Assets/Scripts/touchScript.cs
deleted file mode 100644
index c8cdd6a..0000000
--- a/td/Assets/Scripts/touchScript.cs
+++ /dev/null
@@ -1,37 +0,0 @@
-using System.Collections;
-using System.Collections.Generic;
-using UnityEngine;
-
-public class touchScript : MonoBehaviour {
-
-
-	private RuntimePlatform platform = Application.platform;
-
-	void Update(){
-		if(platform == RuntimePlatform.Android || platform == RuntimePlatform.IPhonePlayer){
-			if(Input.touchCount > 0) {
-				if(Input.GetTouch(0).phase == TouchPhase.Began){
-					checkTouch(Input.GetTouch(0).position);
-				}
-			}
-		}else if(platform == RuntimePlatform.WindowsEditor){
-			if(Input.GetMouseButtonDown(0)) {
-				checkTouch(Input.mousePosition);
-			}
-		}
-	}
-
-	void checkTouch(Vector3 pos){
-		Vector3 wp = Camera.main.ScreenToWorldPoint(pos);
-		Vector2 touchPos = new Vector2(wp.x, wp.y);
-		Collider2D hit = Physics2D.OverlapPoint(touchPos);
-		Debug.Log("Checking");
-		if(hit){
-			//hit.transform.gameObject.SendMessage("Clicked",0,SendMessageOptions.DontRequireReceiver);
-			Debug.Log("CLICKED");
-		}
-	}
-
-
-
-}
diff --git a/td/Assets/Scripts/touchScript.cs.meta b/td/Assets/Scripts/touchScript.cs.meta
deleted file mode 100644
index ab0ba6c..0000000
--- a/td/Assets/Scripts/touchScript.cs.meta
+++ /dev/null
@@ -1,12 +0,0 @@
-fileFormatVersion: 2
-guid: 8b15d2b1b4d2f4f7fadf48b92f7edec2
-timeCreated: 1506804974
-licenseType: Free
-MonoImporter:
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
diff --git a/td/Assets/Scripts/tower.cs b/td/Assets/Scripts/tower.cs
new file mode 100644
index 0000000..0c812b2
--- /dev/null
+++ b/td/Assets/Scripts/tower.cs
@@ -0,0 +1,137 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public class tower : MonoBehaviour {
+
+	[Header("Attributes")]
+	public int towerPrice;           // The price of the tower, set this in the desiger (tower prefab)
+	public float fireRate;           // How long the turret should use to reload, Set in designer (tower prefab)
+	public float turnSpeed;          // How fast the turret should rotate. Set in designer (tower prefab)
+	[Range(0, 10)]
+	public float towerRange;         // How large the range of the tower is. this is the diameter. Set in designer (tower prefab)
+	[Header("Materials")]
+	public Material materialDanger;  // The material used when tower can't be placed, set in the designer (tower prefab)
+	public Material materialSuccess; // The material used when the tower can be placed, or is selected, set in the designer (tower prefab)
+	[Header("Scripting vars")]
+	public player player;            // Reference to the player object, should be set when instantiating
+
+	private GameObject placementIndicator;        // The placement indicator
+	private Renderer placementIndicatorRenderer;  // The renderer of the placement indicator
+	private Plane groundPlane;                    // Plane used for raycasting when placing tower
+	private float groundYpoint = 0.525f;          // What Y-position the Tower should be placed on, this should be constant in every use-case.
+	private bool towerPlaced;                     // Bool used to descide what to do this frame
+	private bool colliding;                       // Set if the tower collides with any GameObject, used when placing, to see where it can be placed
+
+	private Transform target;
+	private float fireCountdown;
+
+	void Start () {
+		placementIndicator = transform.GetChild (0).gameObject;
+		placementIndicatorRenderer = placementIndicator.GetComponent<Renderer> ();
+		placementIndicator.transform.localScale = new Vector3 (towerRange*7, 0.00000001f, towerRange*7); 
+
+		groundPlane = new Plane (Vector3.up, new Vector3(0f, groundYpoint, 0f));
+	}
+
+	void Update () {
+
+		#region placeTower
+		if (!towerPlaced) {
+			if (Input.touchCount == 1 || Input.GetMouseButton (0)) {
+				
+				/* Activate indicator if not already */
+				if (!placementIndicator.activeSelf) { placementIndicator.SetActive (true); }
+				/* Change indicator-color based on placement */
+				if (!colliding) { placementIndicatorRenderer.sharedMaterial = materialDanger; }
+				else { placementIndicatorRenderer.sharedMaterial = materialSuccess; }
+				/* Calculate new position */
+				Ray touchRay = Camera.main.ScreenPointToRay (Input.mousePosition);
+				float rayDistance;
+				if (groundPlane.Raycast (touchRay, out rayDistance)) {
+					transform.position = touchRay.GetPoint (rayDistance);
+				}
+
+			} else {
+				
+				/* User let go of the screen, decide if tower can be placed */
+				if (!colliding) { Destroy (gameObject); }  // Skal kollidere for å være på et godkjent område
+				else {
+					towerPlaced = true;
+					player.moneySubtract (towerPrice);
+					placementIndicator.SetActive (false);
+					placementIndicatorRenderer.sharedMaterial = materialSuccess;
+					InvokeRepeating ("updateTarget", 0f, 0.5f);  // This starts the 
+					gameObject.GetComponent <BoxCollider>().enabled = false;
+				}
+
+			}
+
+			return;
+		}
+		#endregion
+
+		// Stop rest of update if no target is aquired
+		if (target == null) {
+			return;
+		}
+		// Target lockon
+		Vector3 direction = target.position - transform.position;
+		Quaternion lookRotation = Quaternion.LookRotation (direction);
+		Vector3 rotation = Quaternion.Lerp (transform.rotation, lookRotation, Time.deltaTime * turnSpeed).eulerAngles;
+		transform.rotation = Quaternion.Euler (0f, rotation.y, 0f);
+
+		if (fireCountdown <= 0f) {
+			// FAIAAAAA
+			fireCountdown = 1f / fireRate;
+		}
+
+		fireCountdown -= Time.deltaTime;
+
+
+	}
+
+	void updateTarget() {
+		/* Method that updates the currentTarget.
+		 * The target will be set to the nearest in range */
+		GameObject[] enemies = GameObject.FindGameObjectsWithTag ("enemy");
+		float shortestDistance = Mathf.Infinity;
+		GameObject nearestEnemy = null;
+
+		foreach (var enemy in enemies) {
+			float distanceToEnemy = Vector3.Distance (transform.position, enemy.transform.position);
+			if (distanceToEnemy < shortestDistance) {
+				shortestDistance = distanceToEnemy;
+				nearestEnemy = enemy;
+			}
+		}
+
+		if (nearestEnemy != null && shortestDistance <= towerRange) {
+			Debug.Log ("Target aquired");
+			target = nearestEnemy.transform;
+		} else {
+			target = null;
+		}
+	}
+
+	void OnTriggerEnter(Collider other) {
+		colliding = true;
+	}
+
+	void OnTriggerStay(Collider other) {
+		colliding = true;
+	}
+
+	void OnTriggerExit(Collider other) {
+		colliding = false;
+	}
+
+	void OnDrawGizmosSelected() {
+		/* Show gizmos in designer */
+		Gizmos.color = Color.red;
+		Gizmos.DrawWireSphere (transform.position, towerRange);
+	}
+
+}
+
+
diff --git a/td/Assets/Scripts/tower.cs.meta b/td/Assets/Scripts/tower.cs.meta
new file mode 100644
index 0000000..c31ac8e
--- /dev/null
+++ b/td/Assets/Scripts/tower.cs.meta
@@ -0,0 +1,12 @@
+fileFormatVersion: 2
+guid: 39d4d93c762d74a628b6292b97f1483f
+timeCreated: 1506962845
+licenseType: Free
+MonoImporter:
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/td/Assets/Scripts/waveSpawner.cs b/td/Assets/Scripts/waveSpawner.cs
new file mode 100644
index 0000000..c3fada3
--- /dev/null
+++ b/td/Assets/Scripts/waveSpawner.cs
@@ -0,0 +1,76 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+using UnityEngine.UI;
+
+public class waveSpawner : MonoBehaviour {
+
+	public static int EnemiesAlive = 0;
+
+	public Wave[] waves;
+
+	public Transform spawnPoint;
+
+	public float timeBetweenWaves = 5f;
+	private float countdown = 2f;
+
+	public Text waveCountdownText;
+
+
+	private int waveIndex = 0;
+
+	void Update ()
+	{
+		if (EnemiesAlive > 0)
+		{
+			return;
+		}
+
+		if (waveIndex == waves.Length)
+		{
+			// WIN LEVEL!!!
+			this.enabled = false;
+		}
+
+		if (countdown <= 0f)
+		{
+			StartCoroutine(SpawnWave());
+			countdown = timeBetweenWaves;
+			return;
+		}
+
+		countdown -= Time.deltaTime;
+
+		countdown = Mathf.Clamp(countdown, 0f, Mathf.Infinity);
+
+		//waveCountdownText.text = string.Format("{0:00.00}", countdown);
+	}
+
+	IEnumerator SpawnWave ()
+	{
+		Wave wave = waves[waveIndex];
+
+		EnemiesAlive = wave.count;
+
+		for (int i = 0; i < wave.count; i++)
+		{
+			SpawnEnemy(wave.enemy);
+			yield return new WaitForSeconds(1f / wave.rate);
+		}
+
+		waveIndex++;
+	}
+
+	void SpawnEnemy (GameObject enemy)
+	{
+		Instantiate(enemy, spawnPoint.position, spawnPoint.rotation);
+	}
+
+}
+
+[System.Serializable]
+public class Wave {
+	public GameObject enemy;
+	public int count;
+	public float rate;
+}
\ No newline at end of file
diff --git a/td/Assets/Scripts/waveSpawner.cs.meta b/td/Assets/Scripts/waveSpawner.cs.meta
new file mode 100644
index 0000000..1f1e3cb
--- /dev/null
+++ b/td/Assets/Scripts/waveSpawner.cs.meta
@@ -0,0 +1,12 @@
+fileFormatVersion: 2
+guid: 9ea53d824cbfc4eb8a4eb4ee6a247bc7
+timeCreated: 1507241433
+licenseType: Free
+MonoImporter:
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/td/ProjectSettings/ProjectSettings.asset b/td/ProjectSettings/ProjectSettings.asset
index 3182338..64cfb4a 100644
Binary files a/td/ProjectSettings/ProjectSettings.asset and b/td/ProjectSettings/ProjectSettings.asset differ
diff --git a/td/ProjectSettings/TagManager.asset b/td/ProjectSettings/TagManager.asset
index 2c3af94..5c28d30 100644
Binary files a/td/ProjectSettings/TagManager.asset and b/td/ProjectSettings/TagManager.asset differ
-- 
cgit v1.2.3