X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=defaultXonotic.cfg;h=b42917ba07a7534ed1bacdb84ee0d6316faa7405;hb=84f2a6cddce774e25f31050e71992c00a755e171;hp=82289bff9a2b8d674f1be5233ae52c509231ee7a;hpb=011bb51c9e023621a130c1bfe280840dbbe36b5c;p=xonotic%2Fxonotic-data.pk3dir.git diff --git a/defaultXonotic.cfg b/defaultXonotic.cfg index 82289bff9..b42917ba0 100644 --- a/defaultXonotic.cfg +++ b/defaultXonotic.cfg @@ -206,6 +206,9 @@ seta crosshair_fireball_color_green 1.0 "crosshair color green component to disp seta crosshair_fireball_color_blue 0.2 "crosshair color blue component to display when wielding the fireball" seta crosshair_fireball_color_alpha 1 "crosshair alpha value to display when wielding the fireball" seta crosshair_fireball_size 1 "crosshair size when wielding the fireball" +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" +seta cl_reticle_item_normal 1 "draw recticle when zooming with the zoom button, 0 disables and values between 0 and 1 change alpha" fov 90 seta cl_velocityzoom 0 "velocity based zooming of fov, negative values zoom out" seta cl_velocityzoomtime 0.3 "time value for averaging speed values" @@ -501,7 +504,6 @@ set g_laserguided_missile 0 "if set to 1 the rockets of the rocket launcher can set g_midair 0 "if set to 1 you can only apply damage to your opponent while he is airborne" set g_midair_shieldtime 0.3 "number of seconds you are still invincible since you lost contact to the ground" set g_spawnsound 1 "set to 0 if you don't want to hear the spawn sound when a player spawns" -set g_spawnpoints_autodrop 0 "if set to 1, automatically drop spawn point locations if they were placed too high" set g_spawnpoints_auto_move_out_of_solid 0 "if set to 1 you will see a warning if a spawn point was placed inside a solid" set g_forced_respawn 0 "if set to 1 and a player died, that player gets automatically respawned once seconds are over" set g_fullbrightplayers 0 "brightens up player models (note that the color, skin or model of the players does not change!)" @@ -547,6 +549,7 @@ set sv_dodging_wall_distance_threshold 10 "the maximum distance from a wall that set sv_dodging_sound 1 "if 1 dodging makes a sound. if 0 dodging is silent" set leadlimit 0 +set leadlimit_and_fraglimit 0 "if set, leadlimit is ANDed with fraglimit (otherwise ORed)" // this means that timelimit can be overidden globally and fraglimit can be overidden for each game mode: DM/TDM, Domination, CTF, and Runematch. seta timelimit_override -1 "Time limit overriding the mapinfo specified one (use 0 to play without limit, and -1 to use the mapinfo's limit)" @@ -910,8 +913,12 @@ alias sv_loadconfig "exec $serverconfig" alias sv_restart "say \"Server will restart at the end of the match, you will all be reconnected automatically. $* \"; quit_and_redirect self" // aliases: -alias +attack2 +button3 -alias -attack2 -button3 +alias +fire +attack +alias -fire -attack +alias +fire2 +button3 +alias -fire2 -button3 +alias +attack2 +button3 // old alias from Nexuiz +alias -attack2 -button3 // old alias name from Nexuiz alias +zoom +button4 alias -zoom -button4 alias +crouch +button5 @@ -954,8 +961,8 @@ bind 8 "impulse 8" bind 9 "impulse 9" bind 0 "impulse 14" // cycles the superweapons bind q weaplast -bind MOUSE1 +attack -bind MOUSE2 +attack2 +bind MOUSE1 +fire +bind MOUSE2 +fire2 bind MOUSE3 +zoom bind MOUSE4 weaplast bind MOUSE5 +hook @@ -989,8 +996,8 @@ bind JOY1 "+crouch" bind JOY2 "+jump" bind JOY3 "weapprev" bind JOY4 "weapnext" -bind JOY5 "+attack2" -bind JOY6 "+attack" +bind JOY5 "+fire2" +bind JOY6 "+fire" bind JOY7 "+zoom" bind JOY8 "dropweapon" bind JOY9 "menu_showteamselect" @@ -1035,7 +1042,7 @@ bind kp_minus "+userbind 18" set sv_vote_commands "restart fraglimit chmap gotomap nextmap endmatch reducematchtime extendmatchtime allready kick cointoss movetoteam_auto" "these commands can be voted" set sv_vote_only_commands "" set sv_vote_master_commands "movetoteam_red movetoteam_blue movetoteam_yellow movetoteam_pink" "maybe add kickban here (but then sv_vote_master 0)" -set rcon_restricted_commands "restart fraglimit chmap gotomap endmatch reducematchtime extendmatchtime allready kick kickban \"sv_cmd bans\" \"sv_cmd unban\" status \"sv_cmd teamstatus\" movetoteam_auto movetoteam_red movetoteam_blue movetoteam_yellow movetoteam_pink" +set rcon_restricted_commands "restart fraglimit chmap gotomap endmatch reducematchtime extendmatchtime allready kick kickban \"sv_cmd bans\" \"sv_cmd unban *\" status \"sv_cmd teamstatus\" movetoteam_auto movetoteam_red movetoteam_blue movetoteam_yellow movetoteam_pink" set sv_vote_call 1 "users can call a vote for the above commands" set sv_vote_master 1 "users can call a vote to become master" set sv_vote_master_password "" "when set, users can use \"vlogin PASSWORD\" to log in as master" @@ -1320,8 +1327,8 @@ set _hud_configure 0 "1 = configure the HUD" seta hud_configure_checkcollisions 1 "check for collisions against other panels when in hud configure mode" seta hud_configure_bg_minalpha 0.25 "minimum panel background alpha when in hud configure mode" seta hud_configure_grid 1 "snap to grid when moving/resizing panels" -seta hud_configure_grid_x 5 "snap each X pixels" -seta hud_configure_grid_y 5 "snap each Y pixels" +seta hud_configure_grid_x 0.01 "snap to X * vid_conwidth" +seta hud_configure_grid_y 0.01 "snap to Y * vid_conheight" seta hud_configure_grid_alpha 0.15 "alpha for visible grid when in configure mode" seta sbar_info_pos 0 "Y-axis distance from lower right corner for engine info prints" @@ -1368,7 +1375,7 @@ set timelimit_increment 5 set timelimit_decrement 5 set timelimit_min 5 set timelimit_max 60 -alias extendmatchtime "sv_cmd rpn /timelimit timelimit timelimit_max timelimit timelimit_increment add bound def" +alias extendmatchtime "sv_cmd rpn /timelimit timelimit timelimit_max 0 timelimit when timelimit timelimit_increment add bound def" alias reducematchtime "sv_cmd rpn /timelimit timelimit timelimit_decrement sub timelimit_min timelimit bound def" alias endmatch "timelimit -1" @@ -1479,7 +1486,6 @@ set g_jump_grunt 0 "Do you make a grunting noise every time you jump? Is it the alias allready "sv_cmd allready" -// note: these cvars use weapon NUMBERS. Use the menu to edit this cvar, or look the numbers up in qcsrc/common/constants.qh. seta cl_weaponpriority "minstanex rocketlauncher nex grenadelauncher fireball hlac hagar seeker crylink campingrifle uzi electro tuba shotgun laser hook porto" "weapon priority list" seta cl_weaponpriority_useforcycling 0 "when set, weapon cycling by the mouse wheel makes use of the weapon priority list (the special value 2 uses the weapon ID list for cycling)" seta cl_weaponpriority0 "rocketlauncher grenadelauncher hagar seeker fireball" "use impulse 200 for prev gun from this list, 210 for best gun, 220 for next gun. Default value: explosives" @@ -1691,6 +1697,7 @@ alias cl_hook_gamestart_rc alias cl_hook_gamestart_nexball alias cl_hook_gamestart_cts alias cl_hook_gameend +alias cl_hook_activeweapon alias _sv_hook_gamestart "set _sv_hook_gametype $1; _sv_hook_gamestart_stage2" alias _sv_hook_gamestart_stage2 "sv_hook_gamestart_all; sv_hook_gamestart_${_sv_hook_gametype}" @@ -1787,9 +1794,6 @@ collision_endposnudge 1 set cl_lerpanim_maxdelta_framegroups 0.05 // must be faster than fastest weapon refire set cl_lerpanim_maxdelta_server 0.1 // must be slower than slowest server controlled anim (e.g. animinfo stuff) -// FIXME temporary -set menu_font_size_snapping_fix 1 - // player ID seta _cl_userid "" "player ID (e.g. for tournaments)"