Merge remote-tracking branch 'origin/master' into samual/weapons
authorSamual Lenks <samual@xonotic.org>
Wed, 14 Aug 2013 16:12:12 +0000 (12:12 -0400)
committerSamual Lenks <samual@xonotic.org>
Wed, 14 Aug 2013 16:12:12 +0000 (12:12 -0400)
commit76b7957bc3e84d1f80630ca2e282775a5d5a9013
treed6b6cb247e8a18c62f0d02bdad0bec6312964c53
parent936363b20ad37d0f0e3bba07451219104652f1d5
parent53fa7721a5a8cbcc20438c90c146c5f7cbf87ff5
Merge remote-tracking branch 'origin/master' into samual/weapons

Conflicts:
effectinfo.txt
qcsrc/server/w_hlac.qc
qcsrc/server/w_uzi.qc
qcsrc/server/weapons/weaponsystem.qc
20 files changed:
effectinfo.txt
qcsrc/client/View.qc
qcsrc/client/particles.qc
qcsrc/client/weapons/projectile.qc
qcsrc/common/constants.qh
qcsrc/server/autocvars.qh
qcsrc/server/bot/havocbot/havocbot.qc
qcsrc/server/cheats.qc
qcsrc/server/cl_client.qc
qcsrc/server/cl_physics.qc
qcsrc/server/cl_player.qc
qcsrc/server/defs.qh
qcsrc/server/g_damage.qc
qcsrc/server/g_world.qc
qcsrc/server/miscfunctions.qc
qcsrc/server/mutators/gamemode_nexball.qc
qcsrc/server/mutators/mutator_minstagib.qc
qcsrc/server/progs.src
qcsrc/server/t_items.qc
qcsrc/server/weapons/selection.qc