Merge branch 'master' of ssh://git.breab.org:2222/gamejam-gpn15/dyingIsMainstream

Assets/Prefabs/HealingBullet.prefab.meta

+fileFormatVersion: 2
+guid: 28dfe170d909586449b1605a27882ad2
+timeCreated: 1433440842
+licenseType: Free
+NativeFormatImporter:
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Prefabs/TrapDestroyBullet.prefab.meta

+fileFormatVersion: 2
+guid: 84f3fefc4de4fd24982fdd4f908396bb
+timeCreated: 1433440862
+licenseType: Free
+NativeFormatImporter:
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Scripts/Bullet.cs

+using UnityEngine;
+using System.Collections;
+
+public class Bullet : MonoBehaviour {
+
+    public int healingPoints = 10;
+    public bool destroyTrap = false;
+    public int speed = 5;
+
+	// Use this for initialization
+	void Start () {
+	
+	}
+
+    /// <summary>
+    /// Das aufrufen, wenn die Kugel wirklich losgeschossen werden soll.
+    /// </summary>
+    /// <param name="direction"></param>
+    public void shoot(Vector2 direction)
+    {
+        GetComponent<Rigidbody2D>().velocity = (float)speed*direction.normalized;
+    }
+
+    void OnTriggerEnter(Collider other)
+    {
+        if (other.tag == "Player")
+        {
+            other.GetComponent<PlayerHealth>().changeHealthBy(healingPoints);
+        }
+        if (other.tag == "Trap")
+        {
+            //Zerstöre Falle
+            Debug.Log("TODO Destroy Trap");
+        }
+        Destroy(gameObject);
+    }
+
+}

Assets/Scripts/Bullet.cs.meta

+fileFormatVersion: 2
+guid: 5fca959367c3f454b93020477922fde9
+timeCreated: 1433439929
+licenseType: Free
+MonoImporter:
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: