Merge remote branch 'origin/master' into samual/updatecommands

Conflicts:
	defaultXonotic.cfg

diff --git a/commands.cfg b/commands.cfg
index 0e528011a53aab79f8915770d67df3c757fd11e4..d16aaa525daa4eab5b288f0605c6e56a1fe63761 100644 (file)
--- a/commands.cfg
+++ b/commands.cfg
@@ -91,6 +91,8 @@ alias team_pink "cmd selectteam pink; cmd join"
 alias team_yellow "cmd selectteam yellow; cmd join"
 alias team_auto "cmd selectteam auto; cmd join"
 
+alias sandbox "cmd g_sandbox $*"
+
 
 // =========================================================
 //  sv_cmd (server console command) - server/gamecommand.qc

diff --git a/defaultXonotic.cfg b/defaultXonotic.cfg
index 8ba286b033c90c8c879a01c04e44394089f18b3b..6909037f675c67ce866d09e3cea1135c87fa4ade 100644 (file)
--- a/defaultXonotic.cfg
+++ b/defaultXonotic.cfg
@@ -1004,8 +1004,6 @@ alias togglezoom "${_togglezoom}zoom"
 
 alias reload "impulse 20"
 
-alias sandbox "cmd g_sandbox $*"
-
 // movement
 bind w +forward
 bind a +moveleft
@@ -1030,6 +1028,7 @@ alias weapon_group_7 "impulse 7"
 alias weapon_group_8 "impulse 8"
 alias weapon_group_9 "impulse 9"
 alias weapon_group_0 "impulse 14" // cycles the superweapons
+exec weapons.cfg
 bind 0 weapon_group_0
 bind 1 weapon_group_1
 bind 2 weapon_group_2
@@ -1540,7 +1539,7 @@ sv_allowdownloads 0 // download protocol is evil
 
 set g_jump_grunt 0     "Do you make a grunting noise every time you jump? Is it the same grunting noise every time?"
 
-seta cl_weaponpriority "minstanex rocketlauncher nex grenadelauncher minelayer fireball hlac hagar seeker crylink rifle uzi electro tuba shotgun laser hook porto" "weapon priority list"
+seta cl_weaponpriority "minstanex nex fireball grenadelauncher uzi hagar rifle electro rocketlauncher crylink minelayer shotgun hlac tuba laser porto seeker hook" "weapon priority list"
 seta cl_weaponpriority_useforcycling 0 "when set, weapon cycling by the mouse wheel makes use of the weapon priority list (the special value 2 uses the weapon ID list for cycling)"
 seta cl_weaponpriority0 "rocketlauncher grenadelauncher hagar seeker fireball" "use impulse 200 for prev gun from this list, 210 for best gun, 220 for next gun.  Default value: explosives"
 seta cl_weaponpriority1 "minstanex nex crylink hlac electro laser"             "use impulse 201 for prev gun from this list, 211 for best gun, 221 for next gun.  Default value: energy"

diff --git a/keybinds.txt b/keybinds.txt
index d7ec276f57f9d541057d42ebaccc63776a177069..5cba08f707132a1332cdd2ed01d3db89b229d49b 100644 (file)
--- a/keybinds.txt
+++ b/keybinds.txt
@@ -23,7 +23,7 @@
 "weapon_group_4"                        "Mortar / Mine Layer"
 "weapon_group_5"                        "Electro"
 "weapon_group_6"                        "Crylink / HLAC"
-"weapon_group_7"                        "Nex / MinstaNex / Rifle"
+"weapon_group_7"                        "Nex / Rifle"
 "weapon_group_8"                        "Hagar / Seeker"
 "weapon_group_9"                        "Rocket Launcher / Fireball"
 "weapon_group_0"                        "Port-O-Launch / Hook"

diff --git a/weapons.cfg b/weapons.cfg
new file mode 100644 (file)
index 0000000..80305a5
--- /dev/null
+++ b/weapons.cfg
@@ -0,0 +1,18 @@
+alias weapon_laser "impulse 230"
+alias weapon_shotgun "impulse 231"
+alias weapon_uzi "impulse 232"
+alias weapon_grenadelauncher "impulse 233"
+alias weapon_minelayer "impulse 234"
+alias weapon_electro "impulse 235"
+alias weapon_crylink "impulse 236"
+alias weapon_nex "impulse 237"
+alias weapon_hagar "impulse 238"
+alias weapon_rocketlauncher "impulse 239"
+alias weapon_porto "impulse 240"
+alias weapon_minstanex "impulse 241"
+alias weapon_hook "impulse 242"
+alias weapon_hlac "impulse 243"
+alias weapon_tuba "impulse 244"
+alias weapon_rifle "impulse 245"
+alias weapon_fireball "impulse 246"
+alias weapon_seeker "impulse 247"

diff --git a/weapons.cfg.sh b/weapons.cfg.sh
new file mode 100755 (executable)
index 0000000..f02d43c
--- /dev/null
+++ b/weapons.cfg.sh
@@ -0,0 +1,2 @@
+#!/bin/sh
+<qcsrc/server/w_all.qc perl -ne 'BEGIN{$i=230}/w_(.*?)\./ or+next;printf qq{alias weapon_%s "impulse %d"\n},$1,$i++;'