Merge branch 'terencehill/music_player' into 'master'

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

diff --git a/defaultXonotic.cfg b/defaultXonotic.cfg
index 9e10fc194d3482a3fe0297da90c2760cb0f468c7..df7044ce562a41c915e9d59d7dc9d7ba5996b683 100644 (file)
--- a/defaultXonotic.cfg
+++ b/defaultXonotic.cfg
@@ -10,7 +10,7 @@
 // e.g. Xonotic 1.5.1 RC1 will be 15101
 set g_xonoticversion git "Xonotic version (formatted for humans)"
 
-gameversion 700 // 0.7.0
+gameversion 800 // 0.8.0
 gameversion_min 0 // git builds see all versions
 gameversion_max 65535 // git builds see all versions
 
@@ -34,6 +34,8 @@ seta g_configversion 0        "Configuration file version (used to upgrade settings) 0:
 // other aliases
 alias +hook +button6
 alias -hook -button6
+alias +jetpack +button10
+alias -jetpack -button10
 alias use "impulse 21"
 
 // for backwards compatibility
@@ -49,7 +51,7 @@ mod_q3bsp_lightmapmergepower 4
 
 // player defaults
 _cl_color "112.211" // same effect as 112, but menuqc can detect this as the default and not intentionally set
-_cl_name Player
+_cl_name ""
 _cl_playermodel models/player/erebus.iqm
 _cl_playerskin 0
 
@@ -817,19 +819,19 @@ seta scoreboard_accuracy_border_thickness 1 "accuracy stats border thickness"
 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"
@@ -931,6 +933,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.
@@ -980,7 +984,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"
@@ -1026,7 +1030,7 @@ seta cl_clippedspectating 1 "movement collision for spectators so that you can't
 
 seta cl_autoscreenshot 1 "Take a screenshot upon the end of a match... 0 = Disable completely, 1 = Allow sv_autoscreenshot to take a screenshot when requested, 2 = Always take an autoscreenshot anyway."
 
-seta cl_jetpack_jump 1 "Activate jetpack by pressing jump in the air. 0 = Disable, 1 = Enable"
+seta cl_jetpack_jump 1 "Activate jetpack by pressing jump in the air. 0 = Disable, 1 = Stop when touching ground, 2 = Enable"
 
 // must be at the bottom of this file:
 
@@ -1226,8 +1230,6 @@ volume 1
 // sucks less than the old one
 cl_decals_newsystem 1
 
-seta cl_cubemaps_extra 1
-
 set sv_q3acompat_machineshotgunswap 0 "shorthand for swapping machinegun and shotgun (for Q3A map compatibility in mapinfo files)"
 
 set g_movement_highspeed 1 "movement speed modification factor (only changes movement when above maxspeed)"