Stiffly 96ccef6ed8 Merge remote-tracking branch 'origin/master' into water ...

Conflicts:
	src/game/Game/LevelSystem.cpp

2015-10-08 21:44:50 +02:00

..

Models

Added brick models and Lifebuoy balance changes

2015-10-08 20:08:42 +02:00

Sounds

Stop sound event up and running.

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

Textures

temporary particles for demo. trails for bricks, and on brick hit.

2015-10-08 21:41:01 +02:00