viktorljung c1ba6481df Merge remote-tracking branch 'origin/master' into Physics ...

Conflicts:
	include/Game/BallSystem.h
	include/Game/ProjectileSystem.h
	src/game/Game/BallSystem.cpp
	src/game/Game/ProjectileSystem.cpp
	src/game/Rendering/AnimationSystem.cpp

2015-10-23 14:47:04 +02:00

..

Models

Animations in the game

2015-10-23 14:35:11 +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 missing config options

2015-10-23 13:39:33 +02:00