From: Mirio <opivy@hotmail.de>
Date: Sun, 6 Sep 2015 18:25:32 +0000 (+0000)
Subject: Merge branch 'matthiaskrgr/silentsiege_stuckfix' into 'master'
X-Git-Tag: xonotic-v0.8.2~175
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=21f21a522db7c86f6a4355b141d43822fd4d4760;p=xonotic%2Fxonotic-maps.pk3dir.git

Merge branch 'matthiaskrgr/silentsiege_stuckfix' into 'master'

silentsiege: fix player getting stuck on edge underneath nex platform

Found by @terencehill , players could get stuck moving around on the column under the nex platform.

Fixed by slightly moving stuff around.

Fixes #103

See merge request !33
---

21f21a522db7c86f6a4355b141d43822fd4d4760