Merge in xonotic/xonotic-data.pk3dir.git: nyov/hookfix
git-manager created issue #817 (closed) on 2011-11-16T07:38:25Z:
Purpose of the branch:
small bugfix, removing the hook from playerview if used on endmatch
Repository: xonotic/xonotic-data.pk3dir.git Commit: eea95fe2 Branch: nyov/hookfix
Merge commands:
cd data/xonotic-data.pk3dir
git checkout master
git reset --hard origin/master
git pull && git diff 'eea95fe2444a6a9dc2eb7a651f396255375d5cc2'..'origin/nyov/hookfix'
# please check that the diff you just saw did not contain anything complex that
# needs a new merge request, and review these changes
git merge --no-ff 'origin/nyov/hookfix'
# please make sure this merge worked, and if not, fix merge conflicts and git
# commit BEFORE the next command
#
# also, THIS is the point to do final pre-merge testing
#
# use git reset --hard origin/master to bail out
git push && git push --delete origin 'nyov/hookfix'
Diffstat:
qcsrc/server/g_hook.qc | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
Revision log:
commit eea95fe2444a6a9dc2eb7a651f396255375d5cc2
Author: nyov
Commit: nyov
detach hook in intermission/endmatch
might not be necessary if 3rd person view would attach it to
the player model instead of view
User agreed to the GPLv2*.
Diff:
<pre>diff —git a/qcsrc/server/g_hook.qc b/qcsrc/server/g_hook.qc
index b08ef09..84ea021 100644
— a/qcsrc/server/g_hook.qc
**+ b/qcsrc/server/g_hook.qc
@ -121,7 +121,7
@ void GrapplingHookThink
error;
return;
}
- if)
- if(LostMovetypeFollow(self) || intermission_running) { RemoveGrapplingHook(self.realowner); return;