Merge remote-tracking branch 'origin/master' into samual/notification_rewrite

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

diff --git a/defaultXonotic.cfg b/defaultXonotic.cfg
index 40e583920edc0d5356635e26dd7ccf8019f24a91..c2697006a58e3a3996268b2d48f0be04c4361cb2 100644 (file)
--- a/defaultXonotic.cfg
+++ b/defaultXonotic.cfg
@@ -583,6 +583,7 @@ seta cl_announcer_maptime 3 "play announcer sound telling you the remaining mapt
 
 // startmap_dm is used when running with the -listen or -dedicated commandline options
 set serverconfig server.cfg
+alias loadconfig "cvar_resettodefaults_saveonly; exec ${* !}"
 set _sv_init 0
 alias startmap_dm "set _sv_init 0; map _init/_init; exec $serverconfig; set _sv_init 1"
 
@@ -1550,6 +1551,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