X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=_hud_descriptions.cfg;h=13804214383530983ba25662d8c85d58a4039120;hb=91f10a3e1b951c655c42d6eba15b038901b6414c;hp=09c35e37bb42f9bdb6b80efa9263467a99cb6934;hpb=e2671eb26f096af4023a0119bbc87a4801a5e66d;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/_hud_descriptions.cfg b/_hud_descriptions.cfg
index 09c35e37b..138042143 100644
--- a/_hud_descriptions.cfg
+++ b/_hud_descriptions.cfg
@@ -31,8 +31,6 @@ seta hud_configure_grid "" "snap to grid when moving/resizing panels"
 seta hud_configure_grid_xsize "" "snap to X * vid_conwidth"
 seta hud_configure_grid_ysize "" "snap to Y * vid_conheight"
 
-seta scr_centerpos "" "Y position of the centerprint"
-
 seta hud_panel_weapons "" "enable/disable this panel"
 seta hud_panel_weapons_pos "" "position of this panel"
 seta hud_panel_weapons_size "" "size of this panel"
@@ -220,8 +218,7 @@ seta hud_panel_infomessages_bg_border "" "if set to something else than \"\" = o
 seta hud_panel_infomessages_bg_padding "" "if set to something else than \"\" = override default padding of contents from border"
 seta hud_panel_infomessages_flip "" "1 = align the items to the right"
 
-<<<<<<< HEAD
-seta hud_panel_physics "" "enable/disable this panel, 1 = show if not observing, 2 = show always"
+seta hud_panel_physics "" "enable/disable this panel, 1 = show if not observing, 2 = show always, 3 = show only in race/cts if not observing"
 seta hud_panel_physics_pos "" "position of this base of the panel"
 seta hud_panel_physics_size "" "size of this panel"
 seta hud_panel_physics_bg "" "if set to something else than \"\" = override default background"
@@ -235,14 +232,18 @@ seta hud_panel_physics_flip "" "flip speed/acceleration positions"
 seta hud_panel_physics_progressbar "" "enable progressbar in panel (2 = only for speed; 3 = only for acceleration)"
 seta hud_panel_physics_acceleration_progressbar_mode "" "0 = progressbar increases from the center to the right if the acceleration is positive, to the left if it's negative; 1 = progressbar increases from the border in the same direction for both positive and negative accelerations"
 seta hud_panel_physics_text "" "show text in panel (2 = only for speed; 3 = only for acceleration)"
-=======
-seta hud_panel_shownames "" "enable/disable this panel, 1 = teammates only, 2 = everyone"
-seta hud_panel_shownames_pos "" "position of this base of the panel"
-seta hud_panel_shownames_size "" "size of this panel"
-seta hud_panel_shownames_bg "" "if set to something else than \"\" = override default background"
-seta hud_panel_shownames_bg_color "" "if set to something else than \"\" = override default panel background color"
-seta hud_panel_shownames_bg_color_team "" "override panel color with team color in team based games"
-seta hud_panel_shownames_bg_alpha "" "if set to something else than \"\" = override default panel background alpha"
-seta hud_panel_shownames_bg_border "" "if set to something else than \"\" = override default size of border around the background"
-seta hud_panel_shownames_bg_padding "" "if set to something else than \"\" = override default padding of contents from border"
->>>>>>> fruitiex/better_shownames
+
+seta hud_panel_centerprint "" "enable/disable this panel"
+seta hud_panel_centerprint_pos "" "position of this base of the panel"
+seta hud_panel_centerprint_size "" "size of this panel"
+seta hud_panel_centerprint_bg "" "if set to something else than \"\" = override default background"
+seta hud_panel_centerprint_bg_color "" "if set to something else than \"\" = override default panel background color"
+seta hud_panel_centerprint_bg_color_team "" "override panel color with team color in team based games"
+seta hud_panel_centerprint_bg_alpha "" "if set to something else than \"\" = override default panel background alpha"
+seta hud_panel_centerprint_bg_border "" "if set to something else than \"\" = override default size of border around the background"
+seta hud_panel_centerprint_bg_padding "" "if set to something else than \"\" = override default padding of contents from border"
+seta hud_panel_centerprint_align "" "text alignment: 0 left, 0.5 center, 1 right"
+seta hud_panel_centerprint_flip "" "invert messages order"
+seta hud_panel_centerprint_fontscale "" "scale the text font by this amount"
+seta hud_panel_centerprint_time "" "message duration (NOTE: certain messages have a fixed duration)"
+seta hud_panel_centerprint_fadetime "" "how long a message takes to fade out (this time is included in the message duration and can't be > 1)"