Merge branch 'master' into fruitiex/newpanelhud_stable

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

diff --git a/defaultXonotic.cfg b/defaultXonotic.cfg
index 9a1f88155f31b0a3db1c85cce9a0965b70c0517f..3f01cc88134a24ad6c3410221b938c4d33ec9b04 100644 (file)
--- a/defaultXonotic.cfg
+++ b/defaultXonotic.cfg
@@ -240,23 +240,23 @@ cl_bobcycle 0 // how long the cycle of up/down view movement takes (only works i
 cl_bob 0.01 // how much view moves up/down when moving (does not move if cl_bobcycle is 0, but still enables cl_bobmodel), default is 0.02
 cl_bobmodel 1 // whether to have gun model move around on screen when moving (only works if cl_bob is not 0), default is 1
 cl_leanmodel 1 // enables weapon leaning effect when looking around
-cl_leanmodel_side_speed 1 "gun leaning sideways speed"
+cl_leanmodel_side_speed 0.7 "gun leaning sideways speed"
 cl_leanmodel_side_limit 35 "gun leaning sideways limit"
 cl_leanmodel_side_highpass1 30 "gun leaning sideways pre-highpass in 1/s"
 cl_leanmodel_side_highpass 3 "gun leaning sideways highpass in 1/s"
 cl_leanmodel_side_lowpass 20 "gun leaning sideways lowpass in 1/s"
-cl_leanmodel_up_speed 1 "gun leaning upward speed"
+cl_leanmodel_up_speed 0.65 "gun leaning upward speed"
 cl_leanmodel_up_limit 50 "gun leaning upward limit"
 cl_leanmodel_up_highpass1 5 "gun leaning upward pre-highpass in 1/s"
 cl_leanmodel_up_highpass 15 "gun leaning upward highpass in 1/s"
 cl_leanmodel_up_lowpass 20 "gun leaning upward lowpass in 1/s"
 cl_followmodel 1 // enables weapon pushing / pulling effect when walking
-cl_followmodel_side_speed 0.5 "gun following sideways speed"
+cl_followmodel_side_speed 0.25 "gun following sideways speed"
 cl_followmodel_side_limit 6 "gun following sideways limit"
 cl_followmodel_side_highpass1 30 "gun following sideways pre-highpass in 1/s"
 cl_followmodel_side_highpass 5 "gun following sideways highpass in 1/s"
 cl_followmodel_side_lowpass 10 "gun following sideways lowpass in 1/s"
-cl_followmodel_up_speed 1 "gun following upward speed"
+cl_followmodel_up_speed 0.5 "gun following upward speed"
 cl_followmodel_up_limit 5 "gun following upward limit"
 cl_followmodel_up_highpass1 60 "gun following upward pre-highpass in 1/s"
 cl_followmodel_up_highpass 2 "gun following upward highpass in 1/s"
@@ -1324,20 +1324,23 @@ set _hud_configure 0 "1 = configure the HUD"
 seta hud_skin old "skin folder where to look for images"
 seta hud_bg 0 "default background for the panels, file must exist in gfx/hud/[skin name]/, 0 = disable background by default"
 seta hud_bg_color "0 0.6 0.9" "default background color for the panels, accepts \"shirt\" and \"pants\""
+seta hud_bg_color_team 0 "default setting for overriding panel color with team color in team games, 0.5 = less saturated"
 seta hud_bg_alpha 0.8 "default alpha of the background"
 seta hud_bg_border 10 "default border size for the panels"
 seta hud_bg_padding 0 "default padding of contents from the border"
 seta hud_fg_alpha 1 "alpha of the foreground"
 seta hud_progressbar_alpha "0.5" "alpha of progressbars"
 
-seta hud_configure_checkcollisions 1 "check for collisions against other panels when in hud configure mode"
+seta hud_configure_checkcollisions 0 "check for collisions against other panels when in hud configure mode"
 seta hud_configure_bg_minalpha 0.5 "minimum panel background alpha when in hud configure mode"
-seta hud_configure_grid 0 "snap to grid when moving/resizing panels"
+seta hud_configure_grid 1 "snap to grid when moving/resizing panels"
 seta hud_configure_grid_x 10 "snap each X pixels"
 seta hud_configure_grid_y 10 "snap each Y pixels"
+seta hud_configure_grid_alpha 0.15 "alpha for visible grid when in configure mode"
 
 seta hud_dock "dock" "enable a fullscreen background for the hud, useful for creating artificial docks, \"\" = disable"
 seta hud_dock_color "0 0.6 0.9" "dock color, accepts \"shirt\" and \"pants\""
+seta hud_dock_color_team 0.7 "override dock color with team color in team games"
 seta hud_dock_alpha 0.8 "alpha of the dock"
 
 seta sbar_info_pos 50
@@ -1349,6 +1352,7 @@ seta hud_weaponicons_number 1 "show number of weapon"
 seta hud_weaponicons_accuracy_yellow 40 "percentage at which the accuracy color is yellow"
 seta hud_weaponicons_bg "" "if set to something else than \"\" = override default background"
 seta hud_weaponicons_bg_color "" "if set to something else than \"\" = override default panel background color"
+seta hud_weaponicons_bg_color_team "" "override panel color with team color in team based games"
 seta hud_weaponicons_bg_alpha "" "if set to something else than \"\" = override default panel background alpha"
 seta hud_weaponicons_bg_border "" "if set to something else than \"\" = override default size of border around the background"
 seta hud_weaponicons_bg_padding "" "if set to something else than \"\" = override default padding of contents from border"
@@ -1359,6 +1363,7 @@ seta hud_inventory_size "0.174227 0.092189" "size of this panel"
 seta hud_inventory_onlycurrent 0 "1 = show only current ammo type"
 seta hud_inventory_bg "" "if set to something else than \"\" = override default background"
 seta hud_inventory_bg_color "" "if set to something else than \"\" = override default panel background color"
+seta hud_inventory_bg_color_team "" "override panel color with team color in team based games"
 seta hud_inventory_bg_alpha "" "if set to something else than \"\" = override default panel background alpha"
 seta hud_inventory_bg_border "" "if set to something else than \"\" = override default size of border around the background"
 seta hud_inventory_bg_padding "" if set to something else than \"\" = override default padding of contents from border"
@@ -1370,6 +1375,7 @@ seta hud_powerups_flip 1 "flip strength/shield positions"
 seta hud_powerups_mirror 0 "mirror alignment of panel items"
 seta hud_powerups_bg "" "if set to something else than \"\" = override default background"
 seta hud_powerups_bg_color "" "if set to something else than \"\" = override default panel background color"
+seta hud_powerups_bg_color_team "" "override panel color with team color in team based games"
 seta hud_powerups_bg_alpha "" "if set to something else than \"\" = override default panel background alpha"
 seta hud_powerups_bg_border "" "if set to something else than \"\" = override default size of border around the background"
 seta hud_powerups_bg_padding "" "if set to something else than \"\" = override default padding of contents from border"
@@ -1383,6 +1389,7 @@ seta hud_healtharmor_flip 1 "flip health/armor positions"
 seta hud_healtharmor_mirror 0 "mirror alignment of panel items"
 seta hud_healtharmor_bg "" "if set to something else than \"\" = override default background"
 seta hud_healtharmor_bg_color "" "if set to something else than \"\" = override default panel background color"
+seta hud_healtharmor_bg_color_team "" "override panel color with team color in team based games"
 seta hud_healtharmor_bg_alpha "" "if set to something else than \"\" = override default panel background alpha"
 seta hud_healtharmor_bg_border "" "if set to something else than \"\" = override default size of border around the background"
 seta hud_healtharmor_bg_padding "" "if set to something else than \"\" = override default padding of contents from border"
@@ -1395,6 +1402,7 @@ seta hud_notify_pos "0.1 0" "position of this base of the panel"
 seta hud_notify_size "0.1 0.1" "size of this panel with all notifications on"
 seta hud_notify_bg "" "if set to something else than \"\" = override default background"
 seta hud_notify_bg_color "" "if set to something else than \"\" = override default panel background color"
+seta hud_notify_bg_color_team "" "override panel color with team color in team based games"
 seta hud_notify_bg_alpha "" "if set to something else than \"\" = override default panel background alpha"
 seta hud_notify_bg_border "" "if set to something else than \"\" = override default size of border around the background"
 seta hud_notify_bg_padding "" "if set to something else than \"\" = override default padding of contents from border"
@@ -1405,6 +1413,7 @@ seta hud_timer_size "0.212735 0.054427" "size of this panel"
 seta hud_timer_increment 0 "show elapsed time instead of remaining time"
 seta hud_timer_bg border "if set to something else than \"\" = override default background"
 seta hud_timer_bg_color "" "if set to something else than \"\" = override default panel background color"
+seta hud_timer_bg_color_team "" "override panel color with team color in team based games"
 seta hud_timer_bg_alpha "" "if set to something else than \"\" = override default panel background alpha"
 seta hud_timer_bg_border "" "if set to something else than \"\" = override default size of border around the background"
 seta hud_timer_bg_padding "" "if set to something else than \"\" = override default padding of contents from border"
@@ -1414,6 +1423,7 @@ seta hud_radar_pos "0 0" "position of this base of the panel"
 seta hud_radar_size "0.215687 0.266667" "size of this panel"
 seta hud_radar_bg "" "if set to something else than \"\" = override default background"
 seta hud_radar_bg_color "" "if set to something else than \"\" = override default panel background color"
+seta hud_radar_bg_color_team "" "override panel color with team color in team based games"
 seta hud_radar_bg_alpha "" "if set to something else than \"\" = override default panel background alpha"
 seta hud_radar_bg_border "" "if set to something else than \"\" = override default size of border around the background"
 seta hud_radar_bg_padding "" "if set to something else than \"\" = override default padding of contents from border"
@@ -1423,6 +1433,7 @@ seta hud_score_pos "-0.225469 -0.084404" "position of this base of the panel"
 seta hud_score_size "0.225469 0.075156" "size of this panel"
 seta hud_score_bg "" "if set to something else than \"\" = override default background"
 seta hud_score_bg_color "" "if set to something else than \"\" = override default panel background color"
+seta hud_score_bg_color_team "" "override panel color with team color in team based games"
 seta hud_score_bg_alpha "" "if set to something else than \"\" = override default panel background alpha"
 seta hud_score_bg_border "" "if set to something else than \"\" = override default size of border around the background"
 seta hud_score_bg_padding "" "if set to something else than \"\" = override default padding of contents from border"
@@ -1432,6 +1443,7 @@ seta hud_racetimer_pos "-0.614706 0" "position of this base of the panel"
 seta hud_racetimer_size "0.231373 0.077124" "size of this panel"
 seta hud_racetimer_bg "" "if set to something else than \"\" = override default background"
 seta hud_racetimer_bg_color "" "if set to something else than \"\" = override default panel background color"
+seta hud_racetimer_bg_color_team "" "override panel color with team color in team based games"
 seta hud_racetimer_bg_alpha "" "if set to something else than \"\" = override default panel background alpha"
 seta hud_racetimer_bg_border "" "if set to something else than \"\" = override default size of border around the background"
 seta hud_racetimer_bg_padding "" "if set to something else than \"\" = override default padding of contents from border"
@@ -1442,6 +1454,7 @@ seta hud_vote_size "0.320156 0.106719" "size of this panel"
 seta hud_vote_alreadyvoted_alpha 0.75 "alpha of the vote dialog after you have voted"
 seta hud_vote_bg "" "if set to something else than \"\" = override default background"
 seta hud_vote_bg_color "" "if set to something else than \"\" = override default panel background color"
+seta hud_vote_bg_color_team "" "override panel color with team color in team based games"
 seta hud_vote_bg_alpha "" "if set to something else than \"\" = override default panel background alpha"
 seta hud_vote_bg_border "" "if set to something else than \"\" = override default size of border around the background"
 seta hud_vote_bg_padding "" "if set to something else than \"\" = override default padding of contents from border"
@@ -1451,6 +1464,7 @@ seta hud_modicons_pos "-0.571569 -0.265625" "position of this base of the panel"
 seta hud_modicons_size "0.145098 0.114105" "size of this panel"
 seta hud_modicons_bg "" "if set to something else than \"\" = override default background"
 seta hud_modicons_bg_color "" "if set to something else than \"\" = override default panel background color"
+seta hud_modicons_bg_color_team "" "override panel color with team color in team based games"
 seta hud_modicons_bg_alpha "" "if set to something else than \"\" = override default panel background alpha"
 seta hud_modicons_bg_border "" "if set to something else than \"\" = override default size of border around the background"
 seta hud_modicons_bg_padding "" "if set to something else than \"\" = override default padding of contents from border"
@@ -1461,6 +1475,7 @@ seta hud_pressedkeys_pos "-0.571569 -0.265625" "position of this base of the pan
 seta hud_pressedkeys_size "0.145098 0.114105" "size of this panel"
 seta hud_pressedkeys_bg "" "if set to something else than \"\" = override default background"
 seta hud_pressedkeys_bg_color "" "if set to something else than \"\" = override default panel background color"
+seta hud_pressedkeys_bg_color_team "" "override panel color with team color in team based games"
 seta hud_pressedkeys_bg_alpha "" "if set to something else than \"\" = override default panel background alpha"
 seta hud_pressedkeys_bg_border "" "if set to something else than \"\" = override default size of border around the background"
 seta hud_pressedkeys_bg_padding "" "if set to something else than \"\" = override default padding of contents from border"