]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
projects / xonotic / xonotic-data.pk3dir.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: dc63e94 967ceeb)
Merge branch 'Mario/item_fixes' into 'master'
authorMario <zacjardine@y7mail.com>
Sun, 30 Aug 2015 13:26:18 +0000 (13:26 +0000)
committerMario <zacjardine@y7mail.com>
Sun, 30 Aug 2015 13:26:18 +0000 (13:26 +0000)
Merge branch Mario/item_fixes (M merge request)

Fixes some issues with items, and adds the infamous item fading hack (disabled by default)

See merge request !212

1  2 
qcsrc/server/autocvars.qh patch | diff1 | diff2 | blob | history

diff --cc qcsrc/server/autocvars.qh
Simple merge