Merge branch 'master' into terencehill/physics_panel_updates

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

diff --git a/keybinds.txt b/keybinds.txt
index 7738584dd1d7d57128577d9035667ccd254c58d9..2df89afae0e9f0ecf8b5dd4cdc6a737071a65a80 100644 (file)
--- a/keybinds.txt
+++ b/keybinds.txt
@@ -17,29 +17,30 @@
 "weaplast"                              "previously used"
 "weapbest"                              "best"
 "reload"                                "reload"
-"impulse 1"                             "laser"
-"impulse 2"                             "shotgun"
-"impulse 3"                             "machine gun / rifle"
-"impulse 4"                             "mortar"
-"impulse 5"                             "electro"
-"impulse 6"                             "crylink / hlac"
-"impulse 7"                             "nex / minstanex"
-"impulse 8"                             "hagar"
-"impulse 9"                             "rocket launcher / fireball"
-"impulse 14"                            "porto / hook"
+"weapon_group_1"                        "Laser"
+"weapon_group_2"                        "Shotgun"
+"weapon_group_3"                        "Machine Gun"
+"weapon_group_4"                        "Mortar / Mine Layer"
+"weapon_group_5"                        "Electro"
+"weapon_group_6"                        "Crylink / HLAC"
+"weapon_group_7"                        "Nex / MinstaNex / Rifle"
+"weapon_group_8"                        "Hagar / Seeker"
+"weapon_group_9"                        "Rocket Launcher / Fireball"
+"weapon_group_0"                        "Port-O-Launch / Hook"
 ""                                      ""
 ""                                      "View"
-"+zoom"                                 "zoom"
+"+zoom"                                 "hold zoom"
+"togglezoom"                            "toggle zoom"
 "+showscores"                           "show scores"
-"+showaccuracy"                                "show accuracy"
 "screenshot"                            "screen shot"
+"+hud_panel_radar_maximized"            "maximize radar"
 ""                                      ""
 ""                                      "Communicate"
 "messagemode"                           "public chat"
 "messagemode2"                          "team chat"
 "+con_chat_maximize"                    "show chat history"
-"cl_cmd cl_vyes"                        "vote YES"
-"cl_cmd cl_vno"                         "vote NO"
+"vyes"                                  "vote YES"
+"vno"                                   "vote NO"
 "ready"                                 "ready"
 ""                                      ""
 ""                                      "Client"