Commit 7ecebcae authored by Mario's avatar Mario

Merge branch 'sev/buff_updates' into 'Mario/buff_updates'

Buff revisions

This branch combines all my visual buff updates.

- The buff shaders have been revised for a consistent quality
- Buff icons are added to the HUD themes
- The powerup panel now also shows the buffs with their icons
- The buff colors have been updated

One thing that is left: The buff HUD panel, and all associated cvars, are now obsolete.  
If you agree, I can remove them.

See merge request !160
parents bb027873 846f9e8e
......@@ -88,7 +88,6 @@ seta hud_panel_ammo_text "" "show text/icons in the ammo panel"
seta hud_panel_powerups "" "enable/disable this panel"
seta hud_panel_powerups_pos "" "position of this panel"
seta hud_panel_powerups_size "" "size of this panel"
seta hud_panel_powerups_flip "" "flip strength/shield positions"
seta hud_panel_powerups_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"
seta hud_panel_powerups_iconalign "" "0 = align icons to the left, 1 = align icons to the right, 2 = align only left icon to the right, 3 = align only right icon to the right"
seta hud_panel_powerups_bg "" "if set to something else than \"\" = override default background"
......@@ -98,10 +97,7 @@ seta hud_panel_powerups_bg_alpha "" "if set to something else than \"\" = overri
seta hud_panel_powerups_bg_border "" "if set to something else than \"\" = override default size of border around the background"
seta hud_panel_powerups_bg_padding "" "if set to something else than \"\" = override default padding of contents from border"
seta hud_panel_powerups_progressbar "" "enable progressbar in panel"
seta hud_panel_powerups_progressbar_strength "" "progressbar image for strength"
seta hud_panel_powerups_progressbar_shield "" "progressbar image for shield"
seta hud_panel_powerups_progressbar_superweapons "" "progressbar image for superweapons"
seta hud_panel_powerups_text "" "show text/icons in the powerups panel"
seta hud_panel_powerups_text "" "show text and icons in the powerups panel"
seta hud_panel_healtharmor "" "enable/disable this panel, 2 = combined health/armor display"
seta hud_panel_healtharmor_pos "" "position of this panel"
......@@ -304,15 +300,3 @@ seta hud_panel_centerprint_fade_subsequent_passtwo "" "division factor for the s
seta hud_panel_centerprint_fade_subsequent_passtwo_minalpha "" "minimum factor that the second pass can fade to"
seta hud_panel_centerprint_fade_subsequent_minfontsize "" "minimum factor for the font size from the subsequent fading effects"
seta hud_panel_centerprint_fade_minfontsize "" "minimum factor for the font size from the fading in/out effects"
seta hud_panel_buffs "" "enable/disable this panel"
seta hud_panel_buffs_pos "" "position of this panel"
seta hud_panel_buffs_size "" "size of this panel"
seta hud_panel_buffs_bg "" "if set to something else than \"\" = override default background"
seta hud_panel_buffs_bg_color "" "if set to something else than \"\" = override default panel background color"
seta hud_panel_buffs_bg_color_team "" "override panel color with team color in team based games"
seta hud_panel_buffs_bg_alpha "" "if set to something else than \"\" = override default panel background alpha"
seta hud_panel_buffs_bg_border "" "if set to something else than \"\" = override default size of border around the background"
seta hud_panel_buffs_bg_padding "" "if set to something else than \"\" = override default padding of contents from border"
seta hud_panel_buffs_progressbar "" "use progressbar behind buff names"
seta hud_panel_buffs_progressbar_name "" "name of progressbar to use behind buff names"
......@@ -16,8 +16,8 @@ seta hud_progressbar_alpha "0.600000"
seta hud_progressbar_health_color "0.83 0.12 0"
seta hud_progressbar_armor_color "0.28 0.8 0"
seta hud_progressbar_fuel_color "0.77 0.67 0"
seta hud_progressbar_strength_color "0.86 0.35 0"
seta hud_progressbar_shield_color "0.28 0.8 0"
seta hud_progressbar_strength_color "1 0.39 0"
seta hud_progressbar_shield_color "0.36 1 0.07"
seta hud_progressbar_superweapons_color "0.77 0.67 0"
seta hud_progressbar_nexball_color "0.2 0.65 0.93"
seta hud_progressbar_speed_color "0.77 0.67 0"
......@@ -84,21 +84,17 @@ seta hud_panel_ammo_progressbar_xoffset "0"
seta hud_panel_ammo_text "1"
seta hud_panel_powerups 1
seta hud_panel_powerups_pos "0.325000 0.820000"
seta hud_panel_powerups_size "0.350000 0.050000"
seta hud_panel_powerups_pos "0.325000 0.815000"
seta hud_panel_powerups_size "0.350000 0.055000"
seta hud_panel_powerups_bg "border_shadow_south"
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 ""
seta hud_panel_powerups_flip "1"
seta hud_panel_powerups_iconalign "2"
seta hud_panel_powerups_baralign "2"
seta hud_panel_powerups_iconalign "3"
seta hud_panel_powerups_baralign "3"
seta hud_panel_powerups_progressbar "1"
seta hud_panel_powerups_progressbar_strength "progressbar"
seta hud_panel_powerups_progressbar_shield "progressbar"
seta hud_panel_powerups_progressbar_superweapons "progressbar"
seta hud_panel_powerups_text "1"
seta hud_panel_healtharmor 1
......@@ -303,16 +299,4 @@ 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"
seta hud_panel_buffs 1
seta hud_panel_buffs_pos "0.325000 0.820000"
seta hud_panel_buffs_size "0.350000 0.050000"
seta hud_panel_buffs_bg "0"
seta hud_panel_buffs_bg_color ""
seta hud_panel_buffs_bg_color_team ""
seta hud_panel_buffs_bg_alpha ""
seta hud_panel_buffs_bg_border ""
seta hud_panel_buffs_bg_padding ""
seta hud_panel_buffs_progressbar 1
seta hud_panel_buffs_progressbar_name "progressbar"
menu_sync
......@@ -91,14 +91,10 @@ 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 ""
seta hud_panel_powerups_flip "1"
seta hud_panel_powerups_bg_padding "-2"
seta hud_panel_powerups_iconalign "3"
seta hud_panel_powerups_baralign "3"
seta hud_panel_powerups_progressbar "1"
seta hud_panel_powerups_progressbar_strength "progressbar"
seta hud_panel_powerups_progressbar_shield "progressbar"
seta hud_panel_powerups_progressbar_superweapons "progressbar"
seta hud_panel_powerups_text "1"
seta hud_panel_healtharmor 1
......@@ -303,16 +299,4 @@ 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"
seta hud_panel_buffs 1
seta hud_panel_buffs_pos "0.450000 0.855000"
seta hud_panel_buffs_size "0.050000 0.070000"
seta hud_panel_buffs_bg "0"
seta hud_panel_buffs_bg_color ""
seta hud_panel_buffs_bg_color_team ""
seta hud_panel_buffs_bg_alpha ""
seta hud_panel_buffs_bg_border ""
seta hud_panel_buffs_bg_padding ""
seta hud_panel_buffs_progressbar 1
seta hud_panel_buffs_progressbar_name "progressbar"
menu_sync
......@@ -92,13 +92,9 @@ 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_progressbar_superweapons "progressbar"
seta hud_panel_powerups_text "1"
seta hud_panel_healtharmor 1
......@@ -303,16 +299,4 @@ 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"
seta hud_panel_buffs 1
seta hud_panel_buffs_pos "0.450000 0.855000"
seta hud_panel_buffs_size "0.050000 0.070000"
seta hud_panel_buffs_bg "0"
seta hud_panel_buffs_bg_color ""
seta hud_panel_buffs_bg_color_team ""
seta hud_panel_buffs_bg_alpha ""
seta hud_panel_buffs_bg_border ""
seta hud_panel_buffs_bg_padding ""
seta hud_panel_buffs_progressbar 1
seta hud_panel_buffs_progressbar_name "progressbar"
menu_sync
......@@ -92,13 +92,9 @@ 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_progressbar_superweapons "progressbar"
seta hud_panel_powerups_text "1"
seta hud_panel_healtharmor 1
......@@ -303,16 +299,4 @@ 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"
seta hud_panel_buffs 1
seta hud_panel_buffs_pos "0.450000 0.855000"
seta hud_panel_buffs_size "0.050000 0.070000"
seta hud_panel_buffs_bg "0"
seta hud_panel_buffs_bg_color ""
seta hud_panel_buffs_bg_color_team ""
seta hud_panel_buffs_bg_alpha ""
seta hud_panel_buffs_bg_border ""
seta hud_panel_buffs_bg_padding ""
seta hud_panel_buffs_progressbar 1
seta hud_panel_buffs_progressbar_name "progressbar"
menu_sync
......@@ -92,13 +92,9 @@ 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 ""
seta hud_panel_powerups_flip "1"
seta hud_panel_powerups_iconalign "3"
seta hud_panel_powerups_baralign "3"
seta hud_panel_powerups_progressbar "1"
seta hud_panel_powerups_progressbar_strength "progressbar"
seta hud_panel_powerups_progressbar_shield "progressbar"
seta hud_panel_powerups_progressbar_superweapons "progressbar"
seta hud_panel_powerups_text "1"
seta hud_panel_healtharmor 1
......@@ -303,16 +299,4 @@ 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"
seta hud_panel_buffs 1
seta hud_panel_buffs_pos "0.450000 0.855000"
seta hud_panel_buffs_size "0.050000 0.070000"
seta hud_panel_buffs_bg "0"
seta hud_panel_buffs_bg_color ""
seta hud_panel_buffs_bg_color_team ""
seta hud_panel_buffs_bg_alpha ""
seta hud_panel_buffs_bg_border ""
seta hud_panel_buffs_bg_padding ""
seta hud_panel_buffs_progressbar 1
seta hud_panel_buffs_progressbar_name "progressbar"
menu_sync
......@@ -92,13 +92,9 @@ 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 ""
seta hud_panel_powerups_flip "1"
seta hud_panel_powerups_iconalign "0"
seta hud_panel_powerups_baralign "0"
seta hud_panel_powerups_progressbar "0"
seta hud_panel_powerups_progressbar_strength "progressbar"
seta hud_panel_powerups_progressbar_shield "progressbar"
seta hud_panel_powerups_progressbar_superweapons "progressbar"
seta hud_panel_powerups_text "1"
seta hud_panel_healtharmor 1
......@@ -303,16 +299,4 @@ 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"
seta hud_panel_buffs 1
seta hud_panel_buffs_pos "0.450000 0.855000"
seta hud_panel_buffs_size "0.050000 0.070000"
seta hud_panel_buffs_bg "0"
seta hud_panel_buffs_bg_color ""
seta hud_panel_buffs_bg_color_team ""
seta hud_panel_buffs_bg_alpha ""
seta hud_panel_buffs_bg_border ""
seta hud_panel_buffs_bg_padding ""
seta hud_panel_buffs_progressbar 1
seta hud_panel_buffs_progressbar_name "progressbar"
menu_sync
ring,models/relics/relic_ring
mesh,models/relics/relic
sign,models/relics/sign_regeneration
\ No newline at end of file
sign,models/relics/sign_medic
\ No newline at end of file
ring,models/relics/relic_ring
mesh,models/relics/relic
sign,models/relics/sign_radioactive
\ No newline at end of file
sign,textures/common/nodraw
\ No newline at end of file
ring,models/relics/relic_ring
mesh,models/relics/relic
sign,models/relics/sign_resurrection
\ No newline at end of file
sign,models/relics/sign_blessed
\ No newline at end of file
ring,models/relics/relic_ring
mesh,models/relics/relic
sign,models/relics/sign_damage
\ No newline at end of file
sign,textures/common/nodraw
\ No newline at end of file
ring,models/relics/relic_ring
mesh,models/relics/relic
sign,models/relics/sign_splashdamage
\ No newline at end of file
sign,models/relics/sign_bash
\ No newline at end of file
ring,models/relics/relic_ring
mesh,models/relics/relic
sign,models/relics/sign_firingspeed
\ No newline at end of file
sign,textures/common/nodraw
\ No newline at end of file
ring,models/relics/relic_ring
mesh,models/relics/relic
sign,models/relics/sign_teamboost
\ No newline at end of file
sign,textures/common/nodraw
\ No newline at end of file
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment