Merge branch 'master' into fruitiex/fruitbalance

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

diff --git a/defaultXonotic.cfg b/defaultXonotic.cfg
index 1f909014e46690ba779902e115a94e3b978a824d..2e535c3955e0fce1447afe3d4cb7db238ebaf014 100644 (file)
--- a/defaultXonotic.cfg
+++ b/defaultXonotic.cfg
@@ -521,6 +521,7 @@ set g_player_brightness 0   "set to 2 for brighter players"
 seta g_balance_cloaked_alpha 0.25
 
 set g_playerclip_collisions 1 "0 = disable collision testing against playerclips, might be useful on some defrag maps"
+set g_botclip_collisions 1 "0 = disable collision testing against botclips, might be useful on some defrag maps"
 
 set welcome_message_time 8
 
@@ -1938,3 +1939,6 @@ sv_clmovement_inputtimeout 0.05
 
 // exact gloss looks better, e.g. on g-23
 r_shadow_glossexact 1
+
+// use fake light if map has no lightmaps
+r_fakelight 1