X-Git-Url: https://git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=xonotic-common.cfg;h=ff5787269e4be9a7093a312bf18ce849e550a1be;hp=651cd1503acdb5dd889885b454166e809ac2a878;hb=HEAD;hpb=942859a1be813eba450a0fb18ef6b1d0d2bbdccc

diff --git a/xonotic-common.cfg b/xonotic-common.cfg
index 651cd1503..97c88c21b 100644
--- a/xonotic-common.cfg
+++ b/xonotic-common.cfg
@@ -8,7 +8,7 @@
 // Xonotic version (formatted for machines)
 // used to determine if a client version is compatible
 // general policy: previous release has "best effort" support, older releases are unsupported,
-// but gameversion_min doesn't have to be bumped with every release
+// 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
@@ -18,8 +18,8 @@
 // e.g. Xonotic 1.5.1 RC1 will be 15101
 set g_xonoticversion git "Xonotic version (formatted for humans)"
 
-gameversion 805       // 0.8.5
-gameversion_min 802   // 0.8.2 is the previous release
+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:
@@ -110,9 +110,6 @@ set g_debug_defaultsounds 0 "always use default sounds"
 // define some engine cvars that we need even on dedicated server
 set r_showbboxes 0
 
-// support Q1BSP maps
-mod_q1bsp_polygoncollisions 1
-
 // match q3map2
 mod_obj_orientation 0
 
@@ -123,15 +120,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
 
@@ -163,7 +151,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_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"
+set g_mapinfo_q3compat 1 "If no .mapinfo file exists:: 0: generate .mapinfo using entities only. 1: read .arena and .defi files directly, don't generate .mapinfo. 2: generate .mapinfo using .arena and .defi files, and entities. 3: generate .mapinfo using .arena and .defi files only."
 
 // load console command aliases and settings
 exec commands.cfg