Merge branch 'master' into bones_was_here/q3compat

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

diff --git a/qcsrc/client/autocvars.qh b/qcsrc/client/autocvars.qh
index 06d89929ac961a0fd849d5f74888f0be3d772f7e..347da5de121ce77739b3acb704ed67f60c5c5bcd 100644 (file)
--- a/qcsrc/client/autocvars.qh
+++ b/qcsrc/client/autocvars.qh
@@ -61,6 +61,7 @@ bool autocvar_cl_particles_oldvortexbeam;
 float autocvar_cl_particles_quality;
 bool autocvar_cl_projectiles_sloppy;
 bool autocvar_cl_readpicture_force;
+bool autocvar_cl_respawn_ghosts_keepcolors;
 bool autocvar_cl_reticle = 1;
 float autocvar_cl_reticle_normal_alpha = 1;
 bool autocvar_cl_reticle_weapon = 1;
@@ -120,7 +121,8 @@ string autocvar_crosshair_hitindication_color;
 string autocvar_crosshair_hitindication_per_weapon_color;
 float autocvar_crosshair_hitindication_speed;
 bool autocvar_crosshair_hittest;
-bool autocvar_crosshair_hittest_blur;
+bool autocvar_crosshair_hittest_blur_teammate = 0;
+bool autocvar_crosshair_hittest_blur_wall = 1;
 //float autocvar_crosshair_hittest_scale = 1.25;
 bool autocvar_crosshair_hittest_showimpact;
 bool autocvar_crosshair_per_weapon;
@@ -242,7 +244,7 @@ float autocvar_hud_panel_centerprint_fade_subsequent_minfontsize = 0.75;
 float autocvar_hud_panel_centerprint_fade_minfontsize = 0;
 bool autocvar_hud_panel_centerprint_flip;
 float autocvar_hud_panel_centerprint_fontscale;
-float autocvar_hud_panel_centerprint_fontscale_bold = 1.8;
+float autocvar_hud_panel_centerprint_fontscale_bold = 1.4;
 float autocvar_hud_panel_centerprint_time;
 bool autocvar_hud_panel_chat;
 bool autocvar_hud_panel_engineinfo;