X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=gamemodes.cfg;h=add2332726f51f1eb52df2f2e495a9be791f0693;hb=268f9c69576b6bb929f66d19f0d077d19ba47edd;hp=60b791f0c1c427d0a632d44acdc6a4669a583830;hpb=1cbef966e133966c5b5f0f5b58fbd1a5851ed35b;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/gamemodes.cfg b/gamemodes.cfg
index 60b791f0c..add233272 100644
--- a/gamemodes.cfg
+++ b/gamemodes.cfg
@@ -254,7 +254,7 @@ set g_ca_teams 0
 //  capture the flag
 // ==================
 set g_ctf 0 "Capture The Flag: take the enemy flag and bring it to yours at your base to score"
-set g_ctf_oneflag 1 "Allow oneflag CTF mode on maps that support it"
+set g_ctf_oneflag 0 "Allow oneflag CTF mode on maps that support it"
 set g_ctf_oneflag_reverse 0 "apply reverse mode to oneflag CTF (take flag to enemy bases to cap), overrides g_ctf_reverse only in oneflag, g_ctf_reverse still affects oneflag"
 set g_ctf_flag_return 1 "auto return the flag to base when touched by a teammate"
 set g_ctf_flag_return_carrying 0 "(manual return mode) auto return the flag to base if touched by a flag carrier"
@@ -360,7 +360,7 @@ set g_domination_disable_frags		0 "players can't get frags normally, only get po
 set g_domination_point_amt		0 "override: how many points to get per ping"
 set g_domination_point_fullbright	0 "domination point fullbright"
 set g_domination_point_rate		0 "override: how often to give those points"
-set g_domination_point_capturetime	0.1 "how long it takes to capture a point (given no interference)"
+//set g_domination_point_capturetime	0.1 "how long it takes to capture a point (given no interference)"
 set g_domination_point_glow		0 "domination point glow (warning, slow)"
 set g_domination_roundbased 0 "enable round-based domination (capture all control points to win the round)"
 set g_domination_roundbased_point_limit 5 "capture limit in round-based domination mode"
@@ -391,7 +391,7 @@ set g_freezetag_teams 0
 // ==========
 //  keepaway
 // ==========
-set g_keepaway 0 "game mode which focuses around a ball, look at g_keepaway_win_mode for further details"
+set g_keepaway 0 "game mode which focuses around a ball"
 set g_keepaway_score_bckill 1 "enable scoring points (y/n) for ball carrier kills (value is how many points to award)"
 set g_keepaway_score_killac 1 "amount of points to give when you kill someone while you have the ball"
 set g_keepaway_score_timeinterval 1 "amount of time it takes between intervals for timepoints to be added to the score"
@@ -464,8 +464,10 @@ set g_balance_nexball_secondary_force      500    "stealing projectile force"
 set g_balance_nexball_secondary_refire       0.6  "stealing projectile refire"
 set g_balance_nexball_secondary_animtime     0.3  "stealing projectile animtime"
 set g_nexball_football_physics  2  "0: Revenant's original movement, 1: 0 but half independant of aiming height, 2: 1 fully independant, -1: first recode try"
+set g_nexball_basketball_jumppad 1    "whether basketballs should be pushable by jumppads"
 set g_nexball_basketball_bouncefactor 0.6    "velocity loss when the ball bounces"
 set g_nexball_basketball_bouncestop   0.075  "speed at which the ball stops when it hits the ground (multiplied by sv_gravity)"
+set g_nexball_football_jumppad 1    "whether footballs should be pushable by jumppads"
 set g_nexball_football_bouncefactor   0.6    "velocity loss when the ball bounces"
 set g_nexball_football_bouncestop     0.075  "speed at which the ball stops when it hits the ground (multiplied by sv_gravity)"
 set g_nexball_football_boost_forward      100   "forward velocity boost when the ball is touched"
@@ -502,7 +504,6 @@ set g_onslaught 0 "Onslaught: take control points towards the enemy generator an
 set g_onslaught_point_limit 1 "Onslaught point limit overriding the mapinfo specified one (use 0 to play without limit, and -1 to use the mapinfo's limit)"
 set g_onslaught_warmup 5
 set g_onslaught_round_timelimit 280
-set g_onslaught_debug 0 "show debug prints in onslaught"
 set g_onslaught_teleport_radius 200 "Allows teleporting from a control point to another"
 set g_onslaught_teleport_wait 5 "Time before player can teleport again"
 set g_onslaught_spawn_choose 1 "Allow players to choose the control point to be spawned at"
@@ -531,7 +532,7 @@ set g_onslaught_spawn_at_generator_random 0
 // ======
 set g_race 0 "Race: be faster than your opponents"
 set g_race_qualifying_timelimit 0
-set g_race_qualifying_timelimit_override -1
+set g_race_qualifying_timelimit_override -1 "qualifying session time limit overriding the mapinfo specified one (use 0 to play without limit, and -1 to use the mapinfo's limit)"
 set g_race_teams 0	"when 2, 3, or 4, the race is played as a team game (the team members can add up their laps)"
 
 // ==========