Merge branch 'master' into terencehill/itemstime

[xonotic/xonotic-data.pk3dir.git] / defaultXonotic.cfg

diff --git a/defaultXonotic.cfg b/defaultXonotic.cfg
index cc58245383695ce6febb074fbedacaf5a2c5dc5b..142d5f83d3762221fddafd6c982f45b8ae1e8963 100644 (file)
--- a/defaultXonotic.cfg
+++ b/defaultXonotic.cfg
@@ -752,6 +752,7 @@ seta g_waypointsprite_crosshairfadedistance 150 "distance in virtual pixels from
 seta g_waypointsprite_distancefadealpha 1 "alpha multiplier near distance"
 seta g_waypointsprite_distancefadescale 0.7 "scale multiplier near the distance"
 seta g_waypointsprite_distancefadedistancemultiplier 0.5 "distance in map sizes from distance where to stop fading"
+seta g_waypointsprite_itemstime 2 "show waypoints to indicate that some important items (mega health, large armor) are about to respawn: 1 when spectating, 2 even playing in warmup stage"
 set g_waypointsprite_spam 0 "Debugging feature. Set to 10 and load courtfun in race mode to test."
 alias "g_waypointsprite_personal"      "impulse 30"
 alias "g_waypointsprite_personal_p"    "impulse 31"
@@ -933,6 +934,8 @@ makesaved vid_gl13
 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 +985,7 @@ cd remap $g_cdtracks_remaplist
 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"