Stiffly e1f628be06 Merge branch 'master' into Sound ...

Conflicts:
	src/game/Game/BallSystem.cpp

2015-10-22 16:45:25 +02:00

..

Models

New kraken boss model

2015-10-22 15:32:36 +02:00

Sounds

Kraken power down sound. Added Zap sound to story

2015-10-22 10:54:53 +02:00

Textures

Fixed so oilshooter shoots the new particle

2015-10-19 16:32:14 +02:00

DefaultConfig.ini

Added cheat and water changes to the defaul commit

2015-10-20 10:36:11 +02:00