X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=defaultXonotic.cfg;h=a536af133f8faa85618b1401edb72f84b032208c;hb=588aa51e32e49279fce822b415e754460b0c45c1;hp=fee2e6b752ecd68b6e6f53069a071a6e69812229;hpb=ee38b5a0b6d863502744e7fdbb3e3d9a0a394147;p=xonotic%2Fxonotic-data.pk3dir.git diff --git a/defaultXonotic.cfg b/defaultXonotic.cfg index fee2e6b75..a536af133 100644 --- a/defaultXonotic.cfg +++ b/defaultXonotic.cfg @@ -52,6 +52,7 @@ alias asay_drop "say_team (%l) dropped %w ; impulse 17" // other aliases alias +hook +button6 alias -hook -button6 +alias use "impulse 21" alias ready "cmd ready" alias lockteams "sv_cmd lockteams" alias unlockteams "sv_cmd unlockteams" @@ -319,7 +320,7 @@ set sv_ready_restart_repeatable 0 "allows the players to restart the game as oft seta cl_hitsound 1 "play a hit notifier sound when you have hit an enemy" set cl_hitsound_antispam_time 0.05 "don't play the hitsound more often than this" -seta cl_eventchase_death 0 "camera goes into 3rd person mode when the player is dead" +seta cl_eventchase_death 1 "camera goes into 3rd person mode when the player is dead" seta cl_eventchase_distance 140 "final camera distance" seta cl_eventchase_speed 1.3 "how fast the camera slides back, 0 is instant" @@ -493,7 +494,7 @@ seta g_antilag 2 "AntiLag (0 = no AntiLag, 1 = verified client side hit scan, 2 set g_trueaim_minrange 44 "TrueAim minimum range (TrueAim adjusts shots so they hit the crosshair point even though the gun is not at the screen center)" set g_antilag_nudge 0 "don't touch" set g_antilag_bullets 1 "Bullets AntiLag (0 = no AntiLag, 1 = server side hit scan in the past) - DO NOT TOUCH (severely changes weapon balance)" -set g_shootfromclient 1 "let client decide if it has the gun left or right; if set to 2, center handedness is allowed, and defaulted to, too; see also cl_gunalign" +set g_shootfromclient 2 "let client decide if it has the gun left or right; if set to 2, center handedness is allowed; see also cl_gunalign" set g_shootfromeye 0 "shots are fired from your eye/crosshair; visual gun position can still be influenced by cl_gunalign 1 and 2" set g_shootfromcenter 0 "weapon gets moved to the center, shots still come from the barrel of your weapon; visual gun position can still be influenced by cl_gunalign 1 and 2" set g_shootfromfixedorigin "" "if set to a string like 0 y z, the gun is moved to the given y and z coordinates. If set to a string like x y z, the whole shot origin is used" @@ -910,7 +911,7 @@ r_shadow_realtime_world_lightmaps 1 seta r_ambient 4 cl_decals_fadetime 5 cl_decals_time 2 -seta cl_gunalign 3 "Gun alignment; 1 = right, 2 = left, 3 = center or right, 4 = center or left" +seta 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" seta cl_nogibs 0 "reduce number of violence effects, or remove them totally" seta cl_particlegibs 0 "simpler gibs" seta cl_gibs_damageforcescale 3.5 "force to push around gibs" @@ -1026,6 +1027,7 @@ bind MWHEELDOWN weapprev bind r reload bind BACKSPACE dropweapon bind g dropweapon +// TODO change this to "use" once we can bind f +use // misc @@ -1227,6 +1229,7 @@ set g_nick_flood_penalty 0.5 "duration of the nick flood penalty" set g_nick_flood_penalty_yellow 3 "number of changes to allow before warning and movement blocking" set g_nick_flood_penalty_red 30 "number of changes to allow before totally disorienting the player" +seta g_waypointsprite_uppercase 1 set g_waypointsprite_normdistance 512 set g_waypointsprite_minscale 0.5 set g_waypointsprite_minalpha 0.4 @@ -1237,6 +1240,7 @@ set g_waypointsprite_deadlifetime 1 set g_waypointsprite_limitedrange 5120 set g_waypointsprite_stuffbinds 0 seta g_waypointsprite_scale 1 +seta g_waypointsprite_fontsize 12 seta g_waypointsprite_alpha 1 "This allows the client to control transparency of the waypoint" seta g_waypointsprite_edgefadealpha 0.5 "alpha multiplier near the edge" seta g_waypointsprite_edgefadescale 1 "scale multiplier near the edge" @@ -1285,7 +1289,6 @@ set g_balance_keyhunt_delay_round 5 set g_balance_keyhunt_delay_tracking 10 set g_balance_keyhunt_delay_fadeout 2 set g_balance_keyhunt_delay_collect 1.5 -set g_balance_keyhunt_delay_drop 0.4 set g_balance_keyhunt_maxdist 150 set g_balance_keyhunt_score_collect 3 set g_balance_keyhunt_score_carrierfrag 2 @@ -1363,6 +1366,7 @@ seta "userbind11_press" "say_team attacking (l:%l^7) (h:%h^7 a:%a^7 w:%w^7); g_w seta "userbind12_press" "say_team killed flagcarrier (l:%y^7); g_waypointsprite_team_p"; seta "userbind12_release" ""; seta "userbind12_description" "team: killed flag, icon" seta "userbind13_press" "say_team dropped flag (l:%d^7); g_waypointsprite_team_here_d"; seta "userbind13_release" ""; seta "userbind13_description" "team: dropped flag, icon" seta "userbind14_press" "say_team dropped gun %w^7 (l:%l^7); g_waypointsprite_team_here; wait; dropweapon"; seta "userbind14_release" ""; seta "userbind14_description" "team: drop gun, icon" +// TODO change this to "use" once we can seta "userbind15_press" "say_team dropped flag/key %w^7 (l:%l^7); g_waypointsprite_team_here; wait; +use"; seta "userbind15_release" "-use"; seta "userbind15_description" "team: drop flag/key, icon" seta "userbind16_press" "say :-) / nice one"; seta "userbind16_release" ""; seta "userbind16_description" "chat: nice one" seta "userbind17_press" "say good game"; seta "userbind17_release" ""; seta "userbind17_description" "chat: good game" @@ -1618,8 +1622,9 @@ seta v_kicktime $v_kicktime seta r_subdivisions_tolerance $r_subdivisions_tolerance // ticrate -sys_ticrate 0.0166667 -cl_netfps 60 // should match +//sys_ticrate 0.0166667 +sys_ticrate 0.0333333 +cl_netfps 60 // should match or be a multiple sv_gameplayfix_delayprojectiles 0 sv_gameplayfix_q2airaccelerate 1 sv_gameplayfix_stepmultipletimes 1 @@ -1912,7 +1917,7 @@ seta cl_vehicle_spiderbot_cross_alpha 0.6 seta cl_vehicle_spiderbot_cross_size 1 //cl_gunalign calculator -seta menu_cl_gunalign 3 "Gun alignment; 1 = right, 2 = left, 3 = center or right, 4 = center or left" +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" alias _gunalign_01 "cl_gunalign 1" alias _gunalign_02 "cl_gunalign 2" alias _gunalign_03 "cl_gunalign 3" @@ -1961,6 +1966,7 @@ set speedmeter 0 "print landing speeds" set developer_shtest 0 "experimental speedhack detection" set waypoint_benchmark 0 "quit after waypoint loading to benchmark bot navigation code" set g_debug_bot_commands 0 "print scripted bot commands before executing" +set g_debug_defaultsounds 0 "always use default sounds" // debug cvars for keyhunt attaching set _angles "0 0 0" @@ -2061,7 +2067,7 @@ sv_cullentities_trace 1 r_cullentities_trace 0 // less "lagging" of other players, but also less PL tolerant... let's try this -sv_clmovement_inputtimeout 0.05 +sv_clmovement_inputtimeout 0.07 // more than 2, less than 3 server frames // exact gloss looks better, e.g. on g-23 r_shadow_glossexact 1 @@ -2130,11 +2136,15 @@ set g_playerstats_debug 0 "when 1, player stats are dumped to the console too" // create this cvar in case the engine did not set snd_soundradius 1200 +// declare the channels we use +seta snd_channel8volume 1 "QuakeC controlled background music volume" +seta snd_channel9volume 1 "QuakeC controlled ambient sound volume" + // loading screen scr_loadingscreen_background 0 scr_loadingscreen_barcolor "0 0.5 1" scr_loadingscreen_barheight 12 -scr_loadingscreen_count 12 +scr_loadingscreen_count 13 scr_loadingscreen_scale 999 scr_loadingscreen_scale_base 1 scr_loadingscreen_scale_limit 2 @@ -2149,6 +2159,7 @@ exec ctfscoring-ai.cfg exec effects-normal.cfg exec physicsX.cfg exec turrets.cfg +exec vehicles.cfg // hud cvar descriptions exec _hud_descriptions.cfg