Merge branch 'master' into terencehill/quickmenu

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

diff --git a/keybinds.txt b/keybinds.txt
index 6bec67ce51c48d496c7c6b03bdf7fe7b8b33aca1..cda287ebe2d3ef23f3d68bd89ee283000a34346d 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 / 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"
@@ -59,6 +60,7 @@
 "dropweapon"                            "drop weapon"
 "+use"                                  "drop key / drop flag"
 "+button8"                              "drag object"
+"toggle chase_active"                   "3rd person view"
 ""                                      ""
 ""                                      "User defined"
 "+userbind 1"                           "$userbind1"