From: TimePath <andrew.hardaker1995@gmail.com>
Date: Wed, 26 Aug 2015 12:28:58 +0000 (+0000)
Subject: Merge branch 'TimePath/gamesettings' into 'master'
X-Git-Tag: xonotic-v0.8.2~2026
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=8b2e7bcc17160adf572990bdc24462854d799026;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'TimePath/gamesettings' into 'master'

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
---

8b2e7bcc17160adf572990bdc24462854d799026