X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=defaultXonotic.cfg;h=1db88b208faf9dd15925c4584a12ac6980257292;hb=c45bfd705e661594c1edbd1f8d57d2badb709e7a;hp=3d3e5a92b82a2468c20d059f09f47e4d01aa4bd5;hpb=2547fdbb338d37427cc482fbfad58f524835dbec;p=xonotic%2Fxonotic-data.pk3dir.git diff --git a/defaultXonotic.cfg b/defaultXonotic.cfg index 3d3e5a92b..1db88b208 100644 --- a/defaultXonotic.cfg +++ b/defaultXonotic.cfg @@ -205,6 +205,9 @@ seta crosshair_ring_nex_currentcharge_movingavg_rate 0.05 seta crosshair_ring_minelayer 1 seta crosshair_ring_minelayer_alpha 0.15 +seta crosshair_ring_hagar 1 +seta crosshair_ring_hagar_alpha 0.15 + seta crosshair_ring_reload 1 "main cvar to enable or disable ammo crosshair rings" seta crosshair_ring_reload_size 2.5 "reload ring size" seta crosshair_ring_reload_alpha 0.2 "reload ring alpha" @@ -216,7 +219,7 @@ 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" seta cl_zoomfactor 5 "how much +zoom will zoom (1-16)" -seta cl_zoomspeed 3.5 "how fast it will zoom (0.5-16), negative values mean instant zoom" +seta cl_zoomspeed 8 "how fast it will zoom (0.5-16), negative values mean instant zoom" seta cl_zoomsensitivity 0 "how zoom changes sensitivity (0 = weakest, 1 = strongest)" freelook 1 sensitivity 6 @@ -1493,11 +1496,11 @@ seta hud_contents_water_alpha 0.5 "alpha of the water color blend when inside it seta hud_contents_water_color "0.4 0.3 0.3" seta hud_shownames 1 "draw names and health/armor of nearby players" -seta hud_shownames_enemies 2 "1 = draw names of enemies you point at, 2 = draw names of all enemies in view" -seta hud_shownames_status 2 "1 = draw health/armor status of teammates, 2 = same as 1, but draw health/armor icons with a question mark on enemies in teamgames" -seta hud_shownames_height 15 "height of icons" +seta hud_shownames_enemies 2 "1 = draw names of enemies you point at (TODO), 2 = draw names of all enemies in view" +seta hud_shownames_status 1 "1 = draw health/armor status of teammates" +seta hud_shownames_statusbar_height 4 "height of status bar" seta hud_shownames_aspect 8 "aspect ratio of total drawing area per name" -seta hud_shownames_fontsize 13 "font size" +seta hud_shownames_fontsize 12 "font size" seta hud_shownames_decolorize 1 "1 = decolorize name in team games, 2 = decolorize always" seta hud_shownames_alpha 0.7 "alpha" seta hud_shownames_resize 1 "enable resizing of the names, then the size cvars will correspond to the maximum size" @@ -1505,6 +1508,7 @@ seta hud_shownames_mindistance 1000 "start fading alpha/size at this distance" seta hud_shownames_maxdistance 2500 "alpha/size is 0 at this distance" seta hud_shownames_antioverlap 1 "if two tags get too close to each other, fade out the one further away from you" seta hud_shownames_antioverlap_distance 125 "2d distance to other tag after which to fade out" +seta hud_shownames_offset 52 "offset (along z-axis) tag from player origin by this many units" // scoreboard seta scoreboard_columns default @@ -1525,8 +1529,8 @@ seta scoreboard_fadeoutspeed 5 "speed at which scoreboard fades out, higher is f seta scoreboard_highlight 1 "enable highlighting for rows and columns in the scoreboard" seta scoreboard_highlight_alpha 0.10 "highlight alpha value (depends on hud_scoreboard_highlight 1)" seta scoreboard_highlight_alpha_self 0.25 "self highlight alpha value" -seta scoreboard_offset_left 0.04 "how many pixels the scoreboard is offset from the left screen edge" -seta scoreboard_offset_right 0.148 "how many pixels the scoreboard is offset from the right screen edge" +seta scoreboard_offset_left 0.15 "how many pixels the scoreboard is offset from the left screen edge" +seta scoreboard_offset_right 0.15 "how many pixels the scoreboard is offset from the right screen edge" seta scoreboard_bg_scale 0.25 "scale for the tiled scoreboard background" seta accuracy_color_levels "0 20 100" "accuracy values at which a specified color (accuracy_color) will be used. If your accuracy is between 2 of these values then a mix of the Xth and X+1th colors will be used. You can specify up to 10 values, in increasing order" @@ -1625,7 +1629,7 @@ gl_texturecompression_lightcubemaps 1 gl_texturecompression_q3bsplightmaps 0 gl_texturecompression_sky 1 -set menu_mouse_absolute 0 "TODO make this seta if the engine understands this right" +seta menu_mouse_absolute 1 "use the OS mouse pointer motion for menu" seta menu_mouse_speed 1 "speed multiplier for the mouse in the menu (does not affect in-game aiming)" set menu_use_default_hostname 1 alias sethostname "set menu_use_default_hostname 0; hostname $*" @@ -2029,10 +2033,6 @@ scr_conscroll3_y 0 scr_conscroll_x -0.1 scr_conscroll_y -0.3 -scr_loadingscreen_background 0 -scr_loadingscreen_barcolor "0 0.5 1" -scr_loadingscreen_barheight 12 -scr_loadingscreen_count 1 scr_conforcewhiledisconnected 0 scr_infobar_height 12 @@ -2121,9 +2121,13 @@ set g_playerstats_debug 0 "when 1, player stats are dumped to the console too" set snd_soundradius 1200 // loading screen -scr_loadingscreen_scale 1 +scr_loadingscreen_background 0 +scr_loadingscreen_barcolor "0 0.5 1" +scr_loadingscreen_barheight 12 +scr_loadingscreen_count 12 +scr_loadingscreen_scale 999 scr_loadingscreen_scale_base 1 -scr_loadingscreen_scale_limit 1 +scr_loadingscreen_scale_limit 2 // sRGB configuration (EXPERIMENTAL, needs maps to be relit) alias sRGBcorrect_on "r_texture_sRGB_skin_diffuse 1;r_texture_sRGB_skin_gloss 1;r_texture_sRGB_skin_glow 1;r_texture_sRGB_reflect 1;r_texture_sRGB_skybox 1;v_gamma 2.2;r_restart" @@ -2133,7 +2137,7 @@ alias sRGBcorrect_off "r_texture_sRGB_skin_diffuse 0;r_texture_sRGB_skin_gloss 0 exec balanceXonotic.cfg exec ctfscoring-ai.cfg exec effects-normal.cfg -exec physicsX0.cfg +exec physicsX.cfg exec turrets.cfg // hud cvar descriptions @@ -2145,9 +2149,3 @@ exec hud_luminos.cfg // enable menu syncing alias menu_sync "menu_cmd sync" alias scoreboard_columns_set "cl_cmd scoreboard_columns_set $*" - -// BALANCE TESTING (TEMPORARY, PLEASE REMOVE LATER) -alias balanceSamual "exec balanceSamual.cfg; restart" -alias balanceFruitieX "exec balanceXonotic.cfg; restart" -bind f7 balanceSamual -bind f8 balanceFruitieX