Merge branch 'Spike29/credits_update' into 'master'

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

diff --git a/xonotic-common.cfg b/xonotic-common.cfg
index 88958889af0a9b52f1624b59eb14359db12f69f7..05670d56ca19a54a18a3ad38e46664a1b9ca1d45 100644 (file)
--- a/xonotic-common.cfg
+++ b/xonotic-common.cfg
@@ -31,6 +31,16 @@ gameversion_max 65535 // git builds see all versions
 
 seta g_configversion 0 "Configuration file version (used to upgrade settings) 0: first run, or previous start was <2.4.1  Later, it's overridden by config.cfg, version ranges are defined in config_update.cfg"
 
+// Set the master servers to do DNS lookups we control.
+// This allows us to update the master server IPs without a release.
+set sv_masterextra1 "master1.xonotic.org:42863"
+set sv_masterextra2 "master2.xonotic.org:27950"
+set sv_masterextra3 ""  // Got removed from DP, so we can't use this one for master3.
+set sv_master1 "dpm4.xonotic.xyz:27777"  // gazby, soylent_cow
+set sv_master2 "dpm6.xonotic.xyz:27777"  // gazby, soylent_cow
+set sv_master3 "master3.xonotic.org:27950"
+set sv_master4 "master4.xonotic.org:42863"
+
 exec xonotic-client.cfg
 exec xonotic-server.cfg
 
@@ -128,7 +138,9 @@ locksession 1
 set snd_soundradius 1200
 set snd_softclip 1
 set snd_maxchannelvolume 0
-set snd_streaming_length 2
+// Only streaming-decode music, not any sound effects. RAM is cheap nowadays.
+// Sadly, our longest sound effect is 36 seconds.
+set snd_streaming_length 40
 seta menu_snd_sliderscale 2 "0: decibels; 1: linear percent; 2: 0..10 scale; 3: slider size percent"
 seta menu_snd_attenuation_method 1 "Use exponential instead of linear falloff for sound attenuation"
 alias snd_attenuation_method_0 "set menu_snd_attenuation_method 0; set snd_soundradius 1200; set snd_attenuation_exponent 1; set snd_attenuation_decibel 0" // Quake default