Merge remote branch 'origin/divVerent/newchannels'

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

diff --git a/defaultXonotic.cfg b/defaultXonotic.cfg
index 0853e4c345398ba9a13b5567a2b5027a0fe777b3..a536af133f8faa85618b1401edb72f84b032208c 100644 (file)
--- a/defaultXonotic.cfg
+++ b/defaultXonotic.cfg
@@ -1622,8 +1622,9 @@ seta v_kicktime $v_kicktime
 seta r_subdivisions_tolerance $r_subdivisions_tolerance
 
 // ticrate
-sys_ticrate 0.0166667
-cl_netfps 60 // should match
+//sys_ticrate 0.0166667
+sys_ticrate 0.0333333
+cl_netfps 60 // should match or be a multiple
 sv_gameplayfix_delayprojectiles 0
 sv_gameplayfix_q2airaccelerate 1
 sv_gameplayfix_stepmultipletimes 1
@@ -1965,6 +1966,7 @@ set speedmeter 0 "print landing speeds"
 set developer_shtest 0 "experimental speedhack detection"
 set waypoint_benchmark 0 "quit after waypoint loading to benchmark bot navigation code"
 set g_debug_bot_commands 0 "print scripted bot commands before executing"
+set g_debug_defaultsounds 0 "always use default sounds"
 
 // debug cvars for keyhunt attaching
 set _angles "0 0 0"
@@ -2065,7 +2067,7 @@ sv_cullentities_trace 1
 r_cullentities_trace 0
 
 // less "lagging" of other players, but also less PL tolerant... let's try this
-sv_clmovement_inputtimeout 0.05
+sv_clmovement_inputtimeout 0.07 // more than 2, less than 3 server frames
 
 // exact gloss looks better, e.g. on g-23
 r_shadow_glossexact 1
@@ -2134,6 +2136,10 @@ set g_playerstats_debug 0 "when 1, player stats are dumped to the console too"
 // create this cvar in case the engine did not
 set snd_soundradius 1200
 
+// declare the channels we use
+seta snd_channel8volume 1 "QuakeC controlled background music volume"
+seta snd_channel9volume 1 "QuakeC controlled ambient sound volume"
+
 // loading screen
 scr_loadingscreen_background 0
 scr_loadingscreen_barcolor "0 0.5 1"
@@ -2153,6 +2159,7 @@ exec ctfscoring-ai.cfg
 exec effects-normal.cfg
 exec physicsX.cfg
 exec turrets.cfg
+exec vehicles.cfg
 
 // hud cvar descriptions
 exec _hud_descriptions.cfg