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

Conflicts:
	src/game/Game/BallSystem.cpp
	src/game/Game/LevelSystem.cpp

2015-10-22 14:40:09 +02:00

..

Models

Merge remote-tracking branch 'origin/master' into Physics

2015-10-22 14:40:09 +02:00

Sounds

Story sound. Tom could be improved.

2015-10-20 16:12:55 +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