]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'master' into mario/monsters
authorMario <mario.mario@y7mail.com>
Thu, 21 Feb 2013 14:31:45 +0000 (01:31 +1100)
committerMario <mario.mario@y7mail.com>
Thu, 21 Feb 2013 14:31:45 +0000 (01:31 +1100)
commit20b5c2a97d395ab3ab924255cc7a91f6982b4112
treefdf601f52d1ee8422481a9e83e45c5e17e3c3b4d
parentb4c7df19b04dd8f61fc72c21a2cb5ae03123519d
parentd27a9970837d9430120bc4dbe0fa873ecce87450
Merge branch 'master' into mario/monsters
12 files changed:
defaultXonotic.cfg
qcsrc/client/hud.qc
qcsrc/common/constants.qh
qcsrc/server/autocvars.qh
qcsrc/server/cl_client.qc
qcsrc/server/cl_player.qc
qcsrc/server/cl_weaponsystem.qc
qcsrc/server/defs.qh
qcsrc/server/g_damage.qc
qcsrc/server/g_world.qc
qcsrc/server/miscfunctions.qc
qcsrc/server/tturrets/units/unit_walker.qc