X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=defaultXonotic.cfg;h=37288a0647d6e12d0909fe1a56f55f22c1db52a2;hb=3354d73e9087febf36a123db9019d213d674334e;hp=ece2a622207c1855a0c8fab61f7df45e73915334;hpb=11c6695a18daf486e320c034cc9d2a42717d74b2;p=xonotic%2Fxonotic-data.pk3dir.git diff --git a/defaultXonotic.cfg b/defaultXonotic.cfg index ece2a6222..37288a064 100644 --- a/defaultXonotic.cfg +++ b/defaultXonotic.cfg @@ -178,16 +178,19 @@ seta crosshair_fireball "" "crosshair to display when wielding the fireball" seta crosshair_fireball_color "0.2 1.0 0.2" "crosshair color to display when wielding the fireball" seta crosshair_fireball_alpha 1 "crosshair alpha value to display when wielding the fireball" seta crosshair_fireball_size 1 "crosshair size when wielding the fireball" + +// ring around crosshair, used for various purposes (such as indicating bullets left in clip, nex charge) seta crosshair_ring_size 2 "bullet counter ring size for Rifle, velocity ring for Nex" -seta crosshair_campingrifle_bulletcounter_alpha 0.15 -seta crosshair_nexvelocity_alpha 0.15 -seta crosshair_nexvelocity_currentcharge_scale 30 -seta crosshair_nexvelocity_currentcharge_alpha 0.15 -seta crosshair_nexvelocity_currentcharge_color_red 0.8 -seta crosshair_nexvelocity_currentcharge_color_green 0 -seta crosshair_nexvelocity_currentcharge_color_blue 0 -seta crosshair_nexvelocity_currentcharge_movingavg_rate 0.05 +seta crosshair_ring_campingrifle_alpha 0.15 + +seta crosshair_ring_nex_outer_alpha 0.15 +seta crosshair_ring_nex_inner_alpha 0.15 +seta crosshair_ring_nex_inner_color_red 0.8 +seta crosshair_ring_nex_inner_color_green 0 +seta crosshair_ring_nex_inner_color_blue 0 +seta crosshair_ring_nex_currentcharge_scale 30 +seta crosshair_ring_nex_currentcharge_movingavg_rate 0.05 seta cl_reticle_stretch 0 "whether to stretch reticles so they fit the screen (brakes image proportions)" seta cl_reticle_item_nex 1 "draw aiming recticle for the nex weapon's zoom, 0 disables and values between 0 and 1 change alpha" @@ -255,7 +258,7 @@ cl_followmodel_up_lowpass 10 "gun following upward lowpass in 1/s" cl_rollangle 0 // amount of view tilt when strafing, default is 2.0 v_kicktime 0 // how long damage kicks of the view last, default is 0 seconds -gl_polyblend 0.5 // whether to use screen tints, default is 1 +gl_polyblend 0 // whether to use screen tints, this has now been replaced by a better system in CSQC r_motionblur 0 // motion blur value, default is 0 r_damageblur 0 // motion blur when damaged, default is 0 @@ -484,7 +487,7 @@ set g_minstagib_extralives 2 "how many extra lives you will get per powerup" set g_minstagib_ammo_start 10 "starting ammo" set g_minstagib_ammo_drop 5 "how much ammo you'll get for weapons or cells" set g_minstagib_invis_alpha 0.15 -set g_minstagib_speed_highspeed 1.25 "speed-multiplier that applies while you carry the invincibility powerup" +set g_minstagib_speed_highspeed 1.5 "speed-multiplier that applies while you carry the invincibility powerup" set g_vampire 0 "set to 1 to enable the vampire mode, where the damage done to your opponent gets added to your own health" set g_weaponarena "0" "put in a list of weapons to enable a weapon arena mode, or try \"all\" or \"most\"" set g_weaponarena_random "0" "if set to a number, only that weapon count is given on every spawn (randomly)" @@ -710,12 +713,9 @@ set g_balance_rune_regen_combo_limitmod 1 set g_balance_rune_speed_atkrate 0.66 set g_balance_curse_slow_atkrate 1.5 set g_balance_rune_speed_combo_atkrate 1.2 -set g_balance_rune_speed_moverate 1.25 -set g_balance_curse_slow_moverate 0.8 -set g_balance_rune_speed_combo_moverate 0.9 -set g_balance_rune_speed_jumpheight 1.4 -set g_balance_curse_slow_jumpheight 1.0 -set g_balance_rune_speed_combo_jumpheight 1.0 +set g_balance_rune_speed_highspeed 1.5 +set g_balance_curse_slow_highspeed 0.6 +set g_balance_rune_speed_combo_highspeed 0.9 // domination set g_domination 0 "Domination: capture and hold control points to gain points" @@ -811,7 +811,7 @@ set g_nexball_basketball_delay_hold 20 "time before a player who ca set g_nexball_basketball_delay_hold_forteam 60 "time before a ball reset when a team holds the ball for too long" set g_nexball_basketball_teamsteal 1 "1 to allow players to steal from teammates, 0 to disallow" -set g_nexball_basketball_carrier_highspeed 0.9 "speed multiplier for the ballcarrier" +set g_nexball_basketball_carrier_highspeed 0.8 "speed multiplier for the ballcarrier" set g_nexball_meter_period 1 "time to make a full cycle on the power meter" set g_nexball_basketball_meter 1 "use the power meter for basketball" @@ -1125,10 +1125,10 @@ alias cl_fbskin_green "playermodel models/player/erebus.iqm; playerskin 1; color alias cl_fbskin_red "playermodel models/player/erebus.iqm; playerskin 1; color 4 4" alias cl_fbskin_orange "playermodel models/player/erebus.iqm; playerskin 1; color 14 14" alias cl_fbskin_off "playermodel models/player/erebus.iqm; playerskin 0" -alias sv_fbskin_green "g_fullbrightplayers 1; sv_defaultcharacter 1; sv_defaultplayermodel models/player/erebus.iqm; sv_defaultplayerskin 1; sv_defaultplayercolors 51" -alias sv_fbskin_red "g_fullbrightplayers 1; sv_defaultcharacter 1; sv_defaultplayermodel models/player/erebus.iqm; sv_defaultplayerskin 1; sv_defaultplayercolors 68" -alias sv_fbskin_orange "g_fullbrightplayers 1; sv_defaultcharacter 1; sv_defaultplayermodel models/player/erebus.iqm; sv_defaultplayerskin 1; sv_defaultplayercolors 238" -alias sv_fbskin_off "g_fullbrightplayers 0; sv_defaultcharacter 0; sv_defaultplayerskin 0; sv_defaultplayercolors \"\"" +alias sv_fbskin_green "sv_defaultcharacter 1; sv_defaultplayermodel models/player/erebus.iqm; sv_defaultplayerskin 1; sv_defaultplayercolors 51" +alias sv_fbskin_red "sv_defaultcharacter 1; sv_defaultplayermodel models/player/erebus.iqm; sv_defaultplayerskin 1; sv_defaultplayercolors 68" +alias sv_fbskin_orange "sv_defaultcharacter 1; sv_defaultplayermodel models/player/erebus.iqm; sv_defaultplayerskin 1; sv_defaultplayercolors 238" +alias sv_fbskin_off "sv_defaultcharacter 0; sv_defaultplayerskin 0; sv_defaultplayercolors \"\"" seta sv_servermodelsonly 1 @@ -1358,6 +1358,8 @@ seta hud_panel_radar_rotation 0 "rotation mode: you set what points up. 0 = play seta hud_panel_radar_zoommode 0 "zoom mode: 0 = zoomed by default, 1 = zoomed when +zoom, 2 = always zoomed, 3 = always zoomed out" alias hud_panel_radar_rotate "toggle hud_panel_radar_rotation 0 1 2 3 4" +seta hud_panel_score_rankings 0 "show rankings in non-team games instead of the score difference: 1 always show my own score; 2 pure rankings" + seta hud_panel_engineinfo_framecounter_time 0.1 "time between framerate display updates" seta hud_panel_engineinfo_framecounter_decimals 0 "amount of decimals to show" seta hud_panel_engineinfo_framecounter_exponentialmovingaverage 1 "use an averaging method for calculating fps instead of counting frametime like engine does" @@ -1367,6 +1369,19 @@ seta hud_panel_engineinfo_framecounter_exponentialmovingaverage_instantupdate_ch seta hud_showbinds 1 "the way to show the keys to press in HUD messages: 0 displays commands, 1 bound keys, 2 both" seta hud_showbinds_limit 2 "maximum number of bound keys to show for a command. 0 for unlimited" +seta hud_damage 1 "an improved version of gl_polyblend, draw an image instead when hurt" +seta hud_damage_gentle_alpha_multiplier 0.25 "how much to multiply alpha of flash when using the cl_gentle version, it's much more opaque than the non-gentle version" +seta hud_damage_gentle_color "1 0.7 1" "color of flash for cl_gentle version" +seta hud_damage_color "1 0 0" "color of flash" +seta hud_damage_factor 0.025 "(damage * factor) = how much to add to the alpha value" +seta hud_damage_fade_rate 1 "how much to subtract from the alpha value each second" +seta hud_damage_maxalpha 2 "how much to limit the alpha value to" +seta hud_damage_pain_threshold 0.1 "how much alpha to ignore (must be bigger than the hud_damage_factor so that e.g. rot is ignored)" +seta hud_damage_pain_threshold_lower 1.25 "how much we lower pain_threshold with when nearing 0 health (if pain_threshold gets negative then we always draw a flash at alpha = fabs(pain_threshold)" +seta hud_damage_pain_threshold_lower_health 50 "at which health we start lowering pain_threshold" +seta hud_damage_pain_threshold_pulsating_min 0.6 "minimum value when calculating the pulse: max(pulsating_min, fabs(sin(PI * time / period))" +seta hud_damage_pain_threshold_pulsating_period 0.8 "one pulse every X seconds" + // scoreboard seta scoreboard_columns default seta scoreboard_border_thickness 1 "scoreboard border thickness" @@ -1671,6 +1686,7 @@ seta sv_gentle 0 "force gentle mode for everyone, also remove references to act seta cl_gentle 0 "client side gentle mode, master switch for removing both gibs and messages" seta cl_gentle_gibs 0 "client side gentle mode (only replaces gibs); when set to 1, white smoke replaces gibs, when set to 2, colorful clouds replace gibs" seta cl_gentle_messages 0 "client side gentle mode (only replaces frag messages/centerprints)" +seta cl_gentle_damage 0 "client side gentle mode (only replaces damage flash); when set to 1, a white flash replaces the blood image, when set to 2, a randomily colored flash is used instead" seta cl_racetimer_position 0.25 "Y-axis positioning of the race timer (from 0 to 1)" seta cl_showpressedkeys 0 "Show which movement keys someone is pressing: 1 for spectating, 2 for always" @@ -1685,7 +1701,7 @@ seta cl_showspeed_position 0.7 "Y-axis positioning of the numbers" seta cl_showacceleration 0 "show the XY acceleration of the player" seta cl_showacceleration_z 0 "include the speed on the Z-axis" seta cl_showacceleration_size 40 "height of the bar" -seta cl_showacceleration_scale 5 "X-axis scale of the bar" +seta cl_showacceleration_scale 1 "X-axis scale of the bar" seta cl_showacceleration_alpha 0.5 "alpha of the bar" seta cl_showacceleration_color_custom 0 "0 = dynamic color depending on acceleration, 1 = use custom color" seta cl_showacceleration_color "1 0 0" "color of the bar, needs cl_showacceleration_color_custom to be 1" @@ -1987,7 +2003,7 @@ set g_forced_team_otherwise "default" "action if a non listed player joins (can exec balanceXonotic.cfg exec ctfscoring-ai.cfg exec effects-normal.cfg -exec physicsNoQWBunny-xpmbased.cfg +exec physicsX0.cfg exec turrets.cfg // hud cvar descriptions