]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
projects / xonotic / xonotic-data.pk3dir.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 02e0727 4e0ee1f)
Merge branch 'Mario/triggers' into 'master'
authorMario <zacjardine@y7mail.com>
Wed, 5 Aug 2015 12:34:44 +0000 (12:34 +0000)
committerMario <zacjardine@y7mail.com>
Wed, 5 Aug 2015 12:34:44 +0000 (12:34 +0000)
Merge branch Mario/triggers (L merge request)

Adds various useful flags to existing triggers and brushes, and a new side-scroller trigger for extra fun.

See merge request !161


Trivial merge