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

Conflicts:
	include/Core/Engine.h

2015-10-20 11:01:42 +02:00

..

Models

Animation models and stuff

2015-10-19 16:48:42 +02:00

Sounds

Merge branch 'master' into Sound

2015-10-19 15:36:01 +02:00

Textures

Fixed so oilshooter shoots the new particle

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

DefaultConfig.ini

Added a cheatmode setting in config

2015-10-19 15:56:26 +02:00