# imported physixbody to game.java
First commit of sounds

sounds of regular bunnys
.iml-Dateien entfernt und .gitignore aktualisiert.

Conflicts:
	gdw-commons/gdw-commons.iml
	gdw-examples/gdw-examples.iml
.iml-Dateien entfernt und .gitignore aktualisiert.
.iml-Dateien entfernt und .gitignore aktualisiert.
.iml-Dateien entfernt und .gitignore aktualisiert.
seperate healthbar into class
Merge branch 'hud' of https://github.com/hottehead/GameDevWeek into hud
merged test code form levelselectrostage to testhudstage
deleted levelselectorstage
doPlayeraktion hinzugefuegt
Was war jetzt nochmal mit Playerintention geplannt?
healthbar
Merge branch 'hud' of https://github.com/hottehead/GameDevWeek into hud

Conflicts:
	gdx-test/src/main/java/de/hochschuletrier/gdw/ws1314/hud/TestHudStage.java
added json connections

- added json connections to sounds.json
- deleted default sound
something stupid happened
Merge branch 'sound'
First commit of sounds

sounds of regular bunnys
added json connections

- added json connections to sounds.json
- deleted default sound
I really did nothing with this file =)
Merge branch 'master' of https://github.com/hottehead/GameDevWeek

Conflicts:
	gdx-bunny-brawl/src/main/java/de/hochschuletrier/gdw/ws1314/entity/player/ServerPlayer.java
added soundfiles for "tank" class