Merge branch 'master' into samual/combined_updates
authorMario <zacjardine@y7mail.com>
Mon, 17 Nov 2014 23:58:19 +0000 (10:58 +1100)
committerMario <zacjardine@y7mail.com>
Mon, 17 Nov 2014 23:58:19 +0000 (10:58 +1100)
commit5e3a7beca384caa6f3da36fe07b29aff942e7b3e
treecc8391e8a3fe7a57cc534de4e5808b74172ec1f7
parentbfd4316c7714f8982a0d0a771b7bd616241fbb8b
parent99a15ec6d46a049ac04446c17ad407551dd500e1
Merge branch 'master' into samual/combined_updates

Conflicts:
defaultXonotic.cfg
effects-high.cfg
effects-low.cfg
effects-med.cfg
effects-normal.cfg
effects-omg.cfg
effects-ultimate.cfg
effects-ultra.cfg
qcsrc/common/mapinfo.qh
qcsrc/menu/xonotic/demolist.c
qcsrc/menu/xonotic/dialog_settings_effects.c
qcsrc/menu/xonotic/gametypelist.c
qcsrc/menu/xonotic/mainwindow.c
qcsrc/menu/xonotic/maplist.c
qcsrc/server/cl_client.qc
qcsrc/server/g_world.qc
qcsrc/server/playerstats.qc
qcsrc/server/progs.src
41 files changed:
defaultXonotic.cfg
effects-high.cfg
effects-low.cfg
effects-med.cfg
effects-normal.cfg
effects-omg.cfg
effects-ultimate.cfg
effects-ultra.cfg
gamemodes.cfg
gfx/menu/luminos/skinvalues.txt
gfx/menu/wickedx/skinvalues.txt
gfx/menu/xaw/skinvalues.txt
qcsrc/client/View.qc
qcsrc/client/autocvars.qh
qcsrc/client/progs.src
qcsrc/common/mapinfo.qc
qcsrc/common/mapinfo.qh
qcsrc/common/notifications.qh
qcsrc/common/util.qh
qcsrc/menu/classes.c
qcsrc/menu/menu.qc
qcsrc/menu/skin-customizables.inc
qcsrc/menu/xonotic/demolist.c
qcsrc/menu/xonotic/dialog_multiplayer_create.c
qcsrc/menu/xonotic/dialog_settings_effects.c
qcsrc/menu/xonotic/gametypelist.c
qcsrc/menu/xonotic/mainwindow.c
qcsrc/menu/xonotic/serverlist.c
qcsrc/menu/xonotic/slider.c
qcsrc/menu/xonotic/util.qc
qcsrc/server/autocvars.qh
qcsrc/server/cl_client.qc
qcsrc/server/cl_player.qc
qcsrc/server/command/vote.qc
qcsrc/server/defs.qh
qcsrc/server/g_damage.qc
qcsrc/server/g_world.qc
qcsrc/server/mapvoting.qc
qcsrc/server/miscfunctions.qc
qcsrc/server/progs.src
qcsrc/server/scores.qc