(Untested) Merge branch 'master' into Mario/overkill
authorMario <zacjardine@y7mail.com>
Sat, 13 Dec 2014 02:59:44 +0000 (13:59 +1100)
committerMario <zacjardine@y7mail.com>
Sat, 13 Dec 2014 02:59:44 +0000 (13:59 +1100)
commita59c12d71fa599891fc1d658aeea2f546d89d9e4
tree39020318b059d9afe0410909b6607eba64b419ca
parent548723946db49d79428c74d3debb7cda211f2148
parent930108cf8180c6f5da8d8945a73b0dc53d1c3b8d
(Untested) Merge branch 'master' into Mario/overkill

Conflicts:
balance25.cfg
balanceFruitieX.cfg
balanceXDF.cfg
balanceXPM.cfg
balanceXonotic.cfg
defaultXonotic.cfg
qcsrc/client/View.qc
qcsrc/client/autocvars.qh
qcsrc/client/waypointsprites.qc
qcsrc/client/weapons/projectile.qc
qcsrc/common/constants.qh
qcsrc/common/notifications.qh
qcsrc/common/weapons/all.qh
qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.c
qcsrc/server/cl_weapons.qc
qcsrc/server/miscfunctions.qc
qcsrc/server/mutators/mutator_instagib.qc
qcsrc/server/mutators/mutator_nades.qc
qcsrc/server/mutators/mutator_nades.qh
qcsrc/server/progs.src
qcsrc/server/weapons/weaponsystem.qc
28 files changed:
bal-wep-nexuiz25.cfg
bal-wep-overkill.cfg
bal-wep-samual.cfg
bal-wep-xdf.cfg
bal-wep-xonotic.cfg
bal-wep-xpm.cfg
balance-overkill.cfg
mutators.cfg
qcsrc/client/View.qc
qcsrc/client/autocvars.qh
qcsrc/client/weapons/projectile.qc
qcsrc/common/constants.qh
qcsrc/common/notifications.qh
qcsrc/common/stats.qh
qcsrc/common/weapons/all.qh
qcsrc/common/weapons/w_hmg.qc
qcsrc/common/weapons/w_rpc.qc
qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.c
qcsrc/server/autocvars.qh
qcsrc/server/defs.qh
qcsrc/server/mutators/mutator_instagib.qc
qcsrc/server/mutators/mutator_overkill.qc
qcsrc/server/mutators/mutator_overkill.qh
qcsrc/server/mutators/mutators.qc
qcsrc/server/mutators/mutators.qh
qcsrc/server/mutators/mutators_include.qc
qcsrc/server/mutators/mutators_include.qh
qcsrc/server/weapons/weaponsystem.qc