Merge branch 'maddin/map-warfare' into 'master'
authorMirio <opivy@hotmail.de>
Thu, 1 Oct 2015 09:21:41 +0000 (09:21 +0000)
committerMirio <opivy@hotmail.de>
Thu, 1 Oct 2015 09:21:41 +0000 (09:21 +0000)
commit553164dcc551f529d0e28a335a67b9ee5d4f0ef2
treefca8f614bde1c4198c1174c0778e197d4e52ca6d
parentd0b37ed5305593e826f3c3d0d63eff6b4f250724
parent8e24d9972ba6df3dd3a8428185ee4014c5a6e68e
Merge branch 'maddin/map-warfare' into 'master'

Maddin/map warfare

This fixes the remaining issues of #102 and adds some minor visual improvements (outer and inner terrain parts mainly).

See merge request !45