]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'master' into 'Mario/status_effects'
authorterencehill <piuntn@gmail.com>
Tue, 15 Jun 2021 13:24:58 +0000 (13:24 +0000)
committerterencehill <piuntn@gmail.com>
Tue, 15 Jun 2021 13:24:58 +0000 (13:24 +0000)
commitaecd4e7b9523204a1dec88eaee0fd618976baf85
tree015418b0786f9be45fa4ba29e1df286c10b85107
parent6cba8ccca010b795495c799ea18b91762899bbdb
parent4cea351f15002b3da8a6b7f51505267457db00cc
Merge branch 'master' into 'Mario/status_effects'

# Conflicts:
#   qcsrc/common/stats.qh
qcsrc/client/hud/hud.qh
qcsrc/client/view.qc
qcsrc/common/mutators/mutator/buffs/sv_buffs.qc
qcsrc/common/physics/player.qh
qcsrc/common/stats.qh
qcsrc/server/client.qc
qcsrc/server/damage.qc
qcsrc/server/items/items.qc
qcsrc/server/player.qc