Merge branch 'master' into Mario/buffs
authorMario <zacjardine@y7mail.com>
Tue, 4 Nov 2014 06:33:23 +0000 (17:33 +1100)
committerMario <zacjardine@y7mail.com>
Tue, 4 Nov 2014 06:33:23 +0000 (17:33 +1100)
commit20256058c4de97b81ee5aaedaa383a99010752f0
tree28fa160773c62f22f337cc0a21fe549270e2fd35
parent65cc53d883dd9b2d61456400a30aae7548f5d5ea
parent4f14e187eed72fc81aa829300f95a6d689cbced6
Merge branch 'master' into Mario/buffs
20 files changed:
_hud_descriptions.cfg
hud_luminos.cfg
hud_luminos_minimal.cfg
hud_luminos_minimal_xhair.cfg
hud_luminos_old.cfg
hud_nexuiz.cfg
qcsrc/client/autocvars.qh
qcsrc/client/hud.qc
qcsrc/client/hud.qh
qcsrc/common/constants.qh
qcsrc/common/notifications.qh
qcsrc/menu/classes.c
qcsrc/menu/xonotic/mainwindow.c
qcsrc/server/autocvars.qh
qcsrc/server/cl_client.qc
qcsrc/server/cl_physics.qc
qcsrc/server/cl_weaponsystem.qc
qcsrc/server/g_world.qc
qcsrc/server/miscfunctions.qc
qcsrc/server/mutators/base.qh