Merge remote-tracking branch 'origin/master' into samual/spawn_weapons
authorSamual Lenks <samual@xonotic.org>
Sat, 21 Jul 2012 03:13:22 +0000 (23:13 -0400)
committerSamual Lenks <samual@xonotic.org>
Sat, 21 Jul 2012 03:13:22 +0000 (23:13 -0400)
commit6018d119b3c9f4e54d6d21f6339948708c83d83f
tree784adfcddb6c35579b06a2bf366b2fcab87b5fe0
parentb7c49465049281c2d910b0f3b73a7fc1b7bd844e
parent33c4dec3010293f321f1b71d6bcee204f644d632
Merge remote-tracking branch 'origin/master' into samual/spawn_weapons

Conflicts:
effectinfo.txt
qcsrc/server/vehicles/raptor.qc
qcsrc/server/vehicles/spiderbot.qc
24 files changed:
effectinfo.txt
qcsrc/client/Main.qc
qcsrc/common/constants.qh
qcsrc/server/autocvars.qh
qcsrc/server/cl_client.qc
qcsrc/server/g_damage.qc
qcsrc/server/tturrets/units/unit_flac.qc
qcsrc/server/tturrets/units/unit_walker.qc
qcsrc/server/vehicles/racer.qc
qcsrc/server/vehicles/raptor.qc
qcsrc/server/vehicles/spiderbot.qc
qcsrc/server/vehicles/vehicles.qc
qcsrc/server/w_common.qc
qcsrc/server/w_crylink.qc
qcsrc/server/w_electro.qc
qcsrc/server/w_fireball.qc
qcsrc/server/w_grenadelauncher.qc
qcsrc/server/w_hagar.qc
qcsrc/server/w_hlac.qc
qcsrc/server/w_hook.qc
qcsrc/server/w_laser.qc
qcsrc/server/w_minelayer.qc
qcsrc/server/w_rocketlauncher.qc
qcsrc/server/w_seeker.qc