]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'Mario/buff_updates' into Mario/combined_updates
authorMario <zacjardine@y7mail.com>
Fri, 3 Apr 2015 08:04:49 +0000 (19:04 +1100)
committerMario <zacjardine@y7mail.com>
Fri, 3 Apr 2015 08:04:49 +0000 (19:04 +1100)
commitaef3d1d3086edd738a9b675d60e5530e04060e83
treebeb00f939bc3a9397efb5940a4be1e9f69f4c66e
parent9366d7dd0db64f96665ccb4571354f5add6583b7
parent4510cc7248f1192cc057382e924b1cbec279769e
Merge branch 'Mario/buff_updates' into Mario/combined_updates

Conflicts:
qcsrc/client/autocvars.qh
qcsrc/client/hud_config.qc
qcsrc/common/buffs.qh
qcsrc/common/notifications.qh
qcsrc/common/stats.qh
qcsrc/server/autocvars.qh
qcsrc/server/mutators/base.qh
qcsrc/server/mutators/mutator_buffs.qc
qcsrc/server/mutators/mutator_buffs.qh
15 files changed:
qcsrc/client/autocvars.qh
qcsrc/client/hud.qc
qcsrc/client/hud_config.qc
qcsrc/common/buffs.qh
qcsrc/common/stats.qh
qcsrc/common/weapons/w_devastator.qc
qcsrc/server/autocvars.qh
qcsrc/server/bot/aim.qc
qcsrc/server/g_damage.qc
qcsrc/server/mutators/base.qh
qcsrc/server/mutators/mutator_buffs.qc
qcsrc/server/mutators/mutator_buffs.qh
qcsrc/server/weapons/tracing.qc
qcsrc/server/weapons/weaponsystem.qc
qcsrc/server/weapons/weaponsystem.qh