From: Mario <zacjardine@y7mail.com>
Date: Sat, 30 Jan 2016 00:21:02 +0000 (+0000)
Subject: Merge branch 'terencehill/g_spawnshield_blockdamage' into 'master'
X-Git-Tag: xonotic-v0.8.2~1209
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=856c818d26a3eed4d9a320e5fc693c43df6af729;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'terencehill/g_spawnshield_blockdamage' into 'master'

g_spawnshield_blockdamage

Add g_spawnshield_blockdamage cvar: "how much spawn shield protects you from damage (1 = full protection)"

See merge request !275
---

856c818d26a3eed4d9a320e5fc693c43df6af729