X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=xonotic-common.cfg;h=d8a1f1c20b2ba84ffb5ccbb9682a591d341ab0f0;hb=557edf4c31486c012d911fbd68f590f9663449c1;hp=78b27255c8bea8657368fd9b32808e141c2c9032;hpb=4da0b1d48eaa7e046fed22cba4709dea8dd5616e;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/xonotic-common.cfg b/xonotic-common.cfg
index 78b27255c..d8a1f1c20 100644
--- a/xonotic-common.cfg
+++ b/xonotic-common.cfg
@@ -7,7 +7,8 @@
 
 // Xonotic version (formatted for machines)
 // used to determine if a client version is compatible
-// this doesn't have to be bumped with every release
+// general policy: previous release has "best effort" support, older releases are unsupported,
+// but gameversion_min doesn't have to be bumped with every release (eg: a minor patch release)
 // bump when clients become incompatible or any other perfectly good reason
 // (e.g. game data incompatibility, engine version incompatibility, etc
 // note: this automatically filters the server browser, clients of the new
@@ -17,9 +18,9 @@
 // e.g. Xonotic 1.5.1 RC1 will be 15101
 set g_xonoticversion git "Xonotic version (formatted for humans)"
 
-gameversion 802 // 0.8.2
-gameversion_min 0 // git builds see all versions
-gameversion_max 65535 // git builds see all versions
+gameversion 806       // 0.8.6
+gameversion_min 805   // 0.8.5 is the previous release
+gameversion_max 65535 // future versions should nag players to update
 
 // compatibility guideline:
 //   version a.b.c   = a0b0c
@@ -31,6 +32,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
 
@@ -112,15 +123,6 @@ utf8_enable 1
 mod_q3shader_default_polygonoffset -14
 mod_q3shader_default_polygonfactor 0
 
-// random charge stuff :P
-set g_weapon_charge_colormod_hdrmultiplier 4 "how much to multiply the colors by in the colormod vector"
-set g_weapon_charge_colormod_red_half 0
-set g_weapon_charge_colormod_green_half 0.5
-set g_weapon_charge_colormod_blue_half 1
-set g_weapon_charge_colormod_red_full 1
-set g_weapon_charge_colormod_green_full -0.5
-set g_weapon_charge_colormod_blue_full -1
-
 // session locking
 locksession 1
 
@@ -152,8 +154,7 @@ set debug_deglobalization_clear 0 "make the new wrappers set globals to NaN afte
 // disabling until it's complete
 set prvm_garbagecollection_enable 0
 
-set g_mapinfo_arena_compat 1 "allow mapinfo data to be pulled directly from .arena and .defi files if they exist, rather than generating .mapinfo files for them"
-set g_mapinfo_arena_generate 0 "allow mapinfo data to be pulled from .arena and .defi files during generation"
+set g_mapinfo_q3compat 1 "0: generate .mapinfo if none exists, ignoring .arena and .defi files. 1: read .arena and .defi files, don't generate .mapinfo. 2: generate .mapinfo if none exists using data from .arena files instead of reading them, .defi files continue to be used directly"
 
 // load console command aliases and settings
 exec commands.cfg