Merge branch 'master' into Mario/vehicles

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

diff --git a/defaultXonotic.cfg b/defaultXonotic.cfg
index 5ac033bdfbcf2216493f8c548ed283b1d0cfd6d7..45c920195ede5f95c6f1e68fd9bdf2063d00a5d6 100644 (file)
--- a/defaultXonotic.cfg
+++ b/defaultXonotic.cfg
@@ -72,7 +72,7 @@ seta cl_velocityzoom_time 0.2 "time value for averaging speed values"
 seta cl_spawnzoom 1 "zoom effect immediately when a player spawns"
 seta cl_spawnzoom_speed 1 "speed at which zooming occurs while spawning"
 seta cl_spawnzoom_factor 2 "factor of zoom while spawning"
-seta cl_zoomfactor 5   "how much +zoom will zoom (1-16)"
+seta cl_zoomfactor 5   "how much +zoom will zoom (1-30)"
 seta cl_zoomspeed 8    "how fast it will zoom (0.5-16), negative values mean instant zoom"
 seta cl_zoomsensitivity 0      "how zoom changes sensitivity (0 = weakest, 1 = strongest)"
 
@@ -1135,11 +1135,6 @@ set g_mapinfo_settemp_acl "+*" "ACL for mapinfo setting cvars"
 
 seta cl_casings_maxcount 100 "maximum amount of shell casings (must be at least 1)"
 seta cl_gibs_maxcount 100 "maximum amount of gibs (must be at least 1)"
-seta cl_vehicle_spiderbot_cross_alpha 0.6
-seta cl_vehicle_spiderbot_cross_size 1
-seta cl_vehicles_hudscale 0.5
-seta cl_vehicles_hudalpha 0.75
-seta cl_vehicles_hud_tactical 1
 
 //cl_gunalign calculator
 seta menu_cl_gunalign 3 "Gun alignment; 1 = center (if allowed by g_shootfromclient) or right, 2 = center (if allowed by g_shootfromclient) or left, 3 = right only, 4 = left only"