X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=defaultXonotic.cfg;h=211eedcd65b89ea8611883243d55a3b3658f3696;hb=d6868c29436f076daf3e6c68e893d947ace437ff;hp=7dc17ccbdd7c55bd8fa27e0cad95285154eee60f;hpb=e8f0b7b07920103e92daac21e3b5e5653c5a86fe;p=xonotic%2Fxonotic-data.pk3dir.git diff --git a/defaultXonotic.cfg b/defaultXonotic.cfg index 7dc17ccbd..211eedcd6 100644 --- a/defaultXonotic.cfg +++ b/defaultXonotic.cfg @@ -247,6 +247,11 @@ vid_conheight 600 // menu_conwidth, menu_conheight are set inside quake.rc v_deathtilt 0 // needed for spectators (who are dead to avoid prediction) +// we want to use sRGB for our maps! +exec sRGB-disable.cfg +vid_sRGB_fallback 2 +r_hdr_glowintensity 1 + // these settings determine how much the view is affected by movement/damage cl_smoothviewheight 0.05 // time of the averaging to the viewheight value so that it creates a smooth transition for crouching and such. 0 for instant transition cl_deathfade 0 // fade screen to dark red when dead, value represents how fast the fade is (higher is faster) @@ -287,13 +292,12 @@ gl_polyblend 0 // whether to use screen tints, this has now been replaced by a b r_motionblur 0 // motion blur value, default is 0 r_damageblur 0 // motion blur when damaged, default is 0 (removed in Xonotic) -r_bloom_blur 16 -r_bloom_brighten 2.5 -r_bloom_colorexponent 1 -r_bloom_colorscale 1 -r_bloom_colorsubtract 0.15 +r_bloom_blur 6 +r_bloom_brighten 1.5 +r_bloom_colorexponent 2 +r_bloom_colorscale 1.75 +r_bloom_colorsubtract 0.1 r_bloom_resolution 320 -r_hdr_range 4 seta vid_x11_display "" "xonotic-linux-*.sh will use this to start xonotic on an other/new X display" // This can have three possible settings: @@ -395,8 +399,8 @@ seta sv_precacheitems 0 set sv_spectator_speed_multiplier 1.5 seta sv_spectate 1 "if set to 1, new clients are allowed to spectate or observe the game, if set to 0 joining clients spawn as players immediately (no spectating)" seta sv_defaultcharacter 0 "master switch, if set to 1 the further configuration for replacing all player models, skins and colors is taken from the sv_defaultplayermodel, sv_defaultplayerskin and sv_defaultplayercolors variables" -seta sv_defaultplayermodel "models/player/erebus.iqm" "default model selection, only works if sv_defaultcharacter is set to 1" -seta sv_defaultplayerskin 0 "each model has 1 or more skins (combination of model and skin = character), set which skin of the model you wish the default character to have, only works if sv_defaultcharacter is set to 1" +seta sv_defaultplayermodel "models/player/erebus.iqm" "default model selection, only works if sv_defaultcharacter is set to 1; you may append a : suffix to model names; you can specify multiple, separated by space, and a random one will be chosen" +seta sv_defaultplayerskin 0 "each model has 1 or more skins (combination of model and skin = character), set which skin of the model you wish the default character to have, only works if sv_defaultcharacter is set to 1; can be overriden by : suffix in sv_defaultplayermodel" seta sv_defaultplayermodel_red "" "\"\" means see sv_defaultplayermodel" seta sv_defaultplayerskin_red 0 seta sv_defaultplayermodel_blue "" "\"\" means see sv_defaultplayermodel" @@ -479,6 +483,7 @@ set bot_ai_aimskill_order_filter_5th 0.5 "Movement prediction filter. Used rarel // waypoint editor enable set g_waypointeditor 0 +set g_waypointeditor_auto 0 "Automatically create waypoints for bots while playing" set bot_ignore_bots 0 "When set, bots don't shoot at other bots" set bot_join_empty 0 "When set, bots also play if no player has joined the server" set bot_vs_human 0 "Bots and humans play in different teams when set. positive values to make an all-bot blue team, set to negative values to make an all-bot red team, the absolute value is the ratio bots vs humans (1 for equal count). Changes will be correctly applied only from the next game" @@ -603,8 +608,10 @@ seta g_freezetag_revive_clearspeed 1.6 "Speed at which reviving progress gets lo seta g_freezetag_revive_extra_size 100 "Distance in qu that you can stand from a frozen teammate to keep reviving him" seta g_freezetag_frozen_force 0.6 "How much to multiply the force on a frozen player with" -// 50% of the spawns shall be far away from any players -set g_spawn_furthest 0.5 +set g_spawn_furthest 0.5 "this amount of the spawns shall be far away from any players" +set g_spawn_useallspawns 0 "use all spawns, e.g. also team spawns in non-teamplay, and all spawns, even enemy spawns, in teamplay" +set g_spawn_near_teammate 0 "if set, players prefer spawns near a team mate" +set g_spawn_near_teammate_distance 640 "max distance to consider a spawn to be near a team mate" // respawn delay set g_respawn_delay 2 "number of seconds you have to wait before you can respawn again" set g_respawn_waves 0 "respawn in waves (every n seconds), intended to decrease overwhelming base attacks" @@ -912,7 +919,6 @@ gl_picmip_other 1 // so, picmip -1 is best possible quality r_mipsprites 1 r_mipskins 1 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 = center (if allowed by g_shootfromclient) or right, 2 = center (if allowed by g_shootfromclient) or left, 3 = right only, 4 = left only" @@ -925,6 +931,7 @@ seta cl_gibs_velocity_random 1 "gib throw velocity randomness scale" seta cl_gibs_velocity_up 1 "extra z velocity for gibs" seta cl_gibs_ticrate 0.1 "ticrate for gibs" seta cl_gibs_sloppy 1 "sloppy gibs, may temporarily penetrate walls" +seta cl_gibs_avelocity_scale 1 "how much angular velocity to use on gibs" seta cl_casings 1 "enable or disable bullet casings" seta cl_casings_shell_time 30 "shell casing lifetime" seta cl_casings_bronze_time 10 "bullet casings lifetime" @@ -960,7 +967,7 @@ sv_sound_watersplash "" seta cl_announcer default "name of the announcer you wish to use from data/sound/announcer" seta cl_announcer_antispam 2 "number of seconds before an announcement of the same sound can be played again" -seta cl_announcer_maptime "1" "play announcer sound telling you the remaining maptime - 0: do not play at all, 1: play at one minute, 2: play at five minutes, 3: play both" +seta cl_announcer_maptime 3 "play announcer sound telling you the remaining maptime - 0: do not play at all, 1: play at one minute, 2: play at five minutes, 3: play both" seta cl_notify_carried_items "3" "notify you of carried items when you obtain them (e.g. flags in CTF) - 0: disabled, 1: notify of taken items, 2: notify of picking up dropped items, 3: notify of both" // startmap_dm is used when running with the -listen or -dedicated commandline options @@ -1287,6 +1294,9 @@ alias "g_waypointsprite_toggle" "toggle cl_hidewaypoints" // key for that? seta cl_hidewaypoints 0 "disable static waypoints, only show team waypoints" +seta g_waypointsprites_turrets 1 "disable turret waypoints" +seta g_waypointsprites_turrets_maxdist 4000 "max distace for turret sprites" + // command extension alias qc_cmd "sv_cmd $*" // menu QC will override this to menu_cmd alias adminmsg "sv_cmd adminmsg $*" @@ -2080,10 +2090,6 @@ scr_loadingscreen_scale 999 scr_loadingscreen_scale_base 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" -alias sRGBcorrect_off "r_texture_sRGB_skin_diffuse 0;r_texture_sRGB_skin_gloss 0;r_texture_sRGB_skin_glow 0;r_texture_sRGB_reflect 0;r_texture_sRGB_skybox 0;v_gamma 1.0;r_restart" - // other config files exec balanceXonotic.cfg exec ctfscoring-ai.cfg