Merge branch 'master' into terencehill/newpanelhud

[xonotic/xonotic-data.pk3dir.git] / qcsrc / client / autocvars.qh

diff --git a/qcsrc/client/autocvars.qh b/qcsrc/client/autocvars.qh
index 1daecc5a555b58fc80383a7ad8e8f98ca3d46afd..c7ca054b62b122925411907f7a697f5d6c475716 100644 (file)
--- a/qcsrc/client/autocvars.qh
+++ b/qcsrc/client/autocvars.qh
@@ -6,9 +6,7 @@ var float autocvar_cl_gibs_sloppy = 1;
 var float autocvar_cl_casings_ticrate = 0.1;
 var float autocvar_cl_casings_sloppy = 1;
 
-var float autocvar_cl_gentle;
-var float autocvar_cl_gentle_gibs;
-var float autocvar_cl_gentle_messages;
+var float autocvar_cl_gentle_damage;
 
 var float autocvar_scoreboard_color_bg_team;
 
@@ -16,11 +14,6 @@ var float autocvar__menu_alpha;
 
 var float autocvar__hud_configure;
 var float autocvar_hud_configure_teamcolorforced;
-var float autocvar_hud_configure_bg_minalpha;
-var float autocvar_hud_configure_grid;
-var float autocvar_hud_configure_grid_xsize;
-var float autocvar_hud_configure_grid_ysize;
-var float autocvar_hud_configure_grid_alpha;
 
 var float autocvar__con_chat_maximized;
 var string autocvar__hud_panelorder;
@@ -48,10 +41,6 @@ var float autocvar_hud_panel_powerups;
 var float autocvar_hud_panel_healtharmor;
 
 var float autocvar_hud_panel_notify;
-var float autocvar_hud_panel_notify_print;
-var float autocvar_hud_panel_notify_time;
-var float autocvar_hud_panel_notify_fadetime;
-var float autocvar_hud_panel_notify_flip;
 
 var float autocvar_hud_panel_timer;
 var float autocvar_hud_panel_timer_increment;
@@ -76,3 +65,5 @@ var float autocvar_hud_panel_infomessages;
 var float autocvar_hud_panel_infomessages_flip;
 
 var float autocvar_scoreboard_border_thickness;
+
+var float autocvar_cl_allow_uid2name;