X-Git-Url: https://git.xonotic.org/?a=blobdiff_plain;f=xonotic-common.cfg;h=651cd1503acdb5dd889885b454166e809ac2a878;hb=42900a55bd97d36a949d0c95146c5921dc1a12de;hp=cefee25749b502619ab63b6b500520c4b8f622c3;hpb=da464733d9832bd101ab2d323facbd84da24f4c4;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/xonotic-common.cfg b/xonotic-common.cfg
index cefee2574..651cd1503 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
 // 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 805       // 0.8.5
+gameversion_min 802   // 0.8.2 is the previous release
+gameversion_max 65535 // future versions should nag players to update
 
 // compatibility guideline:
 //   version a.b.c   = a0b0c
@@ -36,7 +37,10 @@ seta g_configversion 0	"Configuration file version (used to upgrade settings) 0:
 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_master4 "master3.xonotic.org:27950"
+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
@@ -159,6 +163,8 @@ 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_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