X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=binds-xonotic.cfg;h=2a81e706971d048c3106af270fc5ddbf8ff1eec2;hb=b68ae63023f5117b235fd2c5185566d2454bfeba;hp=fc469c2c96acfed3333c5ba35e61b08a26ae4321;hpb=af6032d7f97d3915ab37dca9f4ec2111a1bbf0c7;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/binds-xonotic.cfg b/binds-xonotic.cfg
index fc469c2c9..2a81e7069 100644
--- a/binds-xonotic.cfg
+++ b/binds-xonotic.cfg
@@ -1,11 +1,3 @@
-// alias for switching the teamselect menu
-bind F5 menu_showteamselect
-
-bind F6 team_auto
-
-bind F7 menu_showsandboxtools
-bind F8 "quickmenu"
-
 // movement
 bind w +forward
 bind a +moveleft
@@ -39,10 +31,7 @@ bind MWHEELUP weapnext
 bind MWHEELDOWN weapprev
 bind r reload
 bind BACKSPACE dropweapon
-bind k kill
 bind g dropweapon
-bind f +use
-bind v +button8 // drag object
 
 // misc
 bind e +hook
@@ -51,6 +40,9 @@ bind ~ toggleconsole
 bind TAB +showscores
 bind ESCAPE togglemenu
 bind ENTER messagemode
+bind k kill
+bind f +use
+bind v +button8 // drag object
 bind t messagemode
 bind y messagemode2
 bind z messagemode2
@@ -59,11 +51,20 @@ bind m +hud_panel_radar_maximized
 bind b "quickmenu"
 bind i +show_info
 bind PAUSE pause
+
+// function keys
+bind F1 vyes
+bind F2 vno
+bind F3 spec
+bind F4 ready
+bind F5 team_selection_show
+bind F6 team_auto
+bind F7 menu_showsandboxtools
+bind F8 "quickmenu"
 bind F9 "cl_cmd hud minigame"
 bind F10 menu_showquitdialog
-bind F11 menu_showdisconnectdialog
+
 bind F12 screenshot
-bind F4 ready
 
 // Gamepad defaults. Tested with Logitech Rumblepad 2, I hope similar ones works as well.
 bind JOY1 "+crouch"
@@ -74,7 +75,7 @@ bind JOY5 "+fire2"
 bind JOY6 "+fire"
 bind JOY7 "+zoom"
 bind JOY8 "dropweapon"
-bind JOY9 "menu_showteamselect"
+bind JOY9 team_selection_show
 bind JOY10 "+show_info"
 bind JOY11 "+showscores"
 bind JOY12 "+con_chat_maximize"
@@ -113,12 +114,6 @@ bind kp_enter "+userbind 16"
 bind kp_plus "+userbind 17"
 bind kp_minus "+userbind 18"
 
-bind F1 vyes
-bind F2 vno
-
-//used for spectate/observer mode
-bind F3 spec
-
 // usercommands. These can be edited and bound by the menu.
 seta "userbind1_press" "say_team strength soon";  seta "userbind1_release" "";  seta "userbind1_description" "team: strength soon"
 seta "userbind2_press" "say_team free item %x^7 (l:%y^7); g_waypointsprite_team_here_p";  seta "userbind2_release" "";  seta "userbind2_description" "team: free item, icon"