Stiffly 0180b29544 Merge remote-tracking branch 'origin/master' into Sound ...

Conflicts:
	src/game/Sound/SoundSystem.cpp

2015-10-16 11:53:38 +02:00

..

Models

Working skeletal animations!!!

2015-10-15 12:48:28 +02:00

Sounds

Added hover and click sounds. Cleanup in SoundSystem.

2015-10-15 12:33:49 +02:00

Textures

Changed how the score background is rendered and added some combo numbers

2015-10-14 17:16:16 +02:00

DefaultConfig.ini

Improved config loading to read default options from one file and overrides from another and merge differences properly

2015-10-15 17:55:56 +02:00