X-Git-Url: https://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=defaultXonotic.cfg;h=7a7daae6d279ba96c99ba32241d08ea6d0ba8721;hp=145312227d4bfb0d2c72571bb432eb1433bc87b2;hb=44effb3a66f8b44d05106ff361ef5fc126fef03b;hpb=2e8eb5e57c799ac076bf9d5b82711fb9cacceec5 diff --git a/defaultXonotic.cfg b/defaultXonotic.cfg index 145312227..0db263b24 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" @@ -173,10 +174,10 @@ seta crosshair_seeker "" "crosshair to display when wielding the TAG Seeker" seta crosshair_seeker_color "1 0.35 0.35" "crosshair color to display when wielding the TAG seeker" seta crosshair_seeker_alpha 0.9 "crosshair alpha value to display when wielding the TAG seeker" seta crosshair_seeker_size 0.8 "crosshair size when wielding the TAG seeker" -seta crosshair_sniperrifle "" "crosshair to display when wielding the sniperrifle" -seta crosshair_sniperrifle_color "0.85 0.5 0.25" "crosshair color to display when wielding the sniperrifle" -seta crosshair_sniperrifle_alpha 1 "crosshair alpha value to display when wielding the sniperrifle" -seta crosshair_sniperrifle_size 0.65 "crosshair size when wielding the sniperrifle" +seta crosshair_rifle "" "crosshair to display when wielding the rifle" +seta crosshair_rifle_color "0.85 0.5 0.25" "crosshair color to display when wielding the rifle" +seta crosshair_rifle_alpha 1 "crosshair alpha value to display when wielding the rifle" +seta crosshair_rifle_size 0.65 "crosshair size when wielding the rifle" seta crosshair_tuba "" "crosshair to display when wielding the tuba" seta crosshair_tuba_color "0.85 0.5 0.25" "crosshair color to display when wielding the tuba" seta crosshair_tuba_alpha 1 "crosshair alpha value to display when wielding the tuba" @@ -205,6 +206,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 +220,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 @@ -278,7 +282,7 @@ cl_rollangle 0 // amount of view tilt when strafing, default is 2.0 v_kicktime 0 // how long damage kicks of the view last, default is 0 seconds gl_polyblend 0 // whether to use screen tints, this has now been replaced by a better system in CSQC r_motionblur 0 // motion blur value, default is 0 -r_damageblur 0 // motion blur when damaged, default is 0 +r_damageblur 0 // motion blur when damaged, default is 0 (removed in Xonotic) r_bloom_blur 8 r_bloom_brighten 3 @@ -316,8 +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_intermission 0 "camera goes into 3rd person mode when the match ends" +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" @@ -446,9 +449,9 @@ set bot_ai_keyboard_threshold 0.57 set bot_ai_aimskill_offset 0.3 "Amount of error induced to the bots aim" set bot_ai_aimskill_think 1 "Aiming velocity. Use values below 1 for slower aiming" set bot_ai_custom_weapon_priority_distances "300 850" "Define close and far distances in any order. Based on the distance to the enemy bots will choose different weapons" -set bot_ai_custom_weapon_priority_far "minstanex nex sniperrifle electro rocketlauncher grenadelauncher hagar hlac crylink laser uzi fireball seeker shotgun tuba minelayer" "Desired weapons for far distances ordered by priority" -set bot_ai_custom_weapon_priority_mid "minstanex rocketlauncher nex fireball seeker grenadelauncher electro uzi sniperrifle crylink hlac hagar shotgun laser tuba minelayer" "Desired weapons for middle distances ordered by priority" -set bot_ai_custom_weapon_priority_close "minstanex shotgun nex uzi hlac tuba seeker hagar crylink grenadelauncher electro sniperrifle rocketlauncher laser fireball minelayer" "Desired weapons for close distances ordered by priority" +set bot_ai_custom_weapon_priority_far "minstanex nex rifle electro rocketlauncher grenadelauncher hagar hlac crylink laser uzi fireball seeker shotgun tuba minelayer" "Desired weapons for far distances ordered by priority" +set bot_ai_custom_weapon_priority_mid "minstanex rocketlauncher nex fireball seeker grenadelauncher electro uzi rifle crylink hlac hagar shotgun laser tuba minelayer" "Desired weapons for middle distances ordered by priority" +set bot_ai_custom_weapon_priority_close "minstanex shotgun nex uzi hlac tuba seeker hagar crylink grenadelauncher electro rifle rocketlauncher laser fireball minelayer" "Desired weapons for close distances ordered by priority" set bot_ai_weapon_combo 1 "Enable bots to do weapon combos" set bot_ai_weapon_combo_threshold 0.4 "Try to make a combo N seconds after the last attack" set bot_ai_friends_aware_pickup_radius "500" "Bots will not pickup items if a team mate is this distance near the item" @@ -491,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" @@ -896,6 +899,8 @@ set g_multijump_add 0 "0 = make the current z velocity equal to jumpvelocity, 1 set g_multijump_speed -999999 "Minimum vertical speed a player must have in order to jump again" // effects +r_glsl_vertextextureblend_usebothalphas 1 // allows to abuse texture blending as detail texture +r_glsl_postprocess 1 r_picmipsprites 0 // Xonotic uses sprites that should never be picmipped (team mate, typing, waypoints) r_picmipworld 1 gl_picmip_world 0 @@ -907,7 +912,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" @@ -1023,6 +1028,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 @@ -1182,16 +1188,16 @@ alias cl_fbskin_green "playermodel models/player/erebus.iqm; playerskin 1; color alias cl_fbskin_red "playermodel models/player/erebus.iqm; playerskin 1; color 4 4" alias cl_fbskin_orange "playermodel models/player/erebus.iqm; playerskin 1; color 14 14" alias cl_fbskin_off "playermodel models/player/erebus.iqm; playerskin 0" -alias sv_fbskin_green "sv_defaultcharacter 1; sv_defaultplayermodel models/player/erebus.iqm; sv_defaultplayerskin 1; sv_defaultplayercolors 51" -alias sv_fbskin_red "sv_defaultcharacter 1; sv_defaultplayermodel models/player/erebus.iqm; sv_defaultplayerskin 1; sv_defaultplayercolors 68" -alias sv_fbskin_orange "sv_defaultcharacter 1; sv_defaultplayermodel models/player/erebus.iqm; sv_defaultplayerskin 1; sv_defaultplayercolors 238" +alias sv_fbskin_green "sv_defaultcharacter 1; sv_defaultplayermodel models/player/megaerebus.iqm; sv_defaultplayerskin 1; sv_defaultplayercolors 51" +alias sv_fbskin_red "sv_defaultcharacter 1; sv_defaultplayermodel models/player/megaerebus.iqm; sv_defaultplayerskin 1; sv_defaultplayercolors 68" +alias sv_fbskin_orange "sv_defaultcharacter 1; sv_defaultplayermodel models/player/megaerebus.iqm; sv_defaultplayerskin 1; sv_defaultplayercolors 238" alias sv_fbskin_off "sv_defaultcharacter 0; sv_defaultplayerskin 0; sv_defaultplayercolors \"\"" seta sv_servermodelsonly 1 cl_curl_enabled 1 -cl_curl_maxspeed 300 -sv_curl_defaulturl "http://www.xonotic.com/contentdownload/getmap.php?file=" +cl_curl_maxspeed 400 +sv_curl_defaulturl "http://www.xonotic.org/contentdownload/getmap.php?file=" set sv_curl_serverpackages_auto 1 "automatically add packs with *.serverpackage files to sv_curl_serverpackages" set sv_motd "" @@ -1224,6 +1230,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 @@ -1234,10 +1241,15 @@ 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" seta g_waypointsprite_edgefadedistance 50 "distance in virtual pixels from edge where to start fading" +seta g_waypointsprite_edgeoffset_bottom 0 "offset of how close the waypoint can be to the bottom edge of the screen" +seta g_waypointsprite_edgeoffset_left 0 "offset of how close the waypoint can be to the left edge of the screen" +seta g_waypointsprite_edgeoffset_right 0 "offset of how close the waypoint can be to the right edge of the screen" +seta g_waypointsprite_edgeoffset_top 0 "offset of how close the waypoint can be to the top edge of the screen" seta g_waypointsprite_crosshairfadealpha 0.25 "alpha multiplier near crosshair" seta g_waypointsprite_crosshairfadescale 1 "scale multiplier near the crosshair" seta g_waypointsprite_crosshairfadedistance 150 "distance in virtual pixels from crosshair where to start fading" @@ -1282,7 +1294,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 @@ -1360,6 +1371,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" @@ -1469,6 +1481,8 @@ seta hud_showbinds_limit 2 "maximum number of bound keys to show for a command. seta hud_colorflash_alpha 0.5 "starting alpha of the color flash" seta hud_damage 0.55 "an improved version of gl_polyblend for damage, draw an image instead when hurt" +seta hud_damage_blur 10 "Use postprocessing to blur the screen when you have taken damage. This can be paired with current hud damage or just used alone. Higher values = more blur" +seta hud_damage_blur_alpha 0.5 "Amount of alpha to use when merging the blurred layers back into the render. Turning this up higher will remove bloom, so it's best to find a balance" seta hud_damage_gentle_alpha_multiplier 0.10 "how much to multiply alpha of flash when using the cl_gentle version, it's much more opaque than the non-gentle version" seta hud_damage_gentle_color "1 0.7 1" "color of flash for cl_gentle version" seta hud_damage_color "1 0 0" "color of flash" @@ -1481,7 +1495,15 @@ seta hud_damage_pain_threshold_lower_health 50 "at which health we start lowerin seta hud_damage_pain_threshold_pulsating_min 0.6 "minimum value when calculating the pulse: max(pulsating_min, fabs(sin(PI * time / period))" seta hud_damage_pain_threshold_pulsating_period 0.8 "one pulse every X seconds" +seta hud_powerup 0 "power of the sharpen effect when owning the shield or strength powerups, default is 0.5" + +seta hud_postprocessing 1 "enables the ability for effects such as hud_damage_blur and hud_contents to apply a postprocessing method upon the screen - enabling this disables manual editing of the postprocess cvars" +seta hud_postprocessing_maxbluralpha 0 "maximum alpha which the blur postprocess can be, default is 0.5" +seta hud_postprocessing_maxblurradius 8 "maximum radius which the blur postprocess can be, default is 8" + seta hud_contents 1 "an improved version of gl_polyblend for liquids such as water/lava/slime, draw a filler when inside the liquid" +seta hud_contents_blur 10 "Use postprocessing to blur the screen when you are inside a liquid. Higher values = more blur" +seta hud_contents_blur_alpha 0.5 "Amount of alpha to use when merging the blurred layers back into the render. Turning this up higher will remove bloom, so it's best to find a balance" seta hud_contents_factor 1 "factor at which to multiply the current faded value." seta hud_contents_fadeintime 0.02 "factor of time it takes for the alpha level to reach normal value when entering the liquid" seta hud_contents_fadeouttime 0.1 "factor of time it takes for the alpha level to reach normal value when leaving the liquid" @@ -1493,17 +1515,19 @@ 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" 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_distance 125 "2d distance to another tag after which to fade out the one further away from you" +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 @@ -1524,8 +1548,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" @@ -1536,7 +1560,7 @@ seta accuracy_color2 "0 1 0" // for menu server list (eventually make them have engine support?) seta menu_slist_showfull 1 "show servers even if they are full and have no slots to join" seta menu_slist_showempty 1 "show servers even if they are no empty and have no opponents to play against" -set menu_slist_modfilter "=" // set to either: !modname or modname. modname of = means "same as we are running now". +seta menu_slist_modfilter "" // set to either: !modname or modname. modname of = means "same as we are running now". // for menu weapon arena set menu_weaponarena_with_laser 0 "also enable the Laser in this weapon arena" @@ -1603,8 +1627,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 @@ -1624,7 +1649,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 $*" @@ -1659,7 +1684,6 @@ set capturelimit 0 // hud: font size seta hud_fontsize 11 -seta scr_centersize 12 seta hud_width 560 // these entities are not referenced by anything directly, they just represent @@ -1672,12 +1696,12 @@ set g_jump_grunt 0 "Do you make a grunting noise every time you jump? Is it the alias allready "sv_cmd allready" -seta cl_weaponpriority "minstanex rocketlauncher nex grenadelauncher minelayer fireball hlac hagar seeker crylink sniperrifle uzi electro tuba shotgun laser hook porto" "weapon priority list" +seta cl_weaponpriority "minstanex rocketlauncher nex grenadelauncher minelayer fireball hlac hagar seeker crylink rifle 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" seta cl_weaponpriority1 "minstanex nex crylink hlac electro laser" "use impulse 201 for prev gun from this list, 211 for best gun, 221 for next gun. Default value: energy" -seta cl_weaponpriority2 "minstanex nex sniperrifle" "use impulse 202 for prev gun from this list, 212 for best gun, 222 for next gun. Default value: hitscan exact" -seta cl_weaponpriority3 "minstanex nex sniperrifle uzi shotgun" "use impulse 203 for prev gun from this list, 213 for best gun, 223 for next gun. Default value: hitscan all" +seta cl_weaponpriority2 "minstanex nex rifle" "use impulse 202 for prev gun from this list, 212 for best gun, 222 for next gun. Default value: hitscan exact" +seta cl_weaponpriority3 "minstanex nex rifle uzi shotgun" "use impulse 203 for prev gun from this list, 213 for best gun, 223 for next gun. Default value: hitscan all" seta cl_weaponpriority4 "grenadelauncher minelayer hlac hagar crylink seeker shotgun" "use impulse 204 for prev gun from this list, 214 for best gun, 224 for next gun. Default value: spam weapons" seta cl_weaponpriority5 "laser hook porto" "use impulse 205 for prev gun from this list, 215 for best gun, 225 for next gun. Default value: weapons for moving" seta cl_weaponpriority6 "" "use impulse 206 for prev gun from this list, 216 for best gun, 226 for next gun" @@ -1897,7 +1921,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" @@ -1946,6 +1970,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" @@ -2005,7 +2030,7 @@ set g_weaponreplace_porto "" set g_weaponreplace_minstanex "" set g_weaponreplace_hook "" set g_weaponreplace_hlac "" -set g_weaponreplace_sniperrifle "" +set g_weaponreplace_rifle "" set g_weaponreplace_tuba "" set g_weaponreplace_fireball "" set g_weaponreplace_seeker "" @@ -2028,16 +2053,12 @@ 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 // 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 @@ -2050,7 +2071,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 @@ -2119,10 +2140,18 @@ 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_scale 1 +scr_loadingscreen_background 0 +scr_loadingscreen_barcolor "0 0.5 1" +scr_loadingscreen_barheight 12 +scr_loadingscreen_count 13 +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" @@ -2132,8 +2161,9 @@ 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 +exec vehicles.cfg // hud cvar descriptions exec _hud_descriptions.cfg @@ -2144,9 +2174,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