]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'master' into Mario/buff_updates
authorMario <zacjardine@y7mail.com>
Fri, 31 Jul 2015 09:45:40 +0000 (19:45 +1000)
committerMario <zacjardine@y7mail.com>
Fri, 31 Jul 2015 09:45:40 +0000 (19:45 +1000)
commit9c09a961b8674e3a808889d3f34d71855018d3bc
treeeca0e7716f8899a28c9b116154ce64ca0f7ade22
parent459113c6b47ab71204088b818e745879c0e80b25
parent924ba9b521119651b5667c0280868df9f95ca488
Merge branch 'master' into Mario/buff_updates

# Conflicts:
# qcsrc/common/stats.qh
# qcsrc/server/autocvars.qh
# qcsrc/server/g_damage.qc
# qcsrc/server/mutators/mutator_buffs.qc
# qcsrc/server/mutators/mutator_buffs.qh
16 files changed:
qcsrc/client/autocvars.qh
qcsrc/client/hud.qc
qcsrc/client/hud_config.qc
qcsrc/common/buffs.qh
qcsrc/common/notifications.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/mutator_buffs.qc
qcsrc/server/mutators/mutator_buffs.qh
qcsrc/server/weapons/tracing.qc
qcsrc/server/weapons/weaponsystem.qc
qcsrc/warpzonelib/mathlib.qc
qcsrc/warpzonelib/mathlib.qh