X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=xonotic-common.cfg;h=fbdf838ee76f2b0910c963b88fea561bccdd077e;hb=dba16d1e3e79360f1167ec2965a551e56c3bdcf2;hp=f44d9c96f969fa5853216a289a2d8c7e0bdeffb9;hpb=772fb683d951a622cc8520827096ec34fdea4763;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/xonotic-common.cfg b/xonotic-common.cfg
index f44d9c96f..fbdf838ee 100644
--- a/xonotic-common.cfg
+++ b/xonotic-common.cfg
@@ -48,7 +48,7 @@ fs_empty_files_in_pack_mark_deletions 1 // makes patches able to delete files
 set g_campaign 0
 set g_campaign_forceteam 0 "Forces the player to a given team in campaign mode, 1 = red, 2 = blue, 3 = yellow, 4 = pink"
 seta g_campaign_name "xonoticbeta"
-seta g_campaign_skill -1 // -2 easy -1 medium 0 hard
+seta g_campaign_skill 0 // -2 easy, 0 medium, 2 hard
 
 alias singleplayer_start "g_campaign_index 0; set scmenu_campaign_goto 0"
 alias singleplayer_continue "set scmenu_campaign_goto -1"
@@ -144,6 +144,15 @@ seta snd_channel9volume 1 "QuakeC controlled ambient sound volume"
 snd_identicalsoundrandomization_time -0.1
 snd_identicalsoundrandomization_tics    1
 
+set debug_deglobalization_logging 0 "bitfield: 1 logs usage of the old functions which use globals implicitly, 2 logs usage of the new wrappers; support for this can be disabled at compile time for better performance"
+set debug_deglobalization_clear 0 "make the new wrappers set globals to NaN after use, this helps find bugs but can result in crashes; support for this can be disabled at compile time for better performance"
+
+// 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"
+
 // load console command aliases and settings
 exec commands.cfg