From: Samual Date: Sat, 10 Dec 2011 05:10:47 +0000 (-0500) Subject: Merge remote branch 'origin/master' into samual/updatecommands X-Git-Tag: xonotic-v0.6.0~188^2~28^2~174 X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=commitdiff_plain;h=168e34edfe83e34c20cddf998cb81dea874adb99;hp=2af24a5bd785fb0b2e65a4a69ca658242ff07651 Merge remote branch 'origin/master' into samual/updatecommands Conflicts: defaultXonotic.cfg --- diff --git a/commands.cfg b/commands.cfg index 0e528011a5..d16aaa525d 100644 --- 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 8ba286b033..6909037f67 100644 --- 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 d7ec276f57..5cba08f707 100644 --- 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 index 0000000000..80305a5fe2 --- /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 index 0000000000..f02d43cf10 --- /dev/null +++ b/weapons.cfg.sh @@ -0,0 +1,2 @@ +#!/bin/sh +