Merge branch 'master' into Mario/overkill

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

diff --git a/defaultXDF.cfg b/defaultXDF.cfg
index f5a5442e3b08b78da0772105bdb6cb78f2d1c4d2..e4ba26af8d209426c5ee02db544314d4f4065bc5 100644 (file)
--- a/defaultXDF.cfg
+++ b/defaultXDF.cfg
@@ -3,13 +3,13 @@
 // ================
 
 exec defaultXonotic.cfg
 // ================
 
 exec defaultXonotic.cfg

-exec balanceXDF.cfg
+exec balance-xdf.cfg

 exec physicsXDF.cfg
 
 // general gameplay
 set g_jump_grunt 1 // make enemies even easier to hear when they're jumping around
 set g_shootfromcenter 1 // hit where you point at with the crosshair (almost so, no shooteye because it's really ugly)
 exec physicsXDF.cfg
 
 // general gameplay
 set g_jump_grunt 1 // make enemies even easier to hear when they're jumping around
 set g_shootfromcenter 1 // hit where you point at with the crosshair (almost so, no shooteye because it's really ugly)

-set g_balance_kill_antispam 0 
+set g_balance_kill_antispam 0

 set g_forced_respawn 1
 set g_jump_grunt 1
 // g_playerclip_collisions 0 // do not check playerclips
 set g_forced_respawn 1
 set g_jump_grunt 1
 // g_playerclip_collisions 0 // do not check playerclips