X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=defaultXonotic.cfg;h=35eb6b24efa3ea6ef570655c03f66697e50559e4;hb=695f1b7bc0b0acc3caa6aa15357538283ea099a8;hp=29d71ce9bde267daff4362d1d7d19607fbbadd1e;hpb=d1ae740c1d4fb251c89164056373b5d86888c1b7;p=xonotic%2Fxonotic-data.pk3dir.git diff --git a/defaultXonotic.cfg b/defaultXonotic.cfg index 29d71ce9b..35eb6b24e 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" @@ -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" @@ -909,7 +910,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" @@ -1025,6 +1026,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 @@ -1226,6 +1228,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 @@ -1236,6 +1239,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" @@ -1284,7 +1288,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 @@ -1362,6 +1365,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" @@ -1901,7 +1905,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" @@ -2036,8 +2040,8 @@ scr_conforcewhiledisconnected 0 scr_infobar_height 12 // DP cannot properly detect this, so rather turn off the detection -r_texture_dds_load_dxt1_noalpha 1 -r_texture_dds_load_swdecode 1 // SW decode to quarter res if we want to load DDS but don't support the extension for it +r_texture_dds_load_alphamode 2 +r_texture_dds_swdecode 1 // SW decode to quarter res if we want to load DDS but don't support the extension for it r_texture_dds_load_logfailure 0 // this engine feature SUCKS set vid_netwmfullscreen 0 // doesn't support non-native res @@ -2123,7 +2127,7 @@ set snd_soundradius 1200 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