X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=defaultXonotic.cfg;h=6a31b99ad55d7335c97d309aeeb087df3eae695d;hb=cdf8d22631c0acdf97bd69bdd00ab86e96b30b73;hp=13e5b7d673bb6d3856e9d57fb063f4ac2ec84580;hpb=26c8963b7747f4c53fc541df0dd71b7024d1d496;p=xonotic%2Fxonotic-data.pk3dir.git diff --git a/defaultXonotic.cfg b/defaultXonotic.cfg index 13e5b7d67..6a31b99ad 100644 --- a/defaultXonotic.cfg +++ b/defaultXonotic.cfg @@ -100,8 +100,7 @@ seta crosshair_dot_color "1 0 0" "when != 0, use custom color for the crosshair seta crosshair_pickup 0.25 seta crosshair_pickup_speed 4 seta crosshair_per_weapon 0 "when 1, each gun will display a different crosshair" -seta crosshair_color_override 0 "when 1, crosshair_color_* overrides the per-weapon color" -seta crosshair_color_per_weapon 1 "when 1, each gun will display a different colored crosshair" +seta crosshair_color_per_weapon 1 "when 1, each gun will display the crosshair with a different color" seta crosshair_effect_speed -1 "how fast (in seconds) some crosshair effects should take place, 0 = instant, -1 = 2x weapon switch time" seta crosshair_effect_scalefade 1 "use scaling and fading for crosshair effects" seta crosshair_hittest 1 "do a crosshair hit evaluation; also, the crosshair is scaled by the given number when aiming at an enemy, and blurred when aiming at a team mate" @@ -264,6 +263,14 @@ gl_polyblend 0 // whether to use screen tints, this has now been replaced by a b r_motionblur 0 // motion blur value, default is 0 r_damageblur 0 // motion blur when damaged, default is 0 +r_bloom_blur 8 +r_bloom_brighten 3 +r_bloom_colorexponent 1 +r_bloom_colorscale 1 +r_bloom_colorsubtract 0.25 +r_bloom_resolution 320 +r_hdr_range 4 + seta vid_x11_display "" "xonotic-linux-*.sh will use this to start xonotic on an other/new X display" // This can have three possible settings: // "" run as usual @@ -618,6 +625,8 @@ set g_cts_selfdamage 1 "0 = disable all selfdamage and falldamage in cts" set g_cts_finish_kill_delay 10 "prevent cheating by running back to the start line, and starting out with more speed than otherwise possible" set g_freezetag_respawn_waves 0 set g_freezetag_respawn_delay 0.25 +set g_ka_respawn_delay 0 +set g_ka_respawn_waves 0 // overtime seta timelimit_overtime 2 "duration in minutes of one added overtime, added to the timelimit" @@ -1069,8 +1078,8 @@ alias vstop "cmd vote stop" alias vmaster "cmd vote master" alias vlogin "cmd vote login $*" alias vdo "cmd vote do $*" -alias vyes "cmd vote yes" -alias vno "cmd vote no" +alias vyes "cl_cmd vyes" +alias vno "cl_cmd vno" alias vdontcare "cmd vote dontcare" alias vabstain "cmd vote abstain" @@ -1255,6 +1264,28 @@ set g_balance_keyhunt_damageforcescale 1 seta g_keyhunt_teams_override 0 set g_keyhunt_teams 0 +// keepaway +set g_keepaway 0 "game mode which focuses around a ball, look at g_keepaway_win_mode for further details" +set g_keepaway_bckillscore 1 "enable scoring points (y/n) for ball carrier kills" +set g_keepaway_pointlimit -1 "total amount of points you can get, -1 for unlimited" +set g_keepaway_pointleadlimit -1 "mercy rule, -1 for unlimited" +set g_keepaway_ballcarrier_alpha 0.6 "alpha when the player is the ballcarrier" +set g_keepaway_ballcarrier_highspeed 1.5 "speed multiplier done to the person holding the ball" +set g_keepaway_ballcarrier_damage 1.5 "damage multiplier while having powerup" +set g_keepaway_ballcarrier_force 1.5 "force multiplier while having powerup" +set g_keepaway_ballcarrier_selfdamage 1 "self damage multiplier while having powerup" +set g_keepaway_ballcarrier_selfforce 1.5 "self force multiplier while having powerup" +set g_keepaway_noncarrier_warn 0 "warn players when they kill without holding the ball" +set g_keepaway_noncarrier_damage 0.5 "damage done to other players if both you and they don't have the ball" +set g_keepaway_noncarrier_force 0.5 "force done to other players if both you and they don't have the ball" +set g_keepaway_noncarrier_selfdamage 1 "self damage if you don't have the ball" +set g_keepaway_noncarrier_selfforce 1 "self force if you don't have the ball" +set g_keepawayball_trail_color 254 "particle trail color from player/ball" +set g_keepawayball_damageforcescale 2 "Scale of force which is applied to the ball by weapons/explosions/etc" +set g_keepawayball_respawntime 15 "if no one picks up the ball, how long to wait until the ball respawns" +seta g_keepaway_teams_override 0 +set g_keepaway_teams 0 + // so it can be stuffcmd-ed still set cl_gravity 800 "but ignored anyway" @@ -1780,6 +1811,7 @@ alias cl_hook_gamestart_as alias cl_hook_gamestart_rc alias cl_hook_gamestart_nexball alias cl_hook_gamestart_cts +alias cl_hook_gamestart_ka alias cl_hook_gameend alias cl_hook_activeweapon @@ -1800,6 +1832,7 @@ alias sv_hook_gamestart_as alias sv_hook_gamestart_rc alias sv_hook_gamestart_nexball alias sv_hook_gamestart_cts +alias sv_hook_gamestart_ka alias sv_hook_gamerestart alias sv_hook_gameend @@ -2031,3 +2064,11 @@ exec _hud_descriptions.cfg // exec the default skin config // please add any new cvars into the hud_save script in qcsrc/client/hud.qc for consistency exec hud_luminos.cfg + +set g_weapon_charge_colormod_hdrmultiplier 4 "how much to multiply the colors by in the colormod vector" +set g_weapon_charge_colormod_red_half 0 +set g_weapon_charge_colormod_green_half 0.5 +set g_weapon_charge_colormod_blue_half 1 +set g_weapon_charge_colormod_red_full 1 +set g_weapon_charge_colormod_green_full -0.5 +set g_weapon_charge_colormod_blue_full -1