X-Git-Url: https://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=defaultXonotic.cfg;h=cc131c9f4faf6d6ce5d0393bc486e4eea3839931;hp=19fe9fef501474f09ddbd1450be10692d2196a65;hb=4e6d5b02ec3b69aa98c30e5e4d2a0816dd1c8f15;hpb=f66615b722a8527aecfa7a6f2a74bb55204fb16b

diff --git a/defaultXonotic.cfg b/defaultXonotic.cfg
index 19fe9fef50..cc131c9f4f 100644
--- a/defaultXonotic.cfg
+++ b/defaultXonotic.cfg
@@ -1327,14 +1327,36 @@ set _hud_configure 0 "1 = configure the HUD"
 seta hud_configure_checkcollisions 1 "check for collisions against other panels when in hud configure mode"
 seta hud_configure_bg_minalpha 0.25 "minimum panel background alpha when in hud configure mode"
 seta hud_configure_grid 1 "snap to grid when moving/resizing panels"
-seta hud_configure_grid_x 0.01 "snap to X * vid_conwidth"
-seta hud_configure_grid_y 0.01 "snap to Y * vid_conheight"
+seta hud_configure_grid_xsize 0.01 "snap to X * vid_conwidth"
+seta hud_configure_grid_ysize 0.01 "snap to Y * vid_conheight"
 seta hud_configure_grid_alpha 0.15 "alpha for visible grid when in configure mode"
 
 seta sbar_info_pos 0 "Y-axis distance from lower right corner for engine info prints"
 
 exec hud_wickedhud_default.cfg
 
+// user preference cvars (i.e. shouldn't be adjusted by a skin config) 
+seta hud_weaponicons_number 1 "1 = show number of weapon, 2 = show bound key of weapon"
+seta hud_weaponicons_complainbubble_time 1 "time that a new entry stays until it fades out"
+seta hud_weaponicons_complainbubble_fadetime 0.25 "fade out time"
+seta hud_weaponicons_accuracy_yellow 40 "percentage at which the accuracy color is yellow"
+
+seta hud_notify_time 10 "time that a new entry stays until it fades out"
+seta hud_notify_fadetime 3 "fade out time"
+
+seta hud_timer_increment 0 "show elapsed time instead of remaining time"
+
+seta hud_radar_scale 4096 "distance you can see on the team radar"
+seta hud_radar_rotation 0	"rotation mode: you set what points up. 0 = player, 1 = west, 2 = south, 3 = east, 4 = north"
+seta hud_radar_zoommode 0	"zoom mode: 0 = zoomed by default, 1 = zoomed when +zoom, 2 = always zoomed, 3 = always zoomed out"
+alias hud_radar_rotate "toggle hud_radar_rotation 0 1 2 3 4"
+
+seta hud_engineinfo_framecounter_time 1 "time between framerate display updates, smaller values yield less accuracy"
+seta hud_engineinfo_framecounter_decimals 0 "amount of decimals to show"
+seta hud_engineinfo_framecounter_exponentialmovingaverage 1 "use an averaging method for calculating fps instead of counting frametime like engine does"
+seta hud_engineinfo_framecounter_exponentialmovingaverage_new_weight 0.1 "weight of latest data point"
+seta hud_engineinfo_framecounter_exponentialmovingaverage_instantupdate_change_threshold 0.5 "threshold for fps change when to update instantly, to make big fps changes update faster"
+
 // scoreboard
 seta scoreboard_columns default
 seta scoreboard_border_thickness 1 "scoreboard border thickness"
@@ -1618,8 +1640,10 @@ set camera_look_attenuation 	8	"Attenuation of \"looking\" movements, only if ca
 set camera_forward_follows 	1	"0: Move the camera forwards without changing altitude. 1: Move towards what you are looking"
 
 // "Gentle mode": show no blood
-seta sv_gentle 0	"force gentle mode for everyone, also remove references to acts of killing from the messages"
-seta cl_gentle 0	"client side gentle mode (only replaces gibs); when set to 1, white smoke replaces gibs, when set to 2, colorful clouds replace gibs"
+seta sv_gentle 0		"force gentle mode for everyone, also remove references to acts of killing from the messages"
+seta cl_gentle 0		"client side gentle mode, master switch for removing both gibs and messages"
+seta cl_gentle_gibs 0		"client side gentle mode (only replaces gibs); when set to 1, white smoke replaces gibs, when set to 2, colorful clouds replace gibs"
+seta cl_gentle_messages 0	"client side gentle mode (only replaces frag messages/centerprints)"
 
 seta cl_racetimer_position 0.25 "Y-axis positioning of the race timer (from 0 to 1)"
 seta cl_showpressedkeys	0	"Show which movement keys someone is pressing: 1 for spectating, 2 for always"