From: terencehill Date: Thu, 10 Nov 2011 00:57:15 +0000 (+0100) Subject: Merge branch 'master' into terencehill/physics_panel_updates X-Git-Tag: xonotic-v0.6.0~42^2~8^2~3 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=4666d229e9b631885c542e1e9f04cf78ec8b38f2;p=xonotic%2Fxonotic-data.pk3dir.git Merge branch 'master' into terencehill/physics_panel_updates Conflicts: defaultXonotic.cfg qcsrc/client/autocvars.qh --- 4666d229e9b631885c542e1e9f04cf78ec8b38f2 diff --cc _hud_descriptions.cfg index 138042143,061720a84..719ccb09c --- a/_hud_descriptions.cfg +++ b/_hud_descriptions.cfg @@@ -230,8 -254,16 +254,19 @@@ seta hud_panel_physics_bg_padding "" "i seta hud_panel_physics_baralign "" "0 = align bars to the left, 1 = align bars to the right, 2 = align only left bar to the right, 3 = align only right bar to the right, 4 = align bars to the center" 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_max "" "acceleration progressbar gets completely filled up by this value (in g)" -seta hud_panel_physics_acceleration_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_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_acceleration_progressbar_scale "" "multiply acceleration progressbar values by this factor (allow progressbar to go out of panel bounds)" ++seta hud_panel_physics_acceleration_progressbar_nonlinear "" "use a non linear function to display acceleration progressbar values (amplify more smaller values)" + seta hud_panel_physics_acceleration_vertical "" "include the acceleration on the Z-axis" seta hud_panel_physics_text "" "show text in panel (2 = only for speed; 3 = only for acceleration)" ++seta hud_panel_physics_text_scale "" "scale text height by this factor" + seta hud_panel_physics_speed_unit "" "speed unit (1 = qu/s, 2 = m/s, 3 = km/h, 4 = mph, 5 = knots)" + seta hud_panel_physics_speed_unit_show "" "also show speed unit" + seta hud_panel_physics_speed_max "" "speed progressbar gets filled up completely by this value (in qu/s)" + seta hud_panel_physics_speed_vertical "" "include the speed on the Z-axis" + seta hud_panel_physics_topspeed "" "also show top speed" + seta hud_panel_physics_topspeed_time "" "how many seconds the top speed takes to fade out" seta hud_panel_centerprint "" "enable/disable this panel" seta hud_panel_centerprint_pos "" "position of this base of the panel" diff --cc defaultXonotic.cfg index 083c5d0ce,69b97a9c8..fe131c24b --- a/defaultXonotic.cfg +++ b/defaultXonotic.cfg @@@ -1428,124 -1432,8 +1432,120 @@@ con_chatwidth 0. con_notifysize 10 con_notifyalign 0 - // hud variables - set _hud_configure 0 "1 = configure the HUD" - seta hud_configure_teamcolorforced 0 "1 = force display of team colors in configure mode" - 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_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" ++<<<<<<< HEAD +// user preference cvars (i.e. shouldn't be adjusted by a skin config) +seta hud_panel_weapons_label 1 "1 = show number of weapon, 2 = show bound key of weapon" +seta hud_panel_weapons_complainbubble_time 1 "time that a new entry stays until it fades out" +seta hud_panel_weapons_complainbubble_fadetime 0.25 "fade out time" +seta hud_panel_weapons_accuracy 1 "show accuracy color as the weapon icon background; colors can be configured with accuracy_color* cvars" +seta hud_panel_weapons_ammo 1 "show ammo as a status bar" +seta hud_panel_weapons_ammo_full_shells 50 "show 100% of the status bar at this ammo count" +seta hud_panel_weapons_ammo_full_nails 200 "show 100% of the status bar at this ammo count" +seta hud_panel_weapons_ammo_full_cells 80 "show 100% of the status bar at this ammo count" +seta hud_panel_weapons_ammo_full_rockets 80 "show 100% of the status bar at this ammo count" +seta hud_panel_weapons_ammo_full_fuel 100 "show 100% of the status bar at this ammo count" +seta hud_panel_weapons_onlyowned 1 "show only owned weapons" + +seta hud_panel_ammo_maxammo "40" "when you have this much ammo, the ammo status bar is full" + +seta hud_panel_healtharmor_maxhealth "200" "when you have this much health, the health status bar is full" +seta hud_panel_healtharmor_maxarmor "200" "when you have this much armor, the armor status bar is full" +seta hud_panel_healtharmor_progressbar_gfx 1 "enable graphic effects on the progressbars" +seta hud_panel_healtharmor_progressbar_gfx_damage 5 "show damage effect when damaged at least by this amount; 0 disables the effect" +seta hud_panel_healtharmor_progressbar_gfx_lowhealth 40 "health progressbar blinks when health is lower than this amount" +seta hud_panel_healtharmor_progressbar_gfx_smooth 2 "smooth changes of the progressbar when health/armor change at least by this amount; 0 disables the effect" + +seta hud_panel_notify_time 10 "time that a new entry stays until it fades out" +seta hud_panel_notify_fadetime 3 "fade out time" + +seta hud_panel_modicons_dom_layout 1 "3 possible layouts: 0) only icons; 1) icons and percentage of average pps (points per second); 2) icons and average pps" + +seta hud_panel_timer_increment 0 "show elapsed time instead of remaining time" + +seta hud_panel_radar_scale 4096 "distance you can see on the team radar" +seta hud_panel_radar_rotation 0 "rotation mode: you set what points up. 0 = player, 1 = west, 2 = south, 3 = east, 4 = north" +seta hud_panel_radar_zoommode 0 "zoom mode: 0 = zoomed by default, 1 = zoomed when +zoom, 2 = always zoomed, 3 = always zoomed out" +alias hud_panel_radar_rotate "toggle hud_panel_radar_rotation 0 1 2 3 4" + +seta hud_panel_score_rankings 0 "show rankings: 1 always show my own score; 2 pure rankings" + +seta hud_panel_engineinfo_framecounter_time 0.1 "time between framerate display updates" +seta hud_panel_engineinfo_framecounter_decimals 0 "amount of decimals to show" +seta hud_panel_engineinfo_framecounter_exponentialmovingaverage 1 "use an averaging method for calculating fps instead of counting frametime like engine does" +seta hud_panel_engineinfo_framecounter_exponentialmovingaverage_new_weight 0.1 "weight of latest data point" +seta hud_panel_engineinfo_framecounter_exponentialmovingaverage_instantupdate_change_threshold 0.5 "threshold for fps change when to update instantly, to make big fps changes update faster" + +seta hud_panel_physics_speed_unit 3 "speed unit (1 = qu/s, 2 = m/s, 3 = km/h, 4 = mph, 5 = knots)" +seta hud_panel_physics_speed_unit_show 1 "also show speed unit" +seta hud_panel_physics_speed_max 1800 "speed progressbar gets filled up completely by this value (in qu/s)" +seta hud_panel_physics_speed_vertical 0 "include the speed on the Z-axis" +seta hud_panel_physics_topspeed 1 "also show top speed" +seta hud_panel_physics_topspeed_time 4 "how many seconds the top speed takes to fade out" +seta hud_panel_physics_acceleration_max 1.5 "acceleration progressbar gets completely filled up by this value (in g)" +seta hud_panel_physics_acceleration_vertical 0 "include the acceleration on the Z-axis" +seta hud_panel_physics_acceleration_progressbar_scale 1 "multiply acceleration progressbar values by this factor (allow progressbar to go out of panel bounds)"; +seta hud_panel_physics_acceleration_progressbar_nonlinear 1 "use a non linear function to display acceleration progressbar values (amplify more smaller values)"; +seta hud_panel_physics_text_scale 0.7 "scale text height by this factor"; + +seta hud_showbinds 1 "what to show in the HUD to indicate certain keys to press: 0 display commands, 1 bound keys, 2 both" +seta hud_showbinds_limit 2 "maximum number of bound keys to show for a command. 0 for unlimited" + +seta hud_colorflash_alpha 0.5 "starting alpha of the color flash" + +seta hud_damage 0.55 "an improved version of gl_polyblend for damage, draw an image instead when hurt" +seta hud_damage_blur 10 "Use postprocessing to blur the screen when you have taken damage. This can be paired with current hud damage or just used alone. Higher values = more blur" +seta hud_damage_blur_alpha 0.5 "Amount of alpha to use when merging the blurred layers back into the render. Turning this up higher will remove bloom, so it's best to find a balance" +seta hud_damage_gentle_alpha_multiplier 0.10 "how much to multiply alpha of flash when using the cl_gentle version, it's much more opaque than the non-gentle version" +seta hud_damage_gentle_color "1 0.7 1" "color of flash for cl_gentle version" +seta hud_damage_color "1 0 0" "color of flash" +seta hud_damage_factor 0.025 "(damage * factor) = how much to add to the alpha value" +seta hud_damage_fade_rate 0.75 "how much to subtract from the alpha value each second" +seta hud_damage_maxalpha 1.5 "how much to limit the alpha value to" +seta hud_damage_pain_threshold 0.1 "how much alpha to ignore (must be bigger than the hud_damage_factor so that e.g. rot is ignored)" +seta hud_damage_pain_threshold_lower 1.25 "how much we lower pain_threshold with when nearing 0 health (if pain_threshold gets negative then we always draw a flash at alpha = fabs(pain_threshold)" +seta hud_damage_pain_threshold_lower_health 50 "at which health we start lowering pain_threshold" +seta hud_damage_pain_threshold_pulsating_min 0.6 "minimum value when calculating the pulse: max(pulsating_min, fabs(sin(PI * time / period))" +seta hud_damage_pain_threshold_pulsating_period 0.8 "one pulse every X seconds" + +seta hud_powerup 0 "power of the sharpen effect when owning the shield or strength powerups, default is 0.5" + +seta hud_postprocessing 1 "enables the ability for effects such as hud_damage_blur and hud_contents to apply a postprocessing method upon the screen - enabling this disables manual editing of the postprocess cvars" +seta hud_postprocessing_maxbluralpha 0 "maximum alpha which the blur postprocess can be, default is 0.5" +seta hud_postprocessing_maxblurradius 8 "maximum radius which the blur postprocess can be, default is 8" + +seta hud_contents 1 "an improved version of gl_polyblend for liquids such as water/lava/slime, draw a filler when inside the liquid" +seta hud_contents_blur 10 "Use postprocessing to blur the screen when you are inside a liquid. Higher values = more blur" +seta hud_contents_blur_alpha 0.5 "Amount of alpha to use when merging the blurred layers back into the render. Turning this up higher will remove bloom, so it's best to find a balance" +seta hud_contents_factor 1 "factor at which to multiply the current faded value." +seta hud_contents_fadeintime 0.02 "factor of time it takes for the alpha level to reach normal value when entering the liquid" +seta hud_contents_fadeouttime 0.1 "factor of time it takes for the alpha level to reach normal value when leaving the liquid" +seta hud_contents_lava_alpha 0.7 "alpha of the lava color blend when inside it" +seta hud_contents_lava_color "0.8 0.1 0" +seta hud_contents_slime_alpha 0.7 "alpha of the slime color blend when inside it" +seta hud_contents_slime_color "0 0.4 0.1" +seta hud_contents_water_alpha 0.5 "alpha of the water color blend when inside it" +seta hud_contents_water_color "0.4 0.3 0.3" + +seta hud_shownames 1 "draw names and health/armor of nearby players" +seta hud_shownames_enemies 2 "1 = draw names of enemies you point at (TODO), 2 = draw names of all enemies in view" +seta hud_shownames_self 0 "also include your own name to be shown when third person camera mode is on (chase_active/cl_eventchase)" +seta hud_shownames_status 1 "1 = draw health/armor status of teammates" +seta hud_shownames_statusbar_height 4 "height of status bar" +seta hud_shownames_aspect 8 "aspect ratio of total drawing area per name" +seta hud_shownames_fontsize 12 "font size" +seta hud_shownames_decolorize 1 "1 = decolorize name in team games, 2 = decolorize always" +seta hud_shownames_alpha 0.7 "alpha" +seta hud_shownames_resize 1 "enable resizing of the names, then the size cvars will correspond to the maximum size" +seta hud_shownames_mindistance 1000 "start fading alpha/size at this distance" +seta hud_shownames_maxdistance 2500 "alpha/size is 0 at this distance" +seta hud_shownames_antioverlap 1 "if two tags get too close to each other, fade out the one further away from you" +seta hud_shownames_antioverlap_distance 125 "2d distance to other tag after which to fade out" +seta hud_shownames_offset 52 "offset (along z-axis) tag from player origin by this many units" + ++======= ++>>>>>>> master // scoreboard seta scoreboard_columns default seta scoreboard_border_thickness 1 "scoreboard border thickness" diff --cc hud_luminos.cfg index 0e4e4495b,f32279f2b..cc889c506 --- a/hud_luminos.cfg +++ b/hud_luminos.cfg @@@ -225,15 -245,23 +245,26 @@@ seta hud_panel_physics_bg_color_team " seta hud_panel_physics_bg_alpha "" seta hud_panel_physics_bg_border "" seta hud_panel_physics_bg_padding "" + seta hud_panel_physics_speed_unit "3" + seta hud_panel_physics_speed_unit_show "1" + seta hud_panel_physics_speed_max "1800" + seta hud_panel_physics_speed_vertical "0" + seta hud_panel_physics_topspeed "1" + seta hud_panel_physics_topspeed_time "4" + seta hud_panel_physics_acceleration_max "1.5" + seta hud_panel_physics_acceleration_vertical "0" seta hud_panel_physics_flip "0" seta hud_panel_physics_baralign "0" - seta hud_panel_physics_acceleration_progressbar_mode "0" seta hud_panel_physics_progressbar "1" -seta hud_panel_physics_acceleration_mode "0" ++seta hud_panel_physics_acceleration_progressbar_mode "0" ++seta hud_panel_physics_acceleration_progressbar_scale "1" ++seta hud_panel_physics_acceleration_progressbar_nonlinear "0" seta hud_panel_physics_text "1" ++seta hud_panel_physics_text_scale "0.7" seta hud_panel_centerprint 1 - seta hud_panel_centerprint_pos "0.175000 0.260000" - seta hud_panel_centerprint_size "0.650000 0.210000" + seta hud_panel_centerprint_pos "0.175000 0.220000" + seta hud_panel_centerprint_size "0.650000 0.220000" seta hud_panel_centerprint_bg "0" seta hud_panel_centerprint_bg_color "" seta hud_panel_centerprint_bg_color_team "" diff --cc hud_luminos_minimal.cfg index 9d255bb4a,52a7d96c1..715d38498 --- a/hud_luminos_minimal.cfg +++ b/hud_luminos_minimal.cfg @@@ -225,15 -245,23 +245,26 @@@ seta hud_panel_physics_bg_color_team " seta hud_panel_physics_bg_alpha "" seta hud_panel_physics_bg_border "" seta hud_panel_physics_bg_padding "" + seta hud_panel_physics_speed_unit "3" + seta hud_panel_physics_speed_unit_show "1" + seta hud_panel_physics_speed_max "1800" + seta hud_panel_physics_speed_vertical "0" + seta hud_panel_physics_topspeed "1" + seta hud_panel_physics_topspeed_time "4" + seta hud_panel_physics_acceleration_max "1.5" + seta hud_panel_physics_acceleration_vertical "0" seta hud_panel_physics_flip "0" seta hud_panel_physics_baralign "0" - seta hud_panel_physics_acceleration_progressbar_mode "0" seta hud_panel_physics_progressbar "3" - seta hud_panel_physics_text "2" -seta hud_panel_physics_acceleration_mode "0" ++seta hud_panel_physics_acceleration_progressbar_mode "0" ++seta hud_panel_physics_acceleration_progressbar_scale "1" ++seta hud_panel_physics_acceleration_progressbar_nonlinear "0" + seta hud_panel_physics_text "1" ++seta hud_panel_physics_text_scale "0.7" seta hud_panel_centerprint 1 - seta hud_panel_centerprint_pos "0.175000 0.260000" - seta hud_panel_centerprint_size "0.650000 0.210000" + seta hud_panel_centerprint_pos "0.175000 0.220000" + seta hud_panel_centerprint_size "0.650000 0.220000" seta hud_panel_centerprint_bg "0" seta hud_panel_centerprint_bg_color "" seta hud_panel_centerprint_bg_color_team "" diff --cc hud_luminos_minimal_xhair.cfg index 000000000,2d5e07600..7e44f8cd0 mode 000000,100644..100644 --- a/hud_luminos_minimal_xhair.cfg +++ b/hud_luminos_minimal_xhair.cfg @@@ -1,0 -1,285 +1,288 @@@ + seta hud_skin "luminos_xhair" + seta hud_panel_bg "0" + seta hud_panel_bg_color "1 0.4375 0" + seta hud_panel_bg_color_team "0" + seta hud_panel_bg_alpha "1" + seta hud_panel_bg_border "8" + seta hud_panel_bg_padding "2" + seta hud_panel_fg_alpha "1" + + seta hud_dock "0" + seta hud_dock_color "0 0.449576 0.860796" + seta hud_dock_color_team "0.700000" + seta hud_dock_alpha "1" + + seta hud_progressbar_alpha "0.3" + seta hud_progressbar_strength_color "0 0 0.6" + seta hud_progressbar_shield_color "0.6 0 0.6" + seta hud_progressbar_health_color "0.6 0 0" + seta hud_progressbar_armor_color "0 0.6 0" + seta hud_progressbar_fuel_color "0.6 0.6 0" + seta hud_progressbar_nexball_color "0.7 0.1 0" + seta hud_progressbar_speed_color "1 0.75 0" + seta hud_progressbar_acceleration_color "0.5 0.75 1" + seta hud_progressbar_acceleration_neg_color "0.125 0.25 0.5" + + seta _hud_panelorder "15 3 1 2 11 10 0 14 6 9 13 4 12 7 5 8 16 " + + seta hud_configure_grid "1" + seta hud_configure_grid_xsize "0.010000" + seta hud_configure_grid_ysize "0.010000" + + seta hud_panel_weapons 1 + seta hud_panel_weapons_pos "0.350000 0.940000" + seta hud_panel_weapons_size "0.300000 0.060000" + seta hud_panel_weapons_bg "" + seta hud_panel_weapons_bg_color "" + seta hud_panel_weapons_bg_color_team "" + seta hud_panel_weapons_bg_alpha "" + seta hud_panel_weapons_bg_border "" + seta hud_panel_weapons_bg_padding "" + seta hud_panel_weapons_accuracy "1" + seta hud_panel_weapons_label "1" + seta hud_panel_weapons_complainbubble "1" + seta hud_panel_weapons_complainbubble_padding "-10" + seta hud_panel_weapons_complainbubble_time "1" + seta hud_panel_weapons_complainbubble_fadetime "0.25" + seta hud_panel_weapons_complainbubble_color_outofammo "0.8 0 0" + seta hud_panel_weapons_complainbubble_color_donthave "0.8 0.5 0" + seta hud_panel_weapons_complainbubble_color_unavailable "0 0.3 0.8" + seta hud_panel_weapons_ammo "1" + seta hud_panel_weapons_ammo_color "0 1 0" + seta hud_panel_weapons_ammo_alpha "1" + seta hud_panel_weapons_aspect "2" + seta hud_panel_weapons_timeout "0" + seta hud_panel_weapons_timeout_effect "0" + seta hud_panel_weapons_onlyowned "1" + + seta hud_panel_ammo 1 + seta hud_panel_ammo_pos "0.450000 0.630000" + seta hud_panel_ammo_size "0.080000 0.040000" + seta hud_panel_ammo_bg "" + seta hud_panel_ammo_bg_color "" + seta hud_panel_ammo_bg_color_team "" + seta hud_panel_ammo_bg_alpha "" + seta hud_panel_ammo_bg_border "" + seta hud_panel_ammo_bg_padding "" + seta hud_panel_ammo_onlycurrent "1" + seta hud_panel_ammo_iconalign "0" + seta hud_panel_ammo_progressbar "1" + seta hud_panel_ammo_progressbar_name "progressbar_ammo" + seta hud_panel_ammo_progressbar_xoffset "0.32" + seta hud_panel_ammo_text "1" + + seta hud_panel_powerups 1 + seta hud_panel_powerups_pos "0.270000 0.940000" + seta hud_panel_powerups_size "0.080000 0.060000" + seta hud_panel_powerups_bg "0" + seta hud_panel_powerups_bg_color "" + seta hud_panel_powerups_bg_color_team "" + seta hud_panel_powerups_bg_alpha "" + seta hud_panel_powerups_bg_border "" + seta hud_panel_powerups_bg_padding "-3" + seta hud_panel_powerups_flip "1" + seta hud_panel_powerups_iconalign "1" + seta hud_panel_powerups_baralign "1" + seta hud_panel_powerups_progressbar "1" + seta hud_panel_powerups_progressbar_strength "progressbar" + seta hud_panel_powerups_progressbar_shield "progressbar" + seta hud_panel_powerups_text "1" + + seta hud_panel_healtharmor 1 + seta hud_panel_healtharmor_pos "0.350000 0.380000" + seta hud_panel_healtharmor_size "0.070000 0.240000" + seta hud_panel_healtharmor_bg "border_healtharmor" + seta hud_panel_healtharmor_bg_color "0.464391 0.464391 0.464391" + seta hud_panel_healtharmor_bg_color_team "" + seta hud_panel_healtharmor_bg_alpha "0.600000" + seta hud_panel_healtharmor_bg_border "-1" + seta hud_panel_healtharmor_bg_padding "0" + seta hud_panel_healtharmor_flip "0" + seta hud_panel_healtharmor_iconalign "1" + seta hud_panel_healtharmor_baralign "1" + seta hud_panel_healtharmor_progressbar "1" + seta hud_panel_healtharmor_progressbar_health "progressbar_health" + seta hud_panel_healtharmor_progressbar_armor "progressbar_armor" + seta hud_panel_healtharmor_progressbar_gfx "1" + seta hud_panel_healtharmor_progressbar_gfx_smooth "2" + seta hud_panel_healtharmor_text "0" + + seta hud_panel_notify 1 + seta hud_panel_notify_pos "0 0" + seta hud_panel_notify_size "0.210000 0.260000" + seta hud_panel_notify_bg "0" + seta hud_panel_notify_bg_color "" + seta hud_panel_notify_bg_color_team "" + seta hud_panel_notify_bg_alpha "" + seta hud_panel_notify_bg_border "" + seta hud_panel_notify_bg_padding "" + seta hud_panel_notify_flip "1" + seta hud_panel_notify_fontsize "0.8" + seta hud_panel_notify_print "0" + seta hud_panel_notify_time "10" + seta hud_panel_notify_fadetime "3" + + seta hud_panel_timer 1 + seta hud_panel_timer_pos "0.435000 0" + seta hud_panel_timer_size "0.135000 0.060000" + seta hud_panel_timer_bg "0" + seta hud_panel_timer_bg_color "" + seta hud_panel_timer_bg_color_team "" + seta hud_panel_timer_bg_alpha "" + seta hud_panel_timer_bg_border "" + seta hud_panel_timer_bg_padding "0" + seta hud_panel_timer_increment "0" + + seta hud_panel_radar 2 + seta hud_panel_radar_pos "0.810000 0" + seta hud_panel_radar_size "0.190000 0.250000" + seta hud_panel_radar_bg "border_radar" + seta hud_panel_radar_bg_color "" + seta hud_panel_radar_bg_color_team "" + seta hud_panel_radar_bg_alpha "0.500000" + seta hud_panel_radar_bg_border "0" + seta hud_panel_radar_bg_padding "0" + seta hud_panel_radar_foreground_alpha "0.500000" + seta hud_panel_radar_rotation "0" + seta hud_panel_radar_zoommode "0" + seta hud_panel_radar_scale "4096" + seta hud_panel_radar_maximized_scale "8192" + seta hud_panel_radar_maximized_size "0.5 0.5" + + seta hud_panel_score 1 + seta hud_panel_score_pos "0.465000 0.045000" + seta hud_panel_score_size "0.090000 0.060000" + seta hud_panel_score_bg "" + seta hud_panel_score_bg_color "" + seta hud_panel_score_bg_color_team "" + seta hud_panel_score_bg_alpha "" + seta hud_panel_score_bg_border "" + seta hud_panel_score_bg_padding "" + seta hud_panel_score_rankings "1" + + seta hud_panel_racetimer 1 + seta hud_panel_racetimer_pos "0.360000 0.090000" + seta hud_panel_racetimer_size "0.280000 0.090000" + seta hud_panel_racetimer_bg "0" + seta hud_panel_racetimer_bg_color "" + seta hud_panel_racetimer_bg_color_team "" + seta hud_panel_racetimer_bg_alpha "" + seta hud_panel_racetimer_bg_border "" + seta hud_panel_racetimer_bg_padding "" + + seta hud_panel_vote 1 + seta hud_panel_vote_pos "0 0.890000" + seta hud_panel_vote_size "0.170000 0.110000" + seta hud_panel_vote_bg "" + seta hud_panel_vote_bg_color "" + seta hud_panel_vote_bg_color_team "" + seta hud_panel_vote_bg_alpha "" + seta hud_panel_vote_bg_border "" + seta hud_panel_vote_bg_padding "" + seta hud_panel_vote_alreadyvoted_alpha "0.800000" + + seta hud_panel_modicons 1 + seta hud_panel_modicons_pos "0.560000 0" + seta hud_panel_modicons_size "0.050000 0.100000" + seta hud_panel_modicons_bg "" + seta hud_panel_modicons_bg_color "" + seta hud_panel_modicons_bg_color_team "" + seta hud_panel_modicons_bg_alpha "" + seta hud_panel_modicons_bg_border "" + seta hud_panel_modicons_bg_padding "" + seta hud_panel_modicons_dom_layout "1" + + seta hud_panel_pressedkeys 1 + seta hud_panel_pressedkeys_pos "0.450000 0.690000" + seta hud_panel_pressedkeys_size "0.100000 0.110000" + seta hud_panel_pressedkeys_bg "0" + seta hud_panel_pressedkeys_bg_color "" + seta hud_panel_pressedkeys_bg_color_team "" + seta hud_panel_pressedkeys_bg_alpha "" + seta hud_panel_pressedkeys_bg_border "" + seta hud_panel_pressedkeys_bg_padding "" + seta hud_panel_pressedkeys_aspect "1.600000" + + seta hud_panel_chat 1 + seta hud_panel_chat_pos "0 0.775000" + seta hud_panel_chat_size "0.460000 0.110000" + seta hud_panel_chat_bg "0" + seta hud_panel_chat_bg_color "" + seta hud_panel_chat_bg_color_team "" + seta hud_panel_chat_bg_alpha "" + seta hud_panel_chat_bg_border "" + seta hud_panel_chat_bg_padding "" + + seta hud_panel_engineinfo 0 + seta hud_panel_engineinfo_pos "0.910000 0.970000" + seta hud_panel_engineinfo_size "0.090000 0.030000" + seta hud_panel_engineinfo_bg "0" + seta hud_panel_engineinfo_bg_color "" + seta hud_panel_engineinfo_bg_color_team "" + seta hud_panel_engineinfo_bg_alpha "" + seta hud_panel_engineinfo_bg_border "" + seta hud_panel_engineinfo_bg_padding "" + seta hud_panel_engineinfo_framecounter_time "0.1" + seta hud_panel_engineinfo_framecounter_decimals "0" + + seta hud_panel_infomessages 1 + seta hud_panel_infomessages_pos "0.710000 0" + seta hud_panel_infomessages_size "0.290000 0.100000" + seta hud_panel_infomessages_bg "0" + seta hud_panel_infomessages_bg_color "" + seta hud_panel_infomessages_bg_color_team "" + seta hud_panel_infomessages_bg_alpha "" + seta hud_panel_infomessages_bg_border "" + seta hud_panel_infomessages_bg_padding "0" + seta hud_panel_infomessages_flip "1" + + seta hud_panel_physics 3 + seta hud_panel_physics_pos "0.270000 0.730000" + seta hud_panel_physics_size "0.170000 0.030000" + seta hud_panel_physics_bg "" + seta hud_panel_physics_bg_color "" + seta hud_panel_physics_bg_color_team "" + seta hud_panel_physics_bg_alpha "" + seta hud_panel_physics_bg_border "" + seta hud_panel_physics_bg_padding "" + seta hud_panel_physics_speed_unit "3" + seta hud_panel_physics_speed_unit_show "1" + seta hud_panel_physics_speed_max "1800" + seta hud_panel_physics_speed_vertical "0" + seta hud_panel_physics_topspeed "1" + seta hud_panel_physics_topspeed_time "4" + seta hud_panel_physics_acceleration_max "1.5" + seta hud_panel_physics_acceleration_vertical "0" + seta hud_panel_physics_flip "0" + seta hud_panel_physics_baralign "0" + seta hud_panel_physics_progressbar "3" -seta hud_panel_physics_acceleration_mode "0" ++seta hud_panel_physics_acceleration_progressbar_mode "0" ++seta hud_panel_physics_acceleration_progressbar_scale "1" ++seta hud_panel_physics_acceleration_progressbar_nonlinear "0" + seta hud_panel_physics_text "1" ++seta hud_panel_physics_text_scale "0.7" + + seta hud_panel_centerprint 1 + seta hud_panel_centerprint_pos "0.175000 0.220000" + seta hud_panel_centerprint_size "0.650000 0.220000" + seta hud_panel_centerprint_bg "0" + seta hud_panel_centerprint_bg_color "" + seta hud_panel_centerprint_bg_color_team "" + seta hud_panel_centerprint_bg_alpha "" + seta hud_panel_centerprint_bg_border "" + seta hud_panel_centerprint_bg_padding "" + seta hud_panel_centerprint_align "0.5" + seta hud_panel_centerprint_flip "0" + seta hud_panel_centerprint_fontscale "1" + seta hud_panel_centerprint_time "3" + seta hud_panel_centerprint_fade_in "0.2" + seta hud_panel_centerprint_fade_out "0.5" + seta hud_panel_centerprint_fade_subsequent "1" + seta hud_panel_centerprint_fade_subsequent_passone "3" + seta hud_panel_centerprint_fade_subsequent_passone_minalpha "0.5" + seta hud_panel_centerprint_fade_subsequent_passtwo "10" + seta hud_panel_centerprint_fade_subsequent_passtwo_minalpha "0.5" + seta hud_panel_centerprint_fade_subsequent_minfontsize "0.75" + seta hud_panel_centerprint_fade_minfontsize "0" + + menu_sync diff --cc hud_luminos_old.cfg index 4308c0b4f,fe7f66085..f96e461ca --- a/hud_luminos_old.cfg +++ b/hud_luminos_old.cfg @@@ -225,15 -245,23 +245,26 @@@ seta hud_panel_physics_bg_color_team " seta hud_panel_physics_bg_alpha "" seta hud_panel_physics_bg_border "" seta hud_panel_physics_bg_padding "" + seta hud_panel_physics_speed_unit "3" + seta hud_panel_physics_speed_unit_show "1" + seta hud_panel_physics_speed_max "1800" + seta hud_panel_physics_speed_vertical "0" + seta hud_panel_physics_topspeed "1" + seta hud_panel_physics_topspeed_time "4" + seta hud_panel_physics_acceleration_max "1.5" + seta hud_panel_physics_acceleration_vertical "0" seta hud_panel_physics_flip "0" seta hud_panel_physics_baralign "0" - seta hud_panel_physics_acceleration_progressbar_mode "0" seta hud_panel_physics_progressbar "1" -seta hud_panel_physics_acceleration_mode "0" ++seta hud_panel_physics_acceleration_progressbar_mode "0" ++seta hud_panel_physics_acceleration_progressbar_scale "1" ++seta hud_panel_physics_acceleration_progressbar_nonlinear "0" seta hud_panel_physics_text "1" ++seta hud_panel_physics_text_scale "0.7" seta hud_panel_centerprint 1 - seta hud_panel_centerprint_pos "0.175000 0.260000" - seta hud_panel_centerprint_size "0.650000 0.210000" + seta hud_panel_centerprint_pos "0.175000 0.220000" + seta hud_panel_centerprint_size "0.650000 0.220000" seta hud_panel_centerprint_bg "0" seta hud_panel_centerprint_bg_color "" seta hud_panel_centerprint_bg_color_team "" diff --cc hud_nexuiz.cfg index 705af40a1,5c2138370..e3f0a9428 --- a/hud_nexuiz.cfg +++ b/hud_nexuiz.cfg @@@ -225,11 -245,19 +245,22 @@@ seta hud_panel_physics_bg_color_team " seta hud_panel_physics_bg_alpha "" seta hud_panel_physics_bg_border "" seta hud_panel_physics_bg_padding "" + seta hud_panel_physics_speed_unit "3" + seta hud_panel_physics_speed_unit_show "1" + seta hud_panel_physics_speed_max "1800" + seta hud_panel_physics_speed_vertical "0" + seta hud_panel_physics_topspeed "1" + seta hud_panel_physics_topspeed_time "4" + seta hud_panel_physics_acceleration_max "1.5" + seta hud_panel_physics_acceleration_vertical "0" seta hud_panel_physics_flip "0" seta hud_panel_physics_baralign "0" - seta hud_panel_physics_acceleration_progressbar_mode "0" seta hud_panel_physics_progressbar "3" - seta hud_panel_physics_text "2" -seta hud_panel_physics_acceleration_mode "0" ++seta hud_panel_physics_acceleration_progressbar_mode "0" ++seta hud_panel_physics_acceleration_progressbar_scale "4" ++seta hud_panel_physics_acceleration_progressbar_nonlinear "0" + seta hud_panel_physics_text "1" ++seta hud_panel_physics_text_scale "0.7" seta hud_panel_centerprint 1 seta hud_panel_centerprint_pos "0.175000 0.260000" diff --cc qcsrc/client/hud_config.qc index f26f65ea5,18ff119a7..cf6a0f70a --- a/qcsrc/client/hud_config.qc +++ b/qcsrc/client/hud_config.qc @@@ -119,7 -159,8 +159,11 @@@ void HUD_Panel_ExportCfg(string cfgname HUD_Write_PanelCvar_q("_flip"); HUD_Write_PanelCvar_q("_baralign"); HUD_Write_PanelCvar_q("_progressbar"); -- HUD_Write_PanelCvar_q("_acceleration_mode"); ++ HUD_Write_PanelCvar_q("_progressbar_acceleration_mode"); ++ HUD_Write_PanelCvar_q("_progressbar_acceleration_scale"); ++ HUD_Write_PanelCvar_q("_progressbar_acceleration_nonlinear"); + HUD_Write_PanelCvar_q("_text"); ++ HUD_Write_PanelCvar_q("_text_scale"); break; case HUD_PANEL_CENTERPRINT: HUD_Write_PanelCvar_q("_align");