X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=defaultXonotic.cfg;h=386817f2c981466c80468a26e5a3d53b4b642df5;hb=99e4fa0264127dfcf4675d5f645061b51af815e4;hp=4ea9639e5c3ccdbf81ca2f997586455bb455af4b;hpb=b337a217c74b0d55be5fa4202d04fd9c8968c7a7;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/defaultXonotic.cfg b/defaultXonotic.cfg
index 4ea9639e5..386817f2c 100644
--- a/defaultXonotic.cfg
+++ b/defaultXonotic.cfg
@@ -818,6 +818,7 @@ set g_chat_flood_lmax_tell 2	"private chat: maximum number of lines per chat mes
 set g_chat_flood_burst_tell 2	"private chat: allow bursts of so many chat lines"
 set g_chat_flood_notify_flooder 1	"when 0, the flooder still can see his own message"
 set g_chat_teamcolors 0	"colorize nicknames in team color for chat"
+set g_chat_tellprivacy 1 "when disabled, tell messages are also sent to the server console log... otherwise they're kept private between players."
 set g_nick_flood_timeout 120 "time after which nick flood protection resets (set to 0 to disable nick flood checking)"
 set g_nick_flood_penalty 0.5 "duration of the nick flood penalty"
 set g_nick_flood_penalty_yellow 3 "number of changes to allow before warning and movement blocking"
@@ -850,6 +851,7 @@ seta g_waypointsprite_crosshairfadedistance 150 "distance in virtual pixels from
 seta g_waypointsprite_distancefadealpha 1 "alpha multiplier near distance"
 seta g_waypointsprite_distancefadescale 0.7 "scale multiplier near the distance"
 seta g_waypointsprite_distancefadedistancemultiplier 0.5 "distance in map sizes from distance where to stop fading"
+seta g_waypointsprite_itemstime 2 "show waypoints to indicate that some important items (mega health, large armor) are about to respawn: 1 when spectating, 2 even playing in warmup stage"
 set g_waypointsprite_spam 0 "Debugging feature. Set to 10 and load courtfun in race mode to test."
 alias "g_waypointsprite_personal"	"impulse 30"
 alias "g_waypointsprite_personal_p"	"impulse 31"
@@ -940,6 +942,7 @@ con_chat 5
 con_chatpos -9
 con_chatsize 10
 con_chatwidth 0.6
+con_notify 0
 con_notifysize 10
 con_notifyalign 0
 
@@ -1552,6 +1555,7 @@ exec turrets.cfg
 exec vehicles.cfg
 exec crosshairs.cfg
 exec gamemodes.cfg
+exec notifications.cfg
 
 // load console command aliases and settings
 exec commands.cfg