Merge in xonotic/xonotic-data.pk3dir.git: samual/defaults/removekilldelay
git-manager created issue #421 on 2011-04-21T06:49:15Z:
Purpose of the branch:
Get rid of the immediate kill delay for suicide -- It's only annoying having it with a weird delay.
In the very least if we HAVE to have it enabled, change it to 3 seconds instead of 2 :P the countdown sucks and is weird without 3.
Repository: xonotic/xonotic-data.pk3dir.git Commit: c78c013a508406ed726d62140eda4250aaa5910d Branch: samual/defaults/removekilldelay
Merge commands:
cd data/xonotic-data.pk3dir
git checkout master
git reset --hard origin/master
git pull && git diff 'c78c013a508406ed726d62140eda4250aaa5910d'..'origin/samual/defaults/removekilldelay'
git merge --no-ff 'origin/samual/defaults/removekilldelay'
git push && git push --delete origin 'samual/defaults/removekilldelay'
Diffstat:
defaultXonotic.cfg | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
Revision log:
commit c78c013a508406ed726d62140eda4250aaa5910d
Author: Samual
Commit: Samual
Remove the immediate kill delay, but increase the anti-spam time. This way you can still kill yourself instantly (especially useful in race or CTS) but you can only do it every 10 seconds to prevent spam.
User agreed to the GPLv2*.
Diff:
<pre>diff —git a/defaultXonotic.cfg b/defaultXonotic.cfg
index 62d3418..36c5750 100644
— a/defaultXonotic.cfg
**+ b/defaultXonotic.cfg
@ -1576,8 +1576,8
@ sv\_gameplayfix\_q2airaccelerate 1
sv\_gameplayfix\_stepmultipletimes 1
// delay for “kill” to prevent abuse
~~set g\_balance\_kill\_delay 2
~~set g\_balance\_kill\_antispam 5
*set g\_balance\_kill\_delay 0
+set g\_balance\_kill\_antispam 10
// this feature is currently buggy in the engine (it appears to PREVENT any dropping in lots of maps, leading to weirdly aligned entities, and in some cases even CAUSES them to drop through solid, like in facing worlds nex) sv_gameplayfix_droptofloorstartsolid 0