Merge branch 'matthiaskrgr/atelier' into 'master'
authorMirio <opivy@hotmail.de>
Mon, 7 Sep 2015 13:41:10 +0000 (13:41 +0000)
committerMirio <opivy@hotmail.de>
Mon, 7 Sep 2015 13:41:10 +0000 (13:41 +0000)
commit2778e1a0790f26ea980f6c1876dbb570969dbd42
tree364ca5975680f0792bfc3f031ae1ad837ae3ba67
parent5d098c47e54a36c8c39bf1961a7223fadd23dd77
parent8221d04ba6d52b105e489dacbe4f229235c6f6c0
Merge branch 'matthiaskrgr/atelier' into 'master'

Matthiaskrgr/atelier remove "respawnrings" under items, make light-models solid for bullets.

See merge request !36