Merge branch 'k9er/strafehud-changes' into 'master'

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

diff --git a/xonotic-common.cfg b/xonotic-common.cfg
index 651cd1503acdb5dd889885b454166e809ac2a878..41f8cdf9c805e0d5ab5a5c70c622b63d3763fe79 100644 (file)
--- 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:
@@ -42,6 +42,12 @@ set sv_master2 "dpm6.xonotic.xyz:27777"  // gazby, soylent_cow
 set sv_master3 "master3.xonotic.org:27950"
 set sv_master4 "master4.xonotic.org:42863"
 
+// load console command aliases and settings
+exec commands.cfg
+
+// this should be executed only once even on ruleset-votable servers, otherwise the tips would always start from 0
+if_dedicated exec help.cfg
+
 exec xonotic-client.cfg
 exec xonotic-server.cfg
 
@@ -76,9 +82,8 @@ seta g_maplist "" "the list of maps to be cycled among (is autogenerated if empt
 // we must change its default from 1.0 to 1 to be consistent with menuqc
 set slowmo 1
 
-// ticrate
-//sys_ticrate 0.0166667 // 60fps. This would be ideal, but kills home routers.
-sys_ticrate 0.0333333 // Use 30fps instead.
+// 3 ticrates are officially supported: 1/32 1/64 1/128
+sys_ticrate 0.015625
 
 // Audio track names (for old-style "cd loop NUMBER" usage)
 set _cdtrack_first "1"
@@ -110,9 +115,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 +125,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,16 +156,10 @@ 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
+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."
 
 // ... and now that everything is configured/aliased, we can do some things:
 
 // Change g_start_delay based upon if the server is local or not.
 if_client set g_start_delay 0  "delay before the game starts, so everyone can join; recommended to set this to like 15 on a public server"
 if_dedicated set g_start_delay 15      "delay before the game starts, so everyone can join; recommended to set this to like 15 on a public server"
-
-// this should be execed only once even on ruleset-votable servers, otherwise the tips would always start from 0
-if_dedicated exec help.cfg