From: terencehill Date: Thu, 25 Jul 2024 21:41:39 +0000 (+0200) Subject: Merge branch 'master' into terencehill/cfg_fixes X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=0b1c59e2e6e133fc87e2363511b379d7ca6c740e;p=xonotic%2Fxonotic-data.pk3dir.git Merge branch 'master' into terencehill/cfg_fixes --- 0b1c59e2e6e133fc87e2363511b379d7ca6c740e diff --cc xonotic-common.cfg index 6626eb826,97c88c21b..899b217cd --- a/xonotic-common.cfg +++ b/xonotic-common.cfg @@@ -160,8 -151,11 +157,8 @@@ set debug_deglobalization_clear 0 "mak // 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 - // ... 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.