From: Mirio <opivy@hotmail.de>
Date: Thu, 1 Oct 2015 20:25:30 +0000 (+0000)
Subject: Merge branch 'maddin/map-warfare' into 'master'
X-Git-Tag: xonotic-v0.8.2~159
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=8375d9cea897c2386ea81868247109e9905c7345;p=xonotic%2Fxonotic-maps.pk3dir.git

Merge branch 'maddin/map-warfare' into 'master'

Warfare - workaround for issue with buggy reflections, see #102 and 8e24d997

Workaround for issue with buggy reflections, see #102 and 8e24d997. The brushes with the water shader just need to be a bit taller and have to be detail brushes.

See merge request !48
---

8375d9cea897c2386ea81868247109e9905c7345