Commit a16bfaa1 authored by terencehill's avatar terencehill

Merge branch 'master' into terencehill/menu_listbox_changes

parents 99c1b6ca ab15353d
Tue Jan 13 19:44:31 CET 2015
Sat Aug 8 12:41:53 CEST 2015
......@@ -41,6 +41,9 @@ seta hud_panel_engineinfo_framecounter_exponentialmovingaverage_instantupdate_ch
seta hud_panel_physics_acceleration_movingaverage 1 "use an averaging method for calculating acceleration instead of the real value"
seta hud_panel_phisics_update_interval 0.0666 "how often (in seconds) numeric values get updated on screen"
seta hud_panel_itemstime_progressbar_maxtime "30" "when left time is at least this amount, the status bar is full"
seta hud_panel_itemstime_hidespawned "1" "if 1 hide an item from the panel when all the occurrences of it are available again; if 2 hide it when at least one occurrence is available again"
// hud panel aliases
alias hud_panel_radar_rotate "toggle hud_panel_radar_rotation 0 1 2 3 4"
alias +hud_panel_radar_maximized "cl_cmd hud radar 1"
......
......@@ -25,6 +25,8 @@ seta hud_progressbar_nexball_color "" "R G B vector of the progress bar backgrou
seta hud_progressbar_speed_color "" "R G B vector of the progress bar background color"
seta hud_progressbar_acceleration_color "" "R G B vector of the progress bar background color"
seta hud_progressbar_acceleration_neg_color "" "R G B vector of the progress bar background color"
seta hud_progressbar_vehicles_ammo1_color "" "R G B vector of the progress bar background color"
seta hud_progressbar_vehicles_ammo2_color "" "R G B vector of the progress bar background color"
seta _hud_panelorder "" "contains order in which panels are to be drawn"
......@@ -62,6 +64,8 @@ seta hud_panel_weapons_label_scale "" "scale of the weapon text label"
seta hud_panel_weapons_accuracy "" "show accuracy color as the weapon icon background; colors can be configured with accuracy_color* cvars"
seta hud_panel_weapons_ammo "" "show ammo as a status bar"
seta hud_panel_weapons_onlyowned "" "show only owned weapons"
seta hud_panel_weapons_noncurrent_alpha "" "alpha of noncurrent weapons"
seta hud_panel_weapons_noncurrent_scale "" "scale of noncurrent weapons, relative to the current weapon"
seta hud_panel_ammo "" "enable/disable this panel"
seta hud_panel_ammo_pos "" "position of this panel"
......@@ -84,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"
......@@ -94,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"
......@@ -301,12 +301,29 @@ seta hud_panel_centerprint_fade_subsequent_passtwo_minalpha "" "minimum factor t
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_mapvote "" "enable/disable this panel"
seta hud_panel_mapvote_pos "" "position of this panel"
seta hud_panel_mapvote_size "" "size of this panel"
seta hud_panel_mapvote_bg "" "if set to something else than \"\" = override default background"
seta hud_panel_mapvote_bg_color "" "if set to something else than \"\" = override default panel background color"
seta hud_panel_mapvote_bg_color_team "" "override panel color with team color in team based games"
seta hud_panel_mapvote_bg_alpha "" "if set to something else than \"\" = override default panel background alpha"
seta hud_panel_mapvote_bg_border "" "if set to something else than \"\" = override default size of border around the background"
seta hud_panel_mapvote_bg_padding "" "if set to something else than \"\" = override default padding of contents from border"
seta hud_panel_itemstime "" "enable/disable this panel, it shows left time until important items (mega health, large armor, powerups, superweapons, etc...) respawn in the map: 1 when spectating, 2 even playing in warmup stage"
seta hud_panel_itemstime_pos "" "position of this base of the panel"
seta hud_panel_itemstime_size "" "size of this panel"
seta hud_panel_itemstime_bg "" "if set to something else than \"\" = override default background"
seta hud_panel_itemstime_bg_color "" "if set to something else than \"\" = override default panel background color"
seta hud_panel_itemstime_bg_color_team "" "override panel color with team color in team based games"
seta hud_panel_itemstime_bg_alpha "" "if set to something else than \"\" = override default panel background alpha"
seta hud_panel_itemstime_bg_border "" "if set to something else than \"\" = override default size of border around the background"
seta hud_panel_itemstime_bg_padding "" "if set to something else than \"\" = override default padding of contents from border"
seta hud_panel_itemstime_iconalign "" "0 = align icons to the left, 1 = align icons to the right"
seta hud_panel_itemstime_progressbar "" "use progressbar behind icons"
seta hud_panel_itemstime_progressbar_name "" "name of progressbar to use behind icons"
seta hud_panel_itemstime_progressbar_reduced "" "progressbar is displayed only in the text field"
seta hud_panel_itemstime_text "" "show text"
seta hud_panel_itemstime_ratio "" "ratio between space reserved for text and icon width of each item entry (min value is 2)"
seta hud_panel_itemstime_dynamicsize "" "allow panel size reduction by removing spacing among items"
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.
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.
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.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
......@@ -72,7 +72,7 @@ seta cl_velocityzoom_time 0.2 "time value for averaging speed values"
seta cl_spawnzoom 1 "zoom effect immediately when a player spawns"
seta cl_spawnzoom_speed 1 "speed at which zooming occurs while spawning"
seta cl_spawnzoom_factor 2 "factor of zoom while spawning"
seta cl_zoomfactor 5 "how much +zoom will zoom (1-16)"
seta cl_zoomfactor 5 "how much +zoom will zoom (1-30)"
seta cl_zoomspeed 8 "how fast it will zoom (0.5-16), negative values mean instant zoom"
seta cl_zoomsensitivity 0 "how zoom changes sensitivity (0 = weakest, 1 = strongest)"
......@@ -758,6 +758,7 @@ seta g_waypointsprite_crosshairfadedistance 150 "distance in virtual pixels from
seta g_waypointsprite_distancefadealpha 1 "alpha multiplier near distance"
seta g_waypointsprite_distancefadescale 0.7 "scale multiplier near the distance"
seta g_waypointsprite_distancefadedistancemultiplier 0.5 "distance in map sizes from distance where to stop fading"
seta g_waypointsprite_itemstime 2 "show waypoints to indicate that some important items (mega health, large armor) are about to respawn: 1 when spectating, 2 even playing in warmup stage"
set g_waypointsprite_spam 0 "Debugging feature. Set to 10 and load courtfun in race mode to test."
alias "g_waypointsprite_personal" "impulse 30"
alias "g_waypointsprite_personal_p" "impulse 31"
......@@ -779,6 +780,8 @@ seta g_waypointsprite_turrets 1 "disable turret waypoints"
seta g_waypointsprite_turrets_maxdist 5000 "max distace for turret sprites"
seta g_waypointsprite_tactical 1 "tactical overlay on turrets when in a vehicle"
set sv_itemstime 1 "enable networking of left time until respawn for items such as mega health and large armor"
// so it can be stuffcmd-ed still
set cl_gravity 800 "but ignored anyway"
......@@ -1132,11 +1135,6 @@ set g_mapinfo_settemp_acl "+*" "ACL for mapinfo setting cvars"
seta cl_casings_maxcount 100 "maximum amount of shell casings (must be at least 1)"
seta cl_gibs_maxcount 100 "maximum amount of gibs (must be at least 1)"
seta cl_vehicle_spiderbot_cross_alpha 0.6
seta cl_vehicle_spiderbot_cross_size 1
seta cl_vehicles_hudscale 0.5
seta cl_vehicles_hudalpha 0.75
seta cl_vehicles_hud_tactical 1
//cl_gunalign calculator
seta menu_cl_gunalign 3 "Gun alignment; 1 = center (if allowed by g_shootfromclient) or right, 2 = center (if allowed by g_shootfromclient) or left, 3 = right only, 4 = left only"
......
......@@ -9176,3 +9176,426 @@ effect arc_overheat_fire // arc overheat bouncing sparks
originjitter 6 6 6
liquidfriction 5
velocitymultiplier 80
// yellowflag_touch -- effects for touching the yellow flag
// used nowhere in code
effect yellowflag_touch
count 35
type spark
tex 40 40
color 0xFFFF0F 0xFFFF0F
size 1 3
alpha 0 256 556
gravity 1
bounce 1.5
originjitter 1 1 1
velocityjitter 300 300 300
velocitymultiplier 0.5
airfriction 3
// pinkflag_touch -- effects for touching the pink flag
// used nowhere in code
effect pinkflag_touch
count 35
type spark
tex 40 40
color 0xFF0FFF 0xFF0FFF
size 1 3
alpha 0 256 556
gravity 1
bounce 1.5
originjitter 1 1 1
velocityjitter 300 300 300
velocitymultiplier 0.5
airfriction 3
// neutralflag_touch -- effects for touching the neutral flag
// used nowhere in code
effect neutralflag_touch
count 35
type spark
tex 40 40
color 0xFFFFFF 0xFFFFFF
size 1 3
alpha 0 256 556
gravity 1
bounce 1.5
originjitter 1 1 1
velocityjitter 300 300 300
velocitymultiplier 0.5
airfriction 3
// yellow_pass
// used nowhere in code
effect yellow_pass
trailspacing 64
color 0xFFFF0F 0xFFFF0F
size 2 2
tex 32 32
alpha 64 128 64
airfriction 5
sizeincrease 2
type static
effect yellow_pass
trailspacing 12
color 0xFFFF0F 0xFFFF0F
size 1 1
tex 0 8
alpha 32 64 32
airfriction 9
sizeincrease 8
velocityjitter 64 64 64
type static
effect yellow_pass
trailspacing 12
color 0xFFFF0F 0xFFFF0F
size 4 4
//tex 48 55
alpha 256 256 1280
type static
// pink_pass
// used nowhere in code
effect pink_pass
trailspacing 64
color 0xFFFFFF 0xFFFFFF
size 2 2
tex 32 32
alpha 64 128 64
airfriction 5
sizeincrease 2
type static
effect pink_pass
trailspacing 12
color 0xFFFFFF 0xFFFFFF
size 1 1
tex 0 8
alpha 32 64 32
airfriction 9
sizeincrease 8
velocityjitter 64 64 64
type static
effect pink_pass
trailspacing 12
color 0xFFFFFF 0xFFFFFF
size 4 4
//tex 48 55
alpha 256 256 1280
type static
// neutral_pass
// used nowhere in code
effect neutral_pass
trailspacing 64
color 0xFFFFFF 0xFFFFFF
size 2 2
tex 32 32
alpha 64 128 64
airfriction 5
sizeincrease 2
type static
effect neutral_pass
trailspacing 12
color 0xFFFFFF 0xFFFFFF
size 1 1
tex 0 8
alpha 32 64 32
airfriction 9
sizeincrease 8
velocityjitter 64 64 64
type static
effect neutral_pass
trailspacing 12
color 0xFFFFFF 0xFFFFFF
size 4 4
//tex 48 55
alpha 256 256 1280
type static
// yellow_cap -- yellow team capture effect
effect yellow_cap
count 500
type spark
tex 64 64
color 0xFFFF0F 0xFFFF0F
size 1 1
alpha 0 256 100
stretchfactor 2
//gravity 1
bounce 1.5
originjitter 1 1 1
velocityjitter 1000 1000 1500
velocitymultiplier 0.5
airfriction 2
stretchfactor 0.6
effect yellow_cap
countabsolute 1
type smoke
tex 65 65
size 150 150
alpha 190 190 180
sizeincrease -80
color 0xFFFF0F 0xFFFF0F
// pink_cap -- pink team capture effect
effect pink_cap
count 500
type spark
tex 64 64
color 0xFF0FFF 0xFF0FFF
size 1 1
alpha 0 256 100
stretchfactor 2
//gravity 1
bounce 1.5
originjitter 1 1 1
velocityjitter 1000 1000 1500
velocitymultiplier 0.5
airfriction 2
stretchfactor 0.6
effect pink_cap
countabsolute 1
type smoke
tex 65 65
size 150 150
alpha 190 190 180
sizeincrease -80
color 0xFF0FFF 0xFF0FFF
// relic_resistance effect, used by the relics mutator
// used in qcsrc/server/mutators/relics.qc: pointparticles(particleeffectnum(mdl), e.origin, '0 0 0', 1);
effect relic_resistance
count 20
type static
color 0x00ff80 0x00ff80
size 1.5 1.5
alpha 128 256 256
gravity -0.1
airfriction 0.2
liquidfriction 0.8
originjitter 8 8 32
velocityjitter 64 64 32
// relic_regeneration effect, used by the relics mutator
// used in qcsrc/server/mutators/relics.qc: pointparticles(particleeffectnum(mdl), e.origin, '0 0 0', 1);
effect relic_regeneration
count 1
type static
color 0x00ffff 0x00ffff
size 1.5 1.5
alpha 128 256 256
gravity -0.1
airfriction 0.2
liquidfriction 0.8
originjitter 8 8 32
velocityjitter 64 64 32
// relic_vempire effect, used by the relics mutator
// used in qcsrc/server/mutators/relics.qc: pointparticles(particleeffectnum(mdl), e.origin, '0 0 0', 1);
effect relic_vampire
count 20
type static
color 0xff00ff 0xff00ff
size 1.5 1.5
alpha 128 256 256
gravity -0.1
airfriction 0.2
liquidfriction 0.8
originjitter 8 8 32
velocityjitter 64 64 32
// relic_ammo effect, used by the relics mutator
// used in qcsrc/server/mutators/relics.qc: pointparticles(particleeffectnum(mdl), e.origin, '0 0 0', 1);
effect relic_ammo
count 1
type static
color 0x80ff00 0x80ff00
size 1.5 1.5
alpha 128 256 256
gravity -0.1
airfriction 0.2
liquidfriction 0.8
originjitter 8 8 32
velocityjitter 64 64 32
// relic_damage effect, used by the relics mutator
// used in qcsrc/server/mutators/relics.qc: pointparticles(particleeffectnum(mdl), e.origin, '0 0 0', 1);
effect relic_damage
count 20
type static
color 0xff0000 0xff0000
size 1.5 1.5
alpha 128 256 256
gravity -0.1
airfriction 0.2
liquidfriction 0.8
originjitter 8 8 32
velocityjitter 64 64 32
// relic_splashdamage effect, used by the relics mutator
// used in qcsrc/server/mutators/relics.qc: pointparticles(particleeffectnum(mdl), e.origin, '0 0 0', 1);
effect relic_ssplashdamage
count 20
type static
color 0xff8000 0xff8000
size 1.5 1.5
alpha 128 256 256
gravity -0.1
airfriction 0.2
liquidfriction 0.8
originjitter 8 8 32
velocityjitter 64 64 32
// relic_firingspeed effect, used by the relics mutator
// used in qcsrc/server/mutators/relics.qc: pointparticles(particleeffectnum(mdl), e.origin, '0 0 0', 1);
effect relic_firingspeed
count 20
type static
color 0xffff00 0xffff00
size 1.5 1.5
alpha 128 256 256
gravity -0.1
airfriction 0.2
liquidfriction 0.8
originjitter 8 8 32
velocityjitter 64 64 32
// relic_disability effect, used by the relics mutator
// used in qcsrc/server/mutators/relics.qc: pointparticles(particleeffectnum(mdl), e.origin, '0 0 0', 1);
effect relic_disability
count 20
type static
color 0x0000ff 0x0000ff
size 1.5 1.5
alpha 128 256 256
gravity -0.1
airfriction 0.2
liquidfriction 0.8
originjitter 8 8 32
velocityjitter 64 64 32
// relic_disability_curse effect, used by the relics mutator
// used in qcsrc/server/mutators/relics.qc: pointparticles(particleeffectnum(mdl), e.origin, '0 0 0', 1);
effect relic_disability_curse
count 1
type static
color 0x000080 0x000080
size 1.5 1.5
alpha 128 256 256
gravity -0.1
airfriction 0.2
liquidfriction 0.8
originjitter 8 8 32
velocityjitter 64 64 32
// relic_teamboost effect, used by the relics mutator
// used in qcsrc/server/mutators/relics.qc: pointparticles(particleeffectnum(mdl), e.origin, '0 0 0', 1);
effect relic_teamboost
count 20
type static
color 0xffffff 0xffffff
size 1.5 1.5
alpha 128 256 256
gravity -0.1
airfriction 0.2
liquidfriction 0.8
originjitter 8 8 32
velocityjitter 64 64 32
// relic_teamboost_boost effect, used by the relics mutator
// used in qcsrc/server/mutators/relics.qc: pointparticles(particleeffectnum(mdl), e.origin, '0 0 0', 1);
effect relic_teamboost_boost
count 1
type static
color 0x808080 0x808080
size 1.5 1.5
alpha 128 256 256
gravity -0.1
airfriction 0.2
liquidfriction 0.8
originjitter 8 8 32
velocityjitter 64 64 32
// relic_speed effect, used by the relics mutator
// used in qcsrc/server/mutators/relics.qc: pointparticles(particleeffectnum(mdl), e.origin, '0 0 0', 1);
effect relic_speed
count 1
type static
color 0x80ffff 0x80ffff
size 1.5 1.5
alpha 128 256 256
gravity -0.1
airfriction 0.2
liquidfriction 0.8
originjitter 8 8 32
velocityjitter 64 64 32
// relic_jump effect, used by the relics mutator
// used in qcsrc/server/mutators/relics.qc: pointparticles(particleeffectnum(mdl), e.origin, '0 0 0', 1);
effect relic_jump
count 20
type static
color 0xffff80 0xffff80
size 1.5 1.5
alpha 128 256 256
gravity -0.1
airfriction 0.2
liquidfriction 0.8
originjitter 8 8 32
velocityjitter 64 64 32
// relic_flight effect, used by the relics mutator
// used in qcsrc/server/mutators/relics.qc: pointparticles(particleeffectnum(mdl), e.origin, '0 0 0', 1);
effect relic_flight
count 1
type static
color 0x8080ff 0x8080ff
size 1.5 1.5
alpha 128 256 256
gravity -0.1
airfriction 0.2
liquidfriction 0.8