Merge branch 'master' into mirceakitsune/weapon_mine_layer

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

diff --git a/defaultXonotic.cfg b/defaultXonotic.cfg
index 6c1cf698e5fbb5f29fd40e3446b430c6dbdbae31..5b69cb0a90e271e16f11c6e15758ff7752bd8acb 100644 (file)
--- a/defaultXonotic.cfg
+++ b/defaultXonotic.cfg
@@ -209,7 +209,7 @@ seta cl_zoomspeed 3.5       "how fast it will zoom (0.5-16), negative values mean inst
 seta cl_zoomsensitivity 0      "how zoom changes sensitivity (0 = weakest, 1 = strongest)"
 freelook 1
 sensitivity 6
-v_gamma 1.125000
+v_gamma 1
 viewsize 100
 bgmvolume 1
 volume 0.5
@@ -1118,6 +1118,7 @@ set quit_and_redirect ""  "set to an IP to redirect all players at the end of the
 
 // singleplayer campaign
 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 "xonotic25"
 set g_campaign_skill 0
 set g_campaignxonotic20_index 0
@@ -1937,3 +1938,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