Merge remote branch 'origin/master' into mirceakitsune/preview_images

Conflicts:
	qcsrc/client/mapvoting.qc

diff --cc qcsrc/client/Main.qc
Simple merge

diff --cc qcsrc/client/mapvoting.qc
index 161ef8fbe6aedeab9024b0d41914b973edcee6a8,0af74018eeb58406ed398d38033ce24773674cad..1eeb304c7c169e29d5cc92fd43fc428f8a5b54bc
--- 1/qcsrc/client/mapvoting.qc
--- 2/qcsrc/client/mapvoting.qc
+++ b/qcsrc/client/mapvoting.qc
@@@ -88,10 -88,7 +88,10 @@@ void MapVote_DrawMapItem(vector pos, fl
        }
        else
        {
 -              drawpic(pos, pic, img_size, '1 1 1', theAlpha, DRAWFLAG_NORMAL);
 +              if(precache_pic(pic) == "")
-                       drawpic(pos, draw_UseSkinFor("nopreview_map"), img_size, '1 1 1', alpha, DRAWFLAG_NORMAL);
++                      drawpic(pos, draw_UseSkinFor("nopreview_map"), img_size, '1 1 1', theAlpha, DRAWFLAG_NORMAL);
 +              else
-                       drawpic(pos, pic, img_size, '1 1 1', alpha, DRAWFLAG_NORMAL);
++                      drawpic(pos, pic, img_size, '1 1 1', theAlpha, DRAWFLAG_NORMAL);
        }
  
        if(id == mv_ownvote)

diff --cc qcsrc/common/util.qc
Simple merge

diff --cc qcsrc/common/util.qh
Simple merge

diff --cc qcsrc/menu/xonotic/dialog_multiplayer_create_mapinfo.c
Simple merge

diff --cc qcsrc/menu/xonotic/maplist.c
Simple merge