From: terencehill Date: Fri, 10 Dec 2010 18:23:13 +0000 (+0100) Subject: Merge branch 'terencehill/newpanelhud' into terencehill/speedpanel X-Git-Tag: xonotic-v0.5.0~362^2~2 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=f209ef256e1c8cc09fcfb1cf3b3f30f34345e88b;p=xonotic%2Fxonotic-data.pk3dir.git Merge branch 'terencehill/newpanelhud' into terencehill/speedpanel Conflicts: qcsrc/client/autocvars.qh qcsrc/client/hud.qc --- f209ef256e1c8cc09fcfb1cf3b3f30f34345e88b diff --cc qcsrc/client/autocvars.qh index b15644de0,bc54fedbf..142d5269c --- a/qcsrc/client/autocvars.qh +++ b/qcsrc/client/autocvars.qh @@@ -1,71 -1,283 +1,284 @@@ - var float autocvar_cl_projectiles_sloppy = 0; - - var float autocvar_cl_gibs_ticrate = 0.1; - var float autocvar_cl_gibs_sloppy = 1; - - var float autocvar_cl_casings_ticrate = 0.1; + float autocvar__con_chat_maximized; + float autocvar__hud_configure; + string autocvar__hud_panelorder; + float autocvar__menu_alpha; + string autocvar_accuracy_color_levels; + float autocvar_bgmvolume; + float autocvar_camera_chase_smoothly; + float autocvar_camera_enable; + float autocvar_camera_forward_follows; + float autocvar_camera_free; + float autocvar_camera_look_attenuation; + float autocvar_camera_look_player; + float autocvar_camera_mouse_treshold; + float autocvar_camera_reset; + float autocvar_camera_speed_attenuation; + float autocvar_camera_speed_chase; + float autocvar_camera_speed_free; + float autocvar_camera_speed_roll; + float autocvar_chase_active; + float autocvar_cl_allow_uid2name; + string autocvar_cl_announcer; + float autocvar_cl_autodemo_delete; + float autocvar_cl_autodemo_delete_keeprecords; + float autocvar_cl_casings; + float autocvar_cl_casings_bronze_time; + var float autocvar_cl_casings_maxcount = 100; + float autocvar_cl_casings_shell_time; var float autocvar_cl_casings_sloppy = 1; - - var float autocvar_cl_gentle_damage; - - var float autocvar_scoreboard_color_bg_team; - - var float autocvar__menu_alpha; - - var float autocvar__hud_configure; - var float autocvar_hud_configure_teamcolorforced; - - var float autocvar__con_chat_maximized; - var string autocvar__hud_panelorder; - - var string autocvar_hud_dock; - - var float autocvar_hud_progressbar_alpha; - - var string autocvar_hud_panel_bg; - var vector autocvar_hud_panel_bg_color; - var float autocvar_hud_panel_bg_color_team; - var float autocvar_hud_panel_bg_alpha; - var float autocvar_hud_panel_bg_border; - var float autocvar_hud_panel_bg_padding; - var float autocvar_hud_panel_fg_alpha; - - var float autocvar_hud_panel_weapons; - - var float autocvar_hud_panel_ammo; - var float autocvar_hud_panel_ammo_onlycurrent; - var float autocvar_hud_panel_ammo_iconalign; - - var float autocvar_hud_panel_powerups; - - var float autocvar_hud_panel_healtharmor; - - var float autocvar_hud_panel_notify; - - var float autocvar_hud_panel_timer; - var float autocvar_hud_panel_timer_increment; - - var float autocvar_hud_panel_radar; - - var float autocvar_hud_panel_score; - - var float autocvar_hud_panel_racetimer; - - var float autocvar_hud_panel_vote; - - var float autocvar_hud_panel_modicons; - - var float autocvar_hud_panel_pressedkeys; - - var float autocvar_hud_panel_chat; - - var float autocvar_hud_panel_engineinfo; - - var float autocvar_hud_panel_infomessages; - var float autocvar_hud_panel_infomessages_flip; - - var float autocvar_hud_panel_physics; - - var float autocvar_scoreboard_border_thickness; - - var float autocvar_cl_allow_uid2name; + var float autocvar_cl_casings_ticrate = 0.1; + float autocvar_cl_db_saveasdump; + float autocvar_cl_deathscoreboard; + float autocvar_cl_effects_lightningarc_branchfactor_add; + float autocvar_cl_effects_lightningarc_branchfactor_start; + float autocvar_cl_effects_lightningarc_drift_end; + float autocvar_cl_effects_lightningarc_drift_start; + float autocvar_cl_effects_lightningarc_segmentlength; + float autocvar_cl_effects_lightningarc_simple; + float autocvar_cl_gentle; + float autocvar_cl_gentle_damage; + float autocvar_cl_gentle_gibs; + float autocvar_cl_gentle_messages; + var float autocvar_cl_gibs_damageforcescale = 3.5; + var float autocvar_cl_gibs_lifetime = 14; + var float autocvar_cl_gibs_maxcount = 100; + var float autocvar_cl_gibs_sloppy = 1; + var float autocvar_cl_gibs_ticrate = 0.1; + var float autocvar_cl_gibs_velocity_random = 1; + var float autocvar_cl_gibs_velocity_scale = 1; + float autocvar_cl_gibs_velocity_up; + float autocvar_cl_gunalign; + float autocvar_cl_hidewaypoints; + float autocvar_cl_lockview; + float autocvar_cl_nogibs; + float autocvar_cl_notify_carried_items; + float autocvar_cl_particlegibs; + float autocvar_cl_particles_oldnexbeam; + float autocvar_cl_particles_quality; + float autocvar_cl_projectiles_sloppy; + float autocvar_cl_readpicture_force; + float autocvar_cl_reticle_item_nex; + float autocvar_cl_reticle_item_normal; + float autocvar_cl_reticle_stretch; + float autocvar_cl_showacceleration; + float autocvar_cl_showacceleration_alpha; + string autocvar_cl_showacceleration_color; + float autocvar_cl_showacceleration_color_custom; + float autocvar_cl_showacceleration_position; + float autocvar_cl_showacceleration_scale; + float autocvar_cl_showacceleration_size; + float autocvar_cl_showacceleration_z; + float autocvar_cl_showspeed; + float autocvar_cl_showspeed_position; + float autocvar_cl_showspeed_size; + float autocvar_cl_showspeed_unit; + float autocvar_cl_showspeed_z; + float autocvar_cl_sound_maptime_warning; + float autocvar_cl_stripcolorcodes; + var float autocvar_cl_vehicle_spiderbot_cross_alpha = 0.6; + var float autocvar_cl_vehicle_spiderbot_cross_size = 1; + float autocvar_cl_velocityzoom; + var float autocvar_cl_velocityzoomtime = 0.3; + string autocvar_cl_weaponpriority; + float autocvar_cl_zoomfactor; + float autocvar_cl_zoomsensitivity; + float autocvar_cl_zoomspeed; + float autocvar_con_chat; + float autocvar_con_chatpos; + float autocvar_con_chatsize; + float autocvar_con_chattime; + float autocvar_con_notify; + float autocvar_con_notifysize; + string autocvar_crosshair; + float autocvar_crosshair_alpha; + string autocvar_crosshair_color; + float autocvar_crosshair_color_per_weapon; + float autocvar_crosshair_dot; + float autocvar_crosshair_dot_alpha; + string autocvar_crosshair_dot_color; + float autocvar_crosshair_dot_size; + float autocvar_crosshair_effect_scalefade; + float autocvar_crosshair_effect_speed; + float autocvar_crosshair_hittest; + float autocvar_crosshair_hittest_blur; + float autocvar_crosshair_hittest_showimpact; + float autocvar_crosshair_per_weapon; + float autocvar_crosshair_pickup; + float autocvar_crosshair_pickup_speed; + float autocvar_crosshair_ring_campingrifle_alpha; + float autocvar_crosshair_ring_nex_currentcharge_movingavg_rate; + float autocvar_crosshair_ring_nex_currentcharge_scale; + float autocvar_crosshair_ring_nex_inner_alpha; + float autocvar_crosshair_ring_nex_inner_color_blue; + float autocvar_crosshair_ring_nex_inner_color_green; + float autocvar_crosshair_ring_nex_inner_color_red; + float autocvar_crosshair_ring_nex_outer_alpha; + float autocvar_crosshair_ring_size; + float autocvar_crosshair_size; + float autocvar_ekg; + float autocvar_fov; + float autocvar_g_balance_tuba_attenuation; + float autocvar_g_balance_tuba_fadetime; + float autocvar_g_balance_tuba_volume; + float autocvar_g_warmup_limit; + var float autocvar_g_waypointsprite_alpha = 1; + var float autocvar_g_waypointsprite_crosshairfadealpha = 1; + float autocvar_g_waypointsprite_crosshairfadedistance; + var float autocvar_g_waypointsprite_crosshairfadescale = 1; + float autocvar_g_waypointsprite_distancealphaexponent; + var float autocvar_g_waypointsprite_distancefadealpha = 1; + var float autocvar_g_waypointsprite_distancefadedistancemultiplier = 1; + var float autocvar_g_waypointsprite_distancefadescale = 1; + var float autocvar_g_waypointsprite_edgefadealpha = 1; + float autocvar_g_waypointsprite_edgefadedistance; + var float autocvar_g_waypointsprite_edgefadescale = 1; + float autocvar_g_waypointsprite_minalpha; + float autocvar_g_waypointsprite_minscale; + float autocvar_g_waypointsprite_normdistance; + var float autocvar_g_waypointsprite_scale = 1; + float autocvar_g_waypointsprite_timealphaexponent; + var float autocvar_hud_colorflash_alpha = 0.5; + float autocvar_hud_configure_bg_minalpha; + float autocvar_hud_configure_checkcollisions; + float autocvar_hud_configure_grid; + float autocvar_hud_configure_grid_alpha; + float autocvar_hud_configure_grid_xsize; + float autocvar_hud_configure_grid_ysize; + float autocvar_hud_configure_teamcolorforced; + float autocvar_hud_damage; + string autocvar_hud_damage_color; + float autocvar_hud_damage_factor; + float autocvar_hud_damage_fade_rate; + float autocvar_hud_damage_gentle_alpha_multiplier; + string autocvar_hud_damage_gentle_color; + float autocvar_hud_damage_maxalpha; + float autocvar_hud_damage_pain_threshold; + float autocvar_hud_damage_pain_threshold_lower; + float autocvar_hud_damage_pain_threshold_lower_health; + float autocvar_hud_damage_pain_threshold_pulsating_min; + float autocvar_hud_damage_pain_threshold_pulsating_period; + string autocvar_hud_dock; + float autocvar_hud_dock_alpha; + string autocvar_hud_dock_color; + float autocvar_hud_dock_color_team; + float autocvar_hud_panel_ammo; + float autocvar_hud_panel_ammo_iconalign; + float autocvar_hud_panel_ammo_maxammo; + float autocvar_hud_panel_ammo_onlycurrent; + float autocvar_hud_panel_ammo_progressbar; + string autocvar_hud_panel_ammo_progressbar_name; + float autocvar_hud_panel_ammo_progressbar_xoffset; + float autocvar_hud_panel_ammo_text; + string autocvar_hud_panel_bg; + float autocvar_hud_panel_bg_alpha; + float autocvar_hud_panel_bg_border; + vector autocvar_hud_panel_bg_color; + float autocvar_hud_panel_bg_color_team; + float autocvar_hud_panel_bg_padding; + float autocvar_hud_panel_chat; + float autocvar_hud_panel_engineinfo; + float autocvar_hud_panel_engineinfo_framecounter_decimals; + float autocvar_hud_panel_engineinfo_framecounter_time; + float autocvar_hud_panel_fg_alpha; + float autocvar_hud_panel_healtharmor; + float autocvar_hud_panel_healtharmor_baralign; + float autocvar_hud_panel_healtharmor_flip; + float autocvar_hud_panel_healtharmor_iconalign; + float autocvar_hud_panel_healtharmor_maxarmor; + float autocvar_hud_panel_healtharmor_maxhealth; + float autocvar_hud_panel_healtharmor_progressbar; + string autocvar_hud_panel_healtharmor_progressbar_armor; + string autocvar_hud_panel_healtharmor_progressbar_health; + float autocvar_hud_panel_healtharmor_text; + float autocvar_hud_panel_infomessages; + float autocvar_hud_panel_infomessages_flip; + float autocvar_hud_panel_modicons; + float autocvar_hud_panel_notify; + float autocvar_hud_panel_notify_fadetime; + float autocvar_hud_panel_notify_flip; + float autocvar_hud_panel_notify_print; + float autocvar_hud_panel_notify_time; ++float autocvar_hud_panel_physics; + float autocvar_hud_panel_powerups; + float autocvar_hud_panel_powerups_baralign; + float autocvar_hud_panel_powerups_flip; + float autocvar_hud_panel_powerups_iconalign; + float autocvar_hud_panel_powerups_progressbar; + string autocvar_hud_panel_powerups_progressbar_shield; + string autocvar_hud_panel_powerups_progressbar_strength; + float autocvar_hud_panel_powerups_text; + float autocvar_hud_panel_pressedkeys; + float autocvar_hud_panel_pressedkeys_aspect; + float autocvar_hud_panel_racetimer; + float autocvar_hud_panel_radar; + float autocvar_hud_panel_radar_foreground_alpha; + float autocvar_hud_panel_radar_rotation; + float autocvar_hud_panel_radar_scale; + float autocvar_hud_panel_radar_zoommode; + float autocvar_hud_panel_score; + float autocvar_hud_panel_score_rankings; + float autocvar_hud_panel_timer; + float autocvar_hud_panel_timer_increment; + float autocvar_hud_panel_vote; + float autocvar_hud_panel_vote_alreadyvoted_alpha; + string autocvar_hud_panel_vote_bg_alpha; + float autocvar_hud_panel_weapons; + float autocvar_hud_panel_weapons_accuracy; + float autocvar_hud_panel_weapons_ammo; + float autocvar_hud_panel_weapons_ammo_alpha; + string autocvar_hud_panel_weapons_ammo_color; + float autocvar_hud_panel_weapons_ammo_full_cells; + float autocvar_hud_panel_weapons_ammo_full_fuel; + float autocvar_hud_panel_weapons_ammo_full_nails; + float autocvar_hud_panel_weapons_ammo_full_rockets; + float autocvar_hud_panel_weapons_ammo_full_shells; + float autocvar_hud_panel_weapons_aspect; + float autocvar_hud_panel_weapons_complainbubble; + string autocvar_hud_panel_weapons_complainbubble_color_donthave; + string autocvar_hud_panel_weapons_complainbubble_color_outofammo; + string autocvar_hud_panel_weapons_complainbubble_color_unavailable; + float autocvar_hud_panel_weapons_complainbubble_fadetime; + float autocvar_hud_panel_weapons_complainbubble_padding; + float autocvar_hud_panel_weapons_complainbubble_time; + var float autocvar_hud_panel_weapons_fade = 1; + float autocvar_hud_panel_weapons_label; + float autocvar_hud_panel_weapons_timeout; + float autocvar_hud_panel_weapons_timeout_effect; + float autocvar_hud_progressbar_alpha; + float autocvar_hud_showbinds; + float autocvar_hud_showbinds_limit; + string autocvar_hud_skin; + float autocvar_loddebug; + float autocvar_menu_mouse_speed; + string autocvar_menu_skin; + float autocvar_r_fakelight; + float autocvar_r_fullbright; + float autocvar_r_letterbox; + float autocvar_scoreboard_accuracy; + float autocvar_scoreboard_accuracy_doublerows; + float autocvar_scoreboard_alpha_bg; + var float autocvar_scoreboard_alpha_fg = 1.0; + var float autocvar_scoreboard_alpha_name = 0.9; + var float autocvar_scoreboard_alpha_name_self = 1; + float autocvar_scoreboard_bg_scale; + float autocvar_scoreboard_border_thickness; + float autocvar_scoreboard_color_bg_b; + float autocvar_scoreboard_color_bg_g; + float autocvar_scoreboard_color_bg_r; + float autocvar_scoreboard_color_bg_team; + string autocvar_scoreboard_columns; + var float autocvar_scoreboard_fadeinspeed = 10; + var float autocvar_scoreboard_fadeoutspeed = 5; + float autocvar_scoreboard_highlight; + var float autocvar_scoreboard_highlight_alpha = 0.10; + var float autocvar_scoreboard_highlight_alpha_self = 0.25; + float autocvar_scoreboard_offset_left; + float autocvar_scoreboard_offset_right; + float autocvar_scr_centerpos; + float autocvar_scr_centersize; + float autocvar_scr_centertime; + float autocvar_v_flipped; + float autocvar_vid_conheight; + float autocvar_vid_conwidth; + float autocvar_vid_pixelheight; + float autocvar_viewsize; diff --cc qcsrc/client/hud.qc index 6930cb2fd,8f5ca3889..b2892bd11 --- a/qcsrc/client/hud.qc +++ b/qcsrc/client/hud.qc @@@ -5010,35 -5122,27 +5127,35 @@@ void HUD_InfoMessages(void } } -/* -================== -Main HUD system -================== -*/ +// Physics panel (#15) +// +vector acc_prevspeed; +float acc_prevtime, acc_avg, top_speed, top_speed_time; -void HUD_ShowSpeed(void) +void HUD_Physics(void) { - vector numsize; - float pos, conversion_factor; - string speed, zspeed, unit; + if(!autocvar_hud_panel_physics && !autocvar__hud_configure) + return; + + active_panel = HUD_PANEL_PHYSICS; + HUD_Panel_UpdateCvars(physics); + + HUD_Panel_DrawBg(1); + if(panel_bg_padding) + { + panel_pos += '1 1 0' * panel_bg_padding; + panel_size -= '2 2 0' * panel_bg_padding; + } + + //compute speed + float speed, conversion_factor; + string unit; - switch(cvar("hud_panel_physics_speed_unit")) + switch(autocvar_cl_showspeed_unit) { default: - case 0: - unit = ""; - conversion_factor = 1.0; - break; case 1: - unit = " qu/s"; + unit = "qu/s"; conversion_factor = 1.0; break; case 2: