Merge branch 'master' into Mario/monsters

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

diff --git a/defaultXonotic.cfg b/defaultXonotic.cfg
index 2af290f9abd445b5170f7af1c3ed86859b6d1a9a..16a2542f6ff27dbdc841cd64d099cee70624fb48 100644 (file)
--- a/defaultXonotic.cfg
+++ b/defaultXonotic.cfg
@@ -442,6 +442,14 @@ seta menu_sandbox_edit_material ""
 
 bind f7 menu_showsandboxtools
 
+seta menu_monsters_edit_spawn ""
+seta menu_monsters_edit_name ""
+seta menu_monsters_edit_skin 0
+seta menu_monsters_edit_color ""
+seta menu_monsters_edit_movetarget 1
+
+seta menu_td_edit_spawn ""
+
 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"
 
@@ -1564,6 +1572,8 @@ exec vehicles.cfg
 exec crosshairs.cfg
 exec gamemodes.cfg
 exec notifications.cfg
+exec monsters.cfg
+exec za.cfg
 
 // load console command aliases and settings
 exec commands.cfg