]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'morosophos/defrag-haste2' into 'master'
authorMario <mario.mario@y7mail.com>
Thu, 26 Sep 2019 11:24:45 +0000 (11:24 +0000)
committerMario <mario.mario@y7mail.com>
Thu, 26 Sep 2019 11:24:45 +0000 (11:24 +0000)
commit87390523a589c3bb63ee6826efe4a261544d7241
treee3077efe7df52ddd4113c6d0d9974c14f0210ca3
parent879c8320d2938040d7b3f0ff879532fd82e9739d
parent28764cc3596641eeb3ee7ec912abb6d43a638470
Merge branch 'morosophos/defrag-haste2' into 'master'

Rebase q3 haste changes on top of Mario's buff timers work

Closes #2228

See merge request xonotic/xonotic-data.pk3dir!710
qcsrc/common/physics/player.qc
qcsrc/server/autocvars.qh
ruleset-XDF.cfg
xonotic-server.cfg