HA4 mit this

Merge branch 'master' of gogs.informatik.hs-fulda.de:fdai7222/codingteam0815
local
5 changed files with 9 additions and 3 deletions
--- a/.gitignore
+++ b/.gitignore
@ -1 +0,0 @@
-/spaceinvaders/.metadata/
--- a/spaceinvaders/.gitignore
+++ b/spaceinvaders/.gitignore
@ -0,0 +1 @@
+/.metadata/
--- a/spaceinvaders/GameProject/bin/.gitignore
+++ b/spaceinvaders/GameProject/bin/.gitignore
@ -1,2 +1,8 @@
-/playground/
 /base/
+/collider/
+/controller/
+/gameobjects/
+/log4j2.xml
+/playground/
+/rendering/
+/ui/
--- a/spaceinvaders/GameProject/bin/playground/LevelWithBox.class
+++ b/spaceinvaders/GameProject/bin/playground/LevelWithBox.class
--- a/spaceinvaders/GameProject/src/playground/LevelWithBox.java
+++ b/spaceinvaders/GameProject/src/playground/LevelWithBox.java
@ -12,7 +12,7 @@ public class LevelWithBox extends SpaceInvadersLevel {
 	    return "Box-Level!";
 	}
 	
-	GameObject RectOb = new RectObject("Obj", null, 350, 100, 0, 0, 700, 250, Color.RED);
+	GameObject RectOb = new RectObject("Obj", this, 350, 100, 0, 0, 700, 250, Color.RED);
 	
 	@Override
 	public void prepareLevel(String id) {
Author	SHA1	Message	Date
Jannik Niebuhr	3d596558a9	HA4 mit this	3 years ago
Jannik Niebuhr	d27a5b5432	Merge branch 'master' of gogs.informatik.hs-fulda.de:fdai7222/codingteam0815	3 years ago
Jannik Niebuhr	0ed473bccd	local	3 years ago