xonotic-data.pk3dir:Mario/teams_override: an IMPRESSIVE merge request: Removes some old un-used keepaway cvars.
git-manager created issue #1829 (closed) on 2013-12-21T01:36:31Z:
Removes some old un-used keepaway cvars.
Repository: xonotic/xonotic-data.pk3dir.git Commit: 53ecb52a Branch: Mario/teams_override
Merge commands:
cd data/xonotic-data.pk3dir
git checkout master
git reset --hard origin/master
git pull && git diff '53ecb52aa20c3197528dd17bbcb14b70a422be37'..'origin/Mario/teams_override'
# 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 --edit --log --no-ff 'origin/Mario/teams_override'
# 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 'Mario/teams_override'
Diffstat:
gamemodes.cfg | 2 --
1 files changed, 0 insertions(+), 2 deletions(-)
Revision log:
commit 53ecb52aa20c3197528dd17bbcb14b70a422be37
Author: Mario
Commit: Mario
Remove keepaway team cvars from config
User agreed to the license.
Diff:
diff --git a/gamemodes.cfg b/gamemodes.cfg
index feed748..45b8c38 100644
--- a/gamemodes.cfg
+++ b/gamemodes.cfg
@@ -292,8 +292,6 @@ set g_keepawayball_effects 0 "Add together the numbers you want: EF_ADDITIVE (32
set g_keepawayball_trail_color 254 "particle trail color from player/ball"
set g_keepawayball_damageforcescale 3 "Scale of force which is applied to the ball by weapons/explosions/etc"
set g_keepawayball_respawntime 10 "if no one picks up the ball, how long to wait until the ball respawns"
-seta g_keepaway_teams_override 0
-set g_keepaway_teams 0
// ==========