]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge remote branch 'origin/master' into samual/hud_updates
authorSamual <samual@xonotic.org>
Sat, 15 Oct 2011 03:25:16 +0000 (23:25 -0400)
committerSamual <samual@xonotic.org>
Sat, 15 Oct 2011 03:25:16 +0000 (23:25 -0400)
commitfb61c977ddeed686ef587fd54e40f55a4bdc2322
tree11a730b5917c1621ae9f9b45840975d19463fea7
parent4fac5ff674af4140474f6436ce63b8bd656c7577
parentd45b38dafc2bb63be5813db1864595742578005e
Merge remote branch 'origin/master' into samual/hud_updates
18 files changed:
defaultXonotic.cfg
qcsrc/client/hud.qc
qcsrc/server/autocvars.qh
qcsrc/server/g_damage.qc
qcsrc/server/miscfunctions.qc
qcsrc/server/w_electro.qc
qcsrc/server/w_grenadelauncher.qc
qcsrc/server/w_hagar.qc
qcsrc/server/w_hlac.qc
qcsrc/server/w_hook.qc
qcsrc/server/w_minelayer.qc
qcsrc/server/w_minstanex.qc
qcsrc/server/w_nex.qc
qcsrc/server/w_rifle.qc
qcsrc/server/w_rocketlauncher.qc
qcsrc/server/w_seeker.qc
qcsrc/server/w_shotgun.qc
qcsrc/server/w_uzi.qc