Merge branch 'TimePath/gamesettings' into 'master'
authorTimePath <andrew.hardaker1995@gmail.com>
Wed, 26 Aug 2015 12:28:58 +0000 (12:28 +0000)
committerTimePath <andrew.hardaker1995@gmail.com>
Wed, 26 Aug 2015 12:28:58 +0000 (12:28 +0000)
Game settings as list

Finally something to do away with all those tabs

* Makes it possible for mutators to add settings panels
* Adds one for damage text

![](https://dl.dropboxusercontent.com/u/42745598/screenshots/2015-08-25_22-12-51.png)

See merge request !205

1  2 
qcsrc/client/progs.src
qcsrc/server/progs.src

Simple merge
Simple merge