X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=defaultXonotic.cfg;h=799781b1692a464201ec574edaa720e8065cda4b;hb=7a08734e7432c0803b3c98f0964cbb3529f3bd07;hp=761ccf075851fbd8b6b4c2c8155af825460c407c;hpb=044ba629958802da76ffe99706c7c056861dae53;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/defaultXonotic.cfg b/defaultXonotic.cfg
index 761ccf075..799781b16 100644
--- a/defaultXonotic.cfg
+++ b/defaultXonotic.cfg
@@ -475,6 +475,13 @@ seta g_keyhunt_point_leadlimit -1	"Keyhunt point lead limit overriding the mapin
 seta g_race_laps_limit -1	"Race laps limit overriding the mapinfo specified one (use 0 to play without limit, and -1 to use the mapinfo's limit)"
 seta g_nexball_goallimit -1 "Nexball goal limit overriding the mapinfo specified one (use 0 to play without limit, and -1 to use the mapinfo's limit)"
 seta g_nexball_goalleadlimit -1 "Nexball goal lead limit overriding the mapinfo specified one (use 0 to play without limit, and -1 to use the mapinfo's limit)"
+seta g_nexball_safepass_maxdist 5000    // Max distance to allow save fassping (0 to turn off safe passing)
+seta g_nexball_safepass_turnrate 0.1    // How fast the safe-pass ball can habge direction
+seta g_nexball_safepass_holdtime 0.75   // How long to remeber last teammate you pointed at
+seta g_nexball_viewmodel_scale 0.25     // How large the ball for the carrier
+seta g_nexball_viewmodel_offset "8 8 0" // Where the ball is located on carrier "forward right up"
+seta g_nexball_tackling 1               // Allow ball theft?
+
 
 seta g_ctf_ignore_frags 0	"1: regular frags give no points"
 
@@ -514,6 +521,9 @@ set g_rune_weapon_stay 0
 set g_tdm_respawn_delay 0
 set g_tdm_respawn_waves 0
 set g_tdm_weapon_stay 0
+set g_ka_respawn_delay 0
+set g_ka_respawn_waves 0
+set g_ka_weapon_stay 0
 set g_kh_respawn_delay 0
 set g_kh_respawn_waves 0
 set g_kh_weapon_stay 0
@@ -525,9 +535,9 @@ set g_ca_respawn_waves 0
 set g_ca_weapon_stay 0
 set g_ca_damage2score_multiplier 0.01
 set g_ca_round_timelimit 180
-set g_nexball_respawn_delay 0
-set g_nexball_respawn_waves 0
-set g_nexball_weapon_stay 0
+set g_nb_respawn_delay 0
+set g_nb_respawn_waves 0
+set g_nb_weapon_stay 0
 set g_as_respawn_delay 0
 set g_as_respawn_waves 0
 set g_as_weapon_stay 0
@@ -542,12 +552,9 @@ set g_cts_respawn_delay 0
 set g_cts_selfdamage 1 "0 = disable all selfdamage and falldamage in cts"
 set g_cts_finish_kill_delay 10 "prevent cheating by running back to the start line, and starting out with more speed than otherwise possible"
 set g_cts_weapon_stay 2
-set g_freezetag_respawn_waves 0
-set g_freezetag_respawn_delay 0
-set g_freezetag_weapon_stay 0
-set g_keepaway_respawn_delay 0
-set g_keepaway_respawn_waves 0
-set g_keepaway_weapon_stay 0
+set g_ft_respawn_waves 0
+set g_ft_respawn_delay 0
+set g_ft_weapon_stay 0
 
 // overtime
 seta timelimit_overtime 2 "duration in minutes of one added overtime, added to the timelimit"
@@ -1562,9 +1569,10 @@ set menu_updatecheck 1
 set bot_navigation_ignoreplayers 0 // FIXME remove this once the issue is solved
 set bot_sound_monopoly 0 "when enabled, only bots can make any noise"
 
-set sv_loddistance1 1024
-set sv_loddistance2 4096
-seta cl_playerdetailreduction 0	"the higher, the less detailed player models are displayed (LOD)"
+set cl_loddistance1 1024
+set cl_loddistance2 3072
+seta cl_playerdetailreduction 1	"the higher, the less detailed player models are displayed (LOD)"
+seta cl_modeldetailreduction 1	"the higher, the less detailed certain map models are displayed (LOD)"
 
 set g_mapinfo_settemp_acl "+*" "ACL for mapinfo setting cvars"
 
@@ -1688,6 +1696,7 @@ set _origin "0 0 0"
 // campaign internal, set when loading a campaign map1G
 set _campaign_index ""
 set _campaign_name ""
+set _campaign_testrun 0 "To verify the campaign file, set this to 1, then start the first campaign level from the menu. If you end up in the menu again, it's good, if you get a QC crash, it's bad."
 
 // debug
 set _independent_players 0 "DO NOT TOUCH"