Merge branch 'terencehill/menu_optimizations' into 'master'

[xonotic/xonotic-data.pk3dir.git] / keybinds.txt

diff --git a/keybinds.txt b/keybinds.txt
index 2df89afae0e9f0ecf8b5dd4cdc6a737071a65a80..189d02eb4ddf0135ab0ed9ededd38db602495949 100644 (file)
--- a/keybinds.txt
+++ b/keybinds.txt
@@ -5,7 +5,8 @@
 "+moveright"                            "strafe right"
 "+jump"                                 "jump / swim"
 "+crouch"                               "crouch / sink"
-"+hook"                                 "off-hand hook / jet pack"
+"+hook"                                 "off-hand hook"
+"+jetpack"                              "jet pack"
 ""                                      ""
 ""                                      "Attacking"
 "+fire"                                 "primary fire"
@@ -17,15 +18,15 @@
 "weaplast"                              "previously used"
 "weapbest"                              "best"
 "reload"                                "reload"
-"weapon_group_1"                        "Laser"
+"weapon_group_1"                        "Blaster"
 "weapon_group_2"                        "Shotgun"
-"weapon_group_3"                        "Machine Gun"
+"weapon_group_3"                        "Machine Gun / Arc"
 "weapon_group_4"                        "Mortar / Mine Layer"
 "weapon_group_5"                        "Electro"
 "weapon_group_6"                        "Crylink / HLAC"
-"weapon_group_7"                        "Nex / MinstaNex / Rifle"
+"weapon_group_7"                        "Vortex / Rifle"
 "weapon_group_8"                        "Hagar / Seeker"
-"weapon_group_9"                        "Rocket Launcher / Fireball"
+"weapon_group_9"                        "Devastator / Fireball"
 "weapon_group_0"                        "Port-O-Launch / Hook"
 ""                                      ""
 ""                                      "View"
@@ -47,15 +48,18 @@
 "+show_info"                            "server info"
 "toggleconsole"                         "enter console"
 "disconnect"                            "disconnect"
-"quit"                                  "quit"
+"menu_showquitdialog"                   "quit"
 ""                                      ""
 ""                                      "Teamplay"
 "messagemode2"                          "team chat"
 "team_auto"                             "auto-join team"
 "menu_showteamselect"                   "team menu"
+"menu_showsandboxtools"                 "sandbox menu"
 "spec"                                  "enter spectator mode"
 "dropweapon"                            "drop weapon"
 "+use"                                  "drop key / drop flag"
+"+button8"                              "drag object"
+"toggle chase_active"                   "3rd person view"
 ""                                      ""
 ""                                      "User defined"
 "+userbind 1"                           "$userbind1"