Merge branch 'fruitiex/newpanelhud' into fruitiex/fruitbalance

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

diff --git a/defaultXPM.cfg b/defaultXPM.cfg
index 13e157c558d49db52d503964aaeafbf4b18eb5d8..3141a2409ce510d4a63d3de22a394148ea003a72 100644 (file)
--- a/defaultXPM.cfg
+++ b/defaultXPM.cfg
@@ -25,9 +25,20 @@ set sv_fragmessage_information_handicap 2
 set sv_fragmessage_information_stats 1
 set sv_fragmessage_information_typefrag 1
 
-g_jump_grunt 1
-g_footsteps 1
-g_shootfromcenter 1
+set sv_defaultcharacter 1
+set sv_defaultplayermodel "models/player/nyx.iqm"
+set sv_defaultplayercolors 60 // force some visible color for now
+
+set g_jump_grunt 1
+set g_footsteps 1
+set g_shootfromcenter 1
+set g_fullbrightplayers 1 // until all models are visible with this set to 0
+set g_forced_respawn 1
+set g_mirrordamage 0
+set g_friendlyfire 1
+
+set timelimit_overtimes 1
+set timelimit_override 15 // for now, maybe not in future
 
 exec physicsXPM.cfg
-exec balanceXPM.cfg
+exec balanceFruit.cfg