Commit 6d2e1250 authored by Mario's avatar Mario

Merge branch 'master' into Mario/triggers

parents 4f898ebc 02e07278
......@@ -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"
......@@ -310,3 +314,13 @@ seta hud_panel_buffs_bg_color_team "" "override panel color with team color in t
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"
......@@ -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)"
......@@ -1132,11 +1132,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,188 @@ 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
......@@ -254,6 +254,10 @@ set g_ca_teams 0
// capture the flag
// ==================
set g_ctf 0 "Capture The Flag: take the enemy flag and bring it to yours at your base to score"
set g_ctf_oneflag 1 "Allow oneflag CTF mode on maps that support it"
set g_ctf_oneflag_reverse 0 "apply reverse mode to oneflag CTF (take flag to enemy bases to cap), overrides g_ctf_reverse only in oneflag, g_ctf_reverse still affects oneflag"
set g_ctf_flag_return 1 "auto return the flag to base when touched by a teammate"
set g_ctf_flag_return_carried_radius 100 "allow flags to be returned by carrier if base is within this radius"
set g_ctf_flag_return_time 15
set g_ctf_flag_return_dropped 100
set g_ctf_flag_return_damage 0
......@@ -311,6 +315,12 @@ set g_ctf_flag_red_model "models/ctf/flags.md3"
set g_ctf_flag_red_skin 0
set g_ctf_flag_blue_model "models/ctf/flags.md3"
set g_ctf_flag_blue_skin 1
set g_ctf_flag_yellow_model "models/ctf/flags.md3"
set g_ctf_flag_yellow_skin 2
set g_ctf_flag_pink_model "models/ctf/flags.md3"
set g_ctf_flag_pink_skin 3
set g_ctf_flag_neutral_model "models/ctf/flags.md3"
set g_ctf_flag_neutral_skin 4
set g_ctf_flag_glowtrails 1
set g_ctf_fullbrightflags 0
set g_ctf_dynamiclights 0
......
No preview for this file type
No preview for this file type
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.
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.
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.
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.
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.
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