Merge branch 'marin-t/nadectr' into 'master'

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

diff --git a/defaultXonotic.cfg b/defaultXonotic.cfg
index 336505d12b6174758537c6a5520af50a97837244..b3b23fec76e6619a0bc286bac4d68723f33dac37 100644 (file)
--- a/defaultXonotic.cfg
+++ b/defaultXonotic.cfg
@@ -24,10 +24,6 @@ gameversion_max 65535 // git builds see all versions
 
 seta g_configversion 0 "Configuration file version (used to upgrade settings) 0: first run, or previous start was <2.4.1  Later, it's overridden by config.cfg, version ranges are defined in config_update.cfg"
 
-// FIXME i think this is client cvar
-// merge lightmaps up to 2048x2048 textures
-mod_q3bsp_lightmapmergepower 4
-
 exec defaultClient.cfg
 exec defaultServer.cfg
 
@@ -37,7 +33,6 @@ locs_enable 0
 pausable 0
 set samelevel 0 "when 1, always play the same level over and over again"
 
-// misc
 fs_empty_files_in_pack_mark_deletions 1 // makes patches able to delete files
 
 // singleplayer campaign
@@ -50,6 +45,11 @@ alias singleplayer_start "g_campaign_index 0; set scmenu_campaign_goto 0"
 alias singleplayer_continue "set scmenu_campaign_goto -1"
 alias singleplayer_levellist "set scmenu_campaign_dump 1; togglemenu; wait; togglemenu"
 
+// campaign internal, set when loading a campaign map1G
+set _campaign_index ""
+set _campaign_name ""
+set _campaign_testrun 0 "To verify the campaign file, set this to 1, then start the first campaign level from the menu. If you end up in the menu again, it's good, if you get a QC crash, it's bad."
+
 // we must change its default from 1.0 to 1 to be consistent with menuqc
 set slowmo 1
 
@@ -57,7 +57,6 @@ set slowmo 1
 //sys_ticrate 0.0166667 // 60fps. This would be ideal, but kills home routers.
 sys_ticrate 0.0333333 // Use 30fps instead.
 
-// FIXME this is client i think?
 // Audio track names (for old-style "cd loop NUMBER" usage)
 set _cdtrack_first "1"
 alias _cdtrack_0 "g_cdtracks_remaplist \"$g_cdtracks_remaplist $1\""
@@ -83,21 +82,8 @@ prvm_backtraceforwarnings 1
 
 set _urllib_nextslot 0 "temp variable"
 
-// FIXME some of these are used in qcsrc/common though most of them are probably server only
-set spawn_debug 0 "use all spawns one by one, then abort, to verify all spawnpoints"
-set loddebug 0 "force this LOD level"
-set g_mutatormsg "" "mutator message"
-set speedmeter 0 "print landing speeds"
-set developer_csqcentities 0 "csqc entity spam"
-set waypoint_benchmark 0 "quit after waypoint loading to benchmark bot navigation code"
-set g_debug_bot_commands 0 "print scripted bot commands before executing"
 set g_debug_defaultsounds 0 "always use default sounds"
 
-// campaign internal, set when loading a campaign map1G
-set _campaign_index ""
-set _campaign_name ""
-set _campaign_testrun 0 "To verify the campaign file, set this to 1, then start the first campaign level from the menu. If you end up in the menu again, it's good, if you get a QC crash, it's bad."
-
 // define some engine cvars that we need even on dedicated server
 set r_showbboxes 0