Merge branch 'master' into Mario/overkill
authorMario <mario.mario@y7mail.com>
Tue, 28 Jan 2014 06:13:12 +0000 (17:13 +1100)
committerMario <mario.mario@y7mail.com>
Tue, 28 Jan 2014 06:13:12 +0000 (17:13 +1100)
commite95cf471e2b4a66a099aff48cad52b3b37951518
tree0705c3061e18a66e2aba1c49ef0b66f9a2ec913a
parent143442813be7d5753c349a1a6603a832957d880f
parent7e9d4404fbd602050e843cb2169f8afab4163b11
Merge branch 'master' into Mario/overkill
26 files changed:
balance25.cfg
balanceFruitieX.cfg
balanceXDF.cfg
balanceXPM.cfg
balanceXonotic.cfg
defaultXonotic.cfg
overkill.cfg
qcsrc/client/View.qc
qcsrc/client/autocvars.qh
qcsrc/client/projectile.qc
qcsrc/client/waypointsprites.qc
qcsrc/common/constants.qh
qcsrc/common/notifications.qh
qcsrc/server/autocvars.qh
qcsrc/server/cl_weapons.qc
qcsrc/server/cl_weaponsystem.qc
qcsrc/server/defs.qh
qcsrc/server/miscfunctions.qc
qcsrc/server/mutators/mutator_minstagib.qc
qcsrc/server/mutators/mutator_nades.qc
qcsrc/server/mutators/mutator_overkill.qc
qcsrc/server/mutators/mutator_overkill.qh
qcsrc/server/mutators/mutators.qh
qcsrc/server/progs.src
qcsrc/server/w_hmg.qc
qcsrc/server/w_rpc.qc