Merge branch 'master' into samual/weapons
authorMario <mario.mario@y7mail.com>
Mon, 6 Jan 2014 23:53:04 +0000 (10:53 +1100)
committerMario <mario.mario@y7mail.com>
Mon, 6 Jan 2014 23:53:04 +0000 (10:53 +1100)
commitb38e2bae0a50554f26bf5af1fbd0e70b97cc0c71
tree572d4735e3dcd5a92e4422df8f7452ede627b70f
parent3093090eb162c3bb09589383b69c1d7dfc1672d2
parent79af1d0a6a91cc42a4359ecdae84a9fa72593731
Merge branch 'master' into samual/weapons
35 files changed:
defaultXonotic.cfg
effectinfo.txt
qcsrc/client/Main.qc
qcsrc/client/progs.src
qcsrc/client/scoreboard.qc
qcsrc/client/weapons/projectile.qc
qcsrc/common/constants.qh
qcsrc/common/monsters/monster/mage.qc
qcsrc/common/monsters/monster/shambler.qc
qcsrc/common/monsters/monster/spider.qc
qcsrc/common/monsters/monster/wyvern.qc
qcsrc/common/monsters/sv_monsters.qc
qcsrc/common/notifications.qh
qcsrc/common/util.qh
qcsrc/common/weapons/w_shockwave.qc
qcsrc/common/weapons/w_shotgun.qc
qcsrc/menu/progs.src
qcsrc/server/autocvars.qh
qcsrc/server/cl_client.qc
qcsrc/server/cl_impulse.qc
qcsrc/server/cl_physics.qc
qcsrc/server/defs.qh
qcsrc/server/g_damage.qc
qcsrc/server/g_world.qc
qcsrc/server/miscfunctions.qc
qcsrc/server/mutators/mutator_minstagib.qc
qcsrc/server/progs.src
qcsrc/server/t_items.qc
qcsrc/server/tturrets/system/system_main.qc
qcsrc/server/vehicles/bumblebee.qc
qcsrc/server/vehicles/racer.qc
qcsrc/server/vehicles/raptor.qc
qcsrc/server/vehicles/spiderbot.qc
qcsrc/server/vehicles/vehicles.qc
qcsrc/server/weapons/accuracy.qc