Merge branch 'master' into terencehill/physics_panel_updates

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

diff --git a/defaultXonotic.cfg b/defaultXonotic.cfg
index 9430c6ff6aae65308f984bb117d83d3c70d6d1d7..083c5d0ceec38fd4618657a3a144a676309fb38d 100644 (file)
--- a/defaultXonotic.cfg
+++ b/defaultXonotic.cfg
@@ -53,6 +53,8 @@ alias asay_drop "say_team (%l) dropped %w ; impulse 17"
 alias +hook +button6
 alias -hook -button6
 alias use "impulse 21"
+alias +use use // always send that impulse AND press the key (+use is engine internal command and executes anyway)
+set cl_newusekeysupported 1 // indicates that we always send the use impulse too, so they do not need to be synthesized
 alias ready "cmd ready"
 alias lockteams "sv_cmd lockteams"
 alias unlockteams "sv_cmd unlockteams"
@@ -1038,8 +1040,7 @@ bind MWHEELDOWN weapprev
 bind r reload
 bind BACKSPACE dropweapon
 bind g dropweapon
-// TODO change this to "use" once we can
-bind f +use
+bind f use
 
 // misc
 bind e +hook
@@ -1410,6 +1411,7 @@ seta slowmo 1
 seta menu_skin "luminos"
 set menu_slowmo 1
 seta menu_sounds 0 "enables menu sound effects. 1 enables click sounds, 2 also enables hover sounds"
+seta menu_tooltips 1 "menu tooltips: 0 disabled, 1 enabled, 2 also shows cvar or console command (when available) changed or executed by the item"
 set menu_picmip_bypass 0 "bypass texture quality enforcement based on system resources, not recommended and may cause crashes!"
 
 r_textbrightness 0.2
@@ -1485,6 +1487,9 @@ seta hud_panel_physics_topspeed 1 "also show top speed"
 seta hud_panel_physics_topspeed_time 4 "how many seconds the top speed takes to fade out"
 seta hud_panel_physics_acceleration_max 1.5 "acceleration progressbar gets completely filled up by this value (in g)"
 seta hud_panel_physics_acceleration_vertical 0 "include the acceleration on the Z-axis"
+seta hud_panel_physics_acceleration_progressbar_scale 1 "multiply acceleration progressbar values by this factor (allow progressbar to go out of panel bounds)";
+seta hud_panel_physics_acceleration_progressbar_nonlinear 1 "use a non linear function to display acceleration progressbar values (amplify more smaller values)";
+seta hud_panel_physics_text_scale 0.7 "scale text height by this factor";
 
 seta hud_showbinds 1   "what to show in the HUD to indicate certain keys to press: 0 display commands, 1 bound keys, 2 both"
 seta hud_showbinds_limit 2     "maximum number of bound keys to show for a command. 0 for unlimited"