projects / xonotic / xonotic-maps.pk3dir.git / commit
summary | shortlog | log | commit | commitdiff | tree
(merge: 8a0fd07 7da8eeb)
Merge branch 'matthiaskrgr/afterslime_2' into 'master'
authorMirio <opivy@hotmail.de>
Sun, 6 Sep 2015 22:14:36 +0000 (22:14 +0000)
committerMirio <opivy@hotmail.de>
Sun, 6 Sep 2015 22:14:36 +0000 (22:14 +0000)
commit0ffe150d12d13e79b887969f89e0fe60940c8de8
treea9b1c7bba93a4449d14bf2667bc86a6f11ef2fc8tree | snapshot
parent8a0fd07d9d55fb0fa23ee5b30a9e32c948a0b007commit | diff
parent7da8eeb0e2c1a924f3609de391d33e153096c6e9commit | diff
Merge branch 'matthiaskrgr/afterslime_2' into 'master'

afterslime: add stuff outside of megaarmor area, fix minor item misplacement.

Added stuff outside near the megaarmor ![xonotic20150906190527-00](https://gitlab.com/xonotic/xonotic-maps.pk3dir/uploads/75c96e4c13f53bbb0397b4310374e8ca/xonotic20150906190527-00.jpg)
![xonotic20150906190504-00](https://gitlab.com/xonotic/xonotic-maps.pk3dir/uploads/0b13b1a7c7afca3c5ac500cbcd148be8/xonotic20150906190504-00.jpg)
![xonotic20150906190451-00](https://gitlab.com/xonotic/xonotic-maps.pk3dir/uploads/3a5dfc5b30bb3e73249a409a9c0648e5/xonotic20150906190451-00.jpg)

Also fix items being a little misplaced (before-screenshot): ![xonotic20150906191116-00](https://gitlab.com/xonotic/xonotic-maps.pk3dir/uploads/3ff85a02be7e54b2d9a17dbaf1f2ac59/xonotic20150906191116-00.jpg)

See merge request !34