Merge remote-tracking branch 'origin/master' into samual/weapons
authorSamual Lenks <samual@xonotic.org>
Wed, 1 Jan 2014 13:11:17 +0000 (08:11 -0500)
committerSamual Lenks <samual@xonotic.org>
Wed, 1 Jan 2014 13:11:17 +0000 (08:11 -0500)
commitee3543c1c14ffc6cd14b6dbd07d76d4cb65e3bd6
treef9b88f8ae897c01735f8fef25c6bd965558940e2
parentd655a433e8434031ff5665b9306b9a52de26f6bd
parent360a188afcd740bcb79138fbed32aafcf1f0bca1
Merge remote-tracking branch 'origin/master' into samual/weapons

Conflicts:
mutator_new_toys.cfg
qcsrc/client/miscfunctions.qc
qcsrc/common/explosion_equation.qc
qcsrc/server/cl_weapons.qc
qcsrc/server/g_damage.qc
qcsrc/server/weapons/weaponsystem.qc
21 files changed:
defaultXonotic.cfg
qcsrc/client/Main.qc
qcsrc/client/View.qc
qcsrc/client/autocvars.qh
qcsrc/client/hud.qc
qcsrc/client/miscfunctions.qc
qcsrc/client/scoreboard.qc
qcsrc/client/waypointsprites.qc
qcsrc/common/command/generic.qc
qcsrc/common/notifications.qh
qcsrc/common/util.qc
qcsrc/common/util.qh
qcsrc/common/weapons/calculations.qc
qcsrc/common/weapons/w_tuba.qc
qcsrc/server/cheats.qc
qcsrc/server/cl_client.qc
qcsrc/server/cl_player.qc
qcsrc/server/g_damage.qc
qcsrc/server/miscfunctions.qc
qcsrc/server/weapons/accuracy.qc
qcsrc/server/weapons/weaponsystem.qc