projects
/
xonotic
/
xonotic-data.pk3dir.git
/ commitdiff
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
eaeec40
6a611fb
)
Merge branch 'Mario/entrap_nade' into 'master'
author
Mario <zacjardine@y7mail.com>
Tue, 14 Jun 2016 13:30:30 +0000
(13:30 +0000)
committer
Mario <zacjardine@y7mail.com>
Tue, 14 Jun 2016 13:30:30 +0000
(13:30 +0000)
Merge branch Mario/entrap_nade (M merge request)
Adds a new nade type; Entrap (slows down enemies that enter the large orb, lasts 10 seconds)
See merge request !324
Trivial merge
projects / xonotic / xonotic-data.pk3dir.git / commitdiff