Merge branch 'master' into samual/keepaway

[xonotic/xonotic-data.pk3dir.git] / defaultXonotic.cfg

diff --git a/defaultXonotic.cfg b/defaultXonotic.cfg
index 8e27bff243a33caa562fed70eee21909a508eca2..751a368b74d61c1a83ae0bd95f9aed410e108088 100644 (file)
--- a/defaultXonotic.cfg
+++ b/defaultXonotic.cfg
@@ -565,7 +565,8 @@ set g_freezetag 0 "Freeze Tag: Freeze the opposing team(s) to win, unfreeze team
 seta g_freezetag_warmup 5 "Time players get to run around before the round starts"
 seta g_freezetag_point_limit -1        "Freeze Tag point limit overriding the mapinfo specified one (use 0 to play without limit, and -1 to use the mapinfo's limit)"
 seta g_freezetag_point_leadlimit -1    "Freeze Tag point lead limit overriding the mapinfo specified one (use 0 to play without limit, and -1 to use the mapinfo's limit)"
-seta g_freezetag_revive_time 2.5 "Time it takes to revive a frozen teammate"
+seta g_freezetag_revive_speed 0.4 "Speed for reviving a frozen teammate"
+seta g_freezetag_revive_clearspeed 1.6 "Speed at which reviving progress gets lost when out of range"
 seta g_freezetag_revive_extra_size 100 "Distance in qu that you can stand from a frozen teammate to keep reviving him"
 seta g_freezetag_frozen_force 0.6 "How much to multiply the force on a frozen player with"
 
@@ -1273,15 +1274,15 @@ set g_keyhunt_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_bckillscore 1 "enable scoring points (y/n) for ball carrier kills"
+set g_keepaway_bckillscore 0 "enable scoring points (y/n) for ball carrier kills"
 set g_keepaway_pointlimit      -1      "total amount of points you can get, -1 for unlimited"
 set g_keepaway_pointleadlimit  -1      "mercy rule, -1 for unlimited"
 set g_keepaway_ballcarrier_alpha 0.6 "alpha when the player is the ballcarrier"
 set g_keepaway_ballcarrier_highspeed 1.5 "speed multiplier done to the person holding the ball"
-set g_keepaway_ballcarrier_damage      1.5     "damage multiplier while having powerup"
-set g_keepaway_ballcarrier_force       1.5     "force multiplier while having powerup"
-set g_keepaway_ballcarrier_selfdamage  1       "self damage multiplier while having powerup"
-set g_keepaway_ballcarrier_selfforce   1.5     "self force multiplier while having powerup"
+set g_keepaway_ballcarrier_damage      1.5     "damage multiplier while holding the ball"
+set g_keepaway_ballcarrier_force       1.5     "force multiplier while holding the ball"
+set g_keepaway_ballcarrier_selfdamage  1       "self damage multiplier while holding the ball"
+set g_keepaway_ballcarrier_selfforce   1.5     "self force multiplier while holding the ball"
 set g_keepaway_noncarrier_warn 0       "warn players when they kill without holding the ball"
 set g_keepaway_noncarrier_damage       0.5     "damage done to other players if both you and they don't have the ball"
 set g_keepaway_noncarrier_force        0.5     "force done to other players if both you and they don't have the ball"
@@ -1360,6 +1361,7 @@ seta slowmo 1
 seta menu_skin "luminos"
 set menu_slowmo 1
 seta menu_sounds 0 "enables menu sound effects. 1 enables click sounds, 2 also enables hover sounds"
+set menu_picmip_bypass 0 "bypass texture quality enforcement based on system resources, not recommended and may cause crashes!"
 
 r_textbrightness 0.2
 r_textcontrast 0.8
@@ -1817,6 +1819,7 @@ alias cl_hook_gamestart_rc
 alias cl_hook_gamestart_nexball
 alias cl_hook_gamestart_cts
 alias cl_hook_gamestart_ka
+alias cl_hook_gamestart_freezetag
 alias cl_hook_gameend
 alias cl_hook_activeweapon
 
@@ -1838,6 +1841,7 @@ alias sv_hook_gamestart_rc
 alias sv_hook_gamestart_nexball
 alias sv_hook_gamestart_cts
 alias sv_hook_gamestart_ka
+alias sv_hook_gamestart_freezetag
 alias sv_hook_gamerestart
 alias sv_hook_gameend