PolygonCollision added
PolygonCollision added
-
PolygonCollision added
added some stuff
pppushh
Merge remote-tracking branch 'origin/master'

Conflicts:
	GameDemo/src/com/angrynerds/game/collision/CollisionDetector.java
Collision Detection
Merge branch 'master' of https://github.com/Franjoo/Game
Merge branch 'master' into CollisionPolygons

Conflicts:
	GameDemo/src/com/angrynerds/game/collision/Detector.java
	GameDemo/src/com/angrynerds/gameobjects/Map.java
	GameDemo/src/com/angrynerds/gameobjects/Player.java
	GameDemo/src/com/angrynerds/gameobjects/creatures/Creature.java
mist hier
Merge
Everything works fine now.
added some stuff
gitignore update
gitignore again
and again
and again and again
and again and again
and again and again