Jace 7f344263da Merge branch 'master' into gui ...

Conflicts:
	include/Game/GUI/HUD.h
	src/game/Core/Renderer.cpp

2015-10-08 23:47:25 +02:00

..

Models

Lifebuoy updated, now dies after 4 hits

2015-10-08 21:51:43 +02:00

Sounds

Stop sound event up and running.

2015-09-23 14:14:11 +02:00

Textures

Merge branch 'master' into gui

2015-10-08 23:47:25 +02:00