Merge commit 'aa4c896acf8088d26fcbd5ff4e3f6e7a0acb0600' into terencehill/misc_bugfixes

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

diff --git a/defaultXonotic.cfg b/defaultXonotic.cfg
index 8d6b38e3845a22daa79813fedb362292e434796c..6b0a9be7d9233b766832a72252b3baaca8573dae 100644 (file)
--- a/defaultXonotic.cfg
+++ b/defaultXonotic.cfg
@@ -338,9 +338,9 @@ set g_respawn_ghosts_speed 5 "the speed with which respawn ghosts float and rota
 set g_respawn_ghosts_maxtime 6 "maximum amount of time a respawn ghost can last, minimum time is half this value. 0 disables and ghosts fade when the body would"
 
 // fragmessage: This allows extra information to be displayed with the frag centerprints. 
-set sv_fragmessage_information_ping 0 "Enable ping display information, 0 = Never display; 1 = Always display (If the player is a bot, it will say bot instead of the ping.)"
+set sv_fragmessage_information_ping 1 "Enable ping display information, 0 = Never display; 1 = Always display (If the player is a bot, it will say bot instead of the ping.)"
 set sv_fragmessage_information_handicap 1 "Enable handicap display information, 0 = Never display; 1 = Only when the player has handicap on; 2 = Always display (Displays Off if off)"
-set sv_fragmessage_information_stats 0 "Enable statistics (health/armor) display information, 0 = Never display; 1 = Always display (Only available for the person who was killed)"
+set sv_fragmessage_information_stats 1 "Enable statistics (health/armor) display information, 0 = Never display; 1 = Always display (Only available for the person who was killed)"
 set sv_fragmessage_information_typefrag 1 "Enable typefrag display information, 0 = Never display; 1 = Always display"
 
 // use default physics
@@ -845,11 +845,11 @@ set g_nexball_radar_showallplayers 1  "1: show every player and the ball on the
 // server game balance settings
 // powerup balance settings
 // weapon balance settings follow
-exec balance.cfg
+exec balanceXonotic.cfg
 
 set g_bloodloss 0   "amount of health below which blood loss occurs"
 
-set g_footsteps 0      "serverside footstep sounds"
+set g_footsteps 1      "serverside footstep sounds"
 
 set g_deathglow 1.25 "when enabled, players stop glowing after they die (the value specifies glow fading speed)"
 
@@ -1529,7 +1529,7 @@ prvm_leaktest_ignore_classnames "ctf_team dom_team tdm_team"
 
 sv_allowdownloads_inarchive 1 // for csprogs.dat
 
-set g_jump_grunt 0     "Do you make a grunting noise every time you jump? Is it the same grunting noise every time?"
+set g_jump_grunt 1     "Do you make a grunting noise every time you jump? Is it the same grunting noise every time?"
 
 alias allready "sv_cmd allready"
 
@@ -1898,3 +1898,16 @@ set sv_q3acompat_machineshotgunswap 0 "shorthand for swapping uzi and shotgun (f
 set g_movement_highspeed 1 "movement speed modification factor (only changes movement when above maxspeed)"
 
 set g_maxspeed 0 "player speed limit, faster players are killed (0 for unlimited speed)"
+
+scr_conalpha 1
+scr_conalpha2factor 0.3
+scr_conalpha3factor 1
+scr_conalphafactor 0.8
+scr_conbrightness 0.35
+scr_conforcewhiledisconnected 1
+scr_conscroll2_x 0.11
+scr_conscroll2_y 0.2
+scr_conscroll3_x 0
+scr_conscroll3_y 0
+scr_conscroll_x -0.1
+scr_conscroll_y -0.3