Merge branch 'terencehill/ons_camera' into 'master'

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

diff --git a/defaultXPM.cfg b/defaultXPM.cfg
index 37aee96d07a9f96acdff42e9cccfae4441f29119..99d503541572919f9741d1e5715a77408548c39b 100644 (file)
--- a/defaultXPM.cfg
+++ b/defaultXPM.cfg
@@ -1,22 +1,25 @@
-exec defaultXonotic.cfg
-exec physicsXPM.cfg
-
-set g_start_weapon_laser 0
-set g_balance_weaponswitchdelay 0
+// ==================
+//  Xonotic Pro-Mode
+// ==================
 
-set g_shootfromcenter 1
+exec defaultXonotic.cfg
+exec balance-xpm.cfg
 
+// general gameplay
+set g_norecoil 1
+set g_shootfromeye 1 // hit where you point at with the crosshair (promoders don't care about ugliness)
+set g_balance_kill_antispam 0
 set g_forced_respawn 1
-
-set g_mirrordamage 0
-set g_friendlyfire 1
-
-set timelimit_overtimes 1
-
-set sv_fragmessage_information_stats 0
-
-// force a visible playermodel!
-set sv_defaultcharacter 1
-set sv_defaultplayermodel "models/player/nyx.iqm"
-set sv_defaultplayercolors 60
-set g_fullbrightplayers 1
+set teamplay_mode 2 // friendly fire and self damage
+set sv_vote_nospectators 1
+set g_chat_nospectators 2
+set g_warmup 1
+set g_balance_teams 0
+set g_spawnshieldtime 0
+set g_spawn_furthest 1
+set sv_autoscreenshot 1
+set sv_ready_restart 1
+set sv_ready_restart_after_countdown 1
+set g_monsters 0
+set g_turrets 0
+set g_vehicles 0