Merge branch 'terencehill/music_player' into 'master'

Merge branch terencehill/music_player (M merge request)

Adds a music player to the menu.

See merge request !66

diff --combined defaultXonotic.cfg
index cc58245383695ce6febb074fbedacaf5a2c5dc5b,5740c3c810be06246cef3fd451bf94b379a6cc19..df7044ce562a41c915e9d59d7dc9d7ba5996b683
--- 1/defaultXonotic.cfg
--- 2/defaultXonotic.cfg
+++ b/defaultXonotic.cfg
@@@ -819,19 -819,19 +819,19 @@@ seta scoreboard_accuracy_border_thickne
  seta scoreboard_accuracy_doublerows 0 "use two rows instead of one"
  seta scoreboard_accuracy_nocolors 0 "don't use colors displaying accuracy stats"
  seta scoreboard_accuracy 1 "show weapon accuracy stats panel on scoreboard; colors can be configured with accuracy_color* cvars"
 -seta scoreboard_color_bg_r 0 "red color component of the scoreboard background"
 -seta scoreboard_color_bg_g 0.4 "green color component of the scoreboard background"
 -seta scoreboard_color_bg_b 0.6 "blue color component of the scoreboard background"
 -seta scoreboard_color_bg_team 0.5 "team color multiplier of the scoreboard background"
 -seta scoreboard_alpha_bg 0.6 "scoreboard background alpha"
 +seta scoreboard_color_bg_r 0.125 "red color component of the scoreboard background"
 +seta scoreboard_color_bg_g 0.55 "green color component of the scoreboard background"
 +seta scoreboard_color_bg_b 0.875 "blue color component of the scoreboard background"
 +seta scoreboard_color_bg_team 0.6 "team color multiplier of the scoreboard background"
 +seta scoreboard_alpha_bg 0.7 "scoreboard background alpha"
  seta scoreboard_alpha_fg 1 "scoreboard foreground alpha"
  seta scoreboard_alpha_name 0.9 "alpha of player text in scoreboard list other than self"
  seta scoreboard_alpha_name_self 1 "alpha of player text in scoreboard list of self"
  seta scoreboard_fadeinspeed 10 "speed at which scoreboard fades in, higher is faster (0 = instant)"
  seta scoreboard_fadeoutspeed 5 "speed at which scoreboard fades out, higher is faster (0 = instant)"
  seta scoreboard_highlight 1 "enable highlighting for rows and columns in the scoreboard"
 -seta scoreboard_highlight_alpha 0.10 "highlight alpha value (depends on hud_scoreboard_highlight 1)"
 -seta scoreboard_highlight_alpha_self 0.25 "self highlight alpha value"
 +seta scoreboard_highlight_alpha 0.08 "highlight alpha value (depends on hud_scoreboard_highlight 1)"
 +seta scoreboard_highlight_alpha_self 0.3 "self highlight alpha value"
  seta scoreboard_offset_left 0.15 "how far (by percent) the scoreboard is offset from the left screen edge"
  seta scoreboard_offset_right 0.15 "how far (by percent) the scoreboard is offset from the right screen edge"
  seta scoreboard_offset_vertical 0.05 "how far (by percent) the scoreboard is offset from the top and bottom of the screen"
@@@ -933,6 -933,8 +933,8 @@@ makesaved vid_gl1
  makesaved vid_gl20
  makesaved v_idlescale
  makesaved v_kicktime
+ makesaved music_playlist_list0
+ makesaved music_playlist_random0
  
  // ticrate
  //sys_ticrate 0.0166667 // 60fps. This would be ideal, but kills home routers.
@@@ -982,7 -984,7 +984,7 @@@ cd remap $g_cdtracks_remaplis
  set sv_intermission_cdtrack ""
  
  set g_cdtracks_dontusebydefault "rising-of-the-phoenix"
- set menu_cdtrack "rising-of-the-phoenix"
+ seta menu_cdtrack "rising-of-the-phoenix"
  
  set sv_maxidle 0 "kick players idle for more than this amount of time in seconds"
  set sv_maxidle_spectatorsareidle 0 "when sv_maxidle is not 0, assume spectators are idle too"