From: Rudolf Polzer Date: Sat, 21 Jan 2012 19:01:19 +0000 (+0100) Subject: Merge branch 'master' into samual/menu_updates X-Git-Tag: xonotic-v0.6.0~104 X-Git-Url: http://git.xonotic.org/?a=commitdiff_plain;h=63b5a495ebed72365993b31123d0fe4dca94737a;hp=-c;p=xonotic%2Fxonotic-data.pk3dir.git Merge branch 'master' into samual/menu_updates --- 63b5a495ebed72365993b31123d0fe4dca94737a diff --combined defaultXonotic.cfg index ccab212d4,b3092fa09..7be6999a4 --- a/defaultXonotic.cfg +++ b/defaultXonotic.cfg @@@ -22,10 -22,6 +22,10 @@@ gameversion_max 65535 // git builds se // gameversion_min = (gameversion / 100) * 100 - 100 // gameversion_max = (gameversion / 100) * 100 + 199 +// changes a cvar and reports it to the server (for the menu to notify the +// server about changes) +alias setreport "set \"$1\" \"$2\" ; sendcvar \"$1\"" + seta cl_firststart "" "how many times the client has been run" seta cl_startcount 0 "how many times the client has been run" @@@ -61,6 -57,124 +61,6 @@@ _cl_color 11 _cl_name Player _cl_playermodel models/player/erebus.iqm _cl_playerskin 0 -seta crosshair 16 -seta crosshair_color "0.6 0.8 1" -seta crosshair_alpha 0.300000 -seta crosshair_size 0.500000 -seta crosshair_dot 1 -seta crosshair_dot_alpha 1 -seta crosshair_dot_size 0.600000 -seta crosshair_dot_color "1 0 0" "when != 0, use custom color for the crosshair dot" -seta crosshair_pickup 0.25 -seta crosshair_pickup_speed 4 -seta crosshair_hitindication 0.5 -seta crosshair_hitindication_color "10 -10 -10" -seta crosshair_hitindication_speed 5 -seta crosshair_per_weapon 0 "when 1, each gun will display a different crosshair" -seta crosshair_color_per_weapon 1 "when 1, each gun will display the crosshair with a different color" -seta crosshair_effect_speed -1 "how fast (in seconds) some crosshair effects should take place, 0 = instant, -1 = 2x weapon switch time" -seta crosshair_effect_scalefade 1 "use scaling and fading for crosshair effects" -seta crosshair_hittest 1 "do a crosshair hit evaluation; also, the crosshair is scaled by the given number when aiming at an enemy, and blurred when aiming at a team mate" -seta crosshair_hittest_blur 1 "blur the crosshair if the shot is obstructed" -seta crosshair_hittest_showimpact 0 "move the crosshair to the actual impact location if obstructed" -seta crosshair_laser "" "crosshair to display when wielding the laser" -seta crosshair_laser_color "1 0.35 0.2" "crosshair color to display when wielding the laser" -seta crosshair_laser_alpha 0.75 "crosshair alpha value to display when wielding the laser" -seta crosshair_laser_size 0.4 "crosshair size when wielding the laser" -seta crosshair_shotgun "" "crosshair to display when wielding the shotgun" -seta crosshair_shotgun_color "0.7 0.7 0.7" "crosshair color to display when wielding the shotgun" -seta crosshair_shotgun_alpha 1.1 "crosshair alpha value to display when wielding the shotgun" -seta crosshair_shotgun_size 0.65 "crosshair size when wielding the shotgun" -seta crosshair_uzi "" "crosshair to display when wielding the machinegun" -seta crosshair_uzi_color "0.4 0.9 0.35" "crosshair color to display when wielding the machinegun" -seta crosshair_uzi_alpha 0.9 "crosshair alpha value to display when wielding the machinegun" -seta crosshair_uzi_size 0.6 "crosshair size when wielding the machinegun" -seta crosshair_grenadelauncher "" "crosshair to display when wielding the mortar" -seta crosshair_grenadelauncher_color "1 0.15 0" "crosshair color to display when wielding the mortar" -seta crosshair_grenadelauncher_alpha 1.15 "crosshair alpha value to display when wielding the mortar" -seta crosshair_grenadelauncher_size 0.7 "crosshair size when wielding the mortar" -seta crosshair_minelayer "" "crosshair to display when wielding the mortar" -seta crosshair_minelayer_color "0.75 0.75 0" "crosshair color to display when wielding the mortar" -seta crosshair_minelayer_alpha 1.15 "crosshair alpha value to display when wielding the mortar" -seta crosshair_minelayer_size 0.9 "crosshair size when wielding the mortar" -seta crosshair_electro "" "crosshair to display when wielding the electro" -seta crosshair_electro_color "0.35 0.5 1" "crosshair color to display when wielding the electro" -seta crosshair_electro_alpha 1 "crosshair alpha value to display when wielding the electro" -seta crosshair_electro_size 0.5 "crosshair size when wielding the electro" -seta crosshair_crylink "" "crosshair to display when wielding the crylink" -seta crosshair_crylink_color "0.85 0.25 1" "crosshair color to display when wielding the crylink" -seta crosshair_crylink_alpha 0.85 "crosshair alpha value to display when wielding the crylink" -seta crosshair_crylink_size 0.4 "crosshair size when wielding the crylink" -seta crosshair_nex "" "crosshair to display when wielding the nex gun" -seta crosshair_nex_color "0 0.9 1" "crosshair color to display when wielding the nex gun" -seta crosshair_nex_alpha 0.85 "crosshair alpha value to display when wielding the nex gun" -seta crosshair_nex_size 0.65 "crosshair size when wielding the nex gun" -seta crosshair_hagar "" "crosshair to display when wielding the hagar" -seta crosshair_hagar_color "0.85 0.5 0.35" "crosshair color to display when wielding the hagar" -seta crosshair_hagar_alpha 1 "crosshair alpha value to display when wielding the hagar" -seta crosshair_hagar_size 0.8 "crosshair size when wielding the hagar" -seta crosshair_rocketlauncher "" "crosshair to display when wielding the rocketlauncher" -seta crosshair_rocketlauncher_color "1 0.75 0.2" "crosshair color to display when wielding the rocketlauncher" -seta crosshair_rocketlauncher_alpha 1 "crosshair alpha value to display when wielding the rocketlauncher" -seta crosshair_rocketlauncher_size 0.5875 "crosshair size when wielding the rocketlauncher" -seta crosshair_porto "" "crosshair to display when wielding the porto" -seta crosshair_porto_color "0.5 1 0.5" "crosshair color to display when wielding the porto" -seta crosshair_porto_alpha 0.85 "crosshair alpha value to display when wielding the porto" -seta crosshair_porto_size 0.6 "crosshair size when wielding the porto" -seta crosshair_minstanex "" "crosshair to display when wielding the minstanex gun" -seta crosshair_minstanex_color "0.65 0.65 1" "crosshair color to display when wielding the minstanex gun" -seta crosshair_minstanex_alpha 1 "crosshair alpha value to display when wielding the minstanex gun" -seta crosshair_minstanex_size 0.4 "crosshair size when wielding the minstanex gun" -seta crosshair_hook "" "crosshair to display when wielding the hook" -seta crosshair_hook_color "0.65 1 0.85" "crosshair color to display when wielding the hook" -seta crosshair_hook_alpha 0.85 "crosshair alpha value to display when wielding the hook" -seta crosshair_hook_size 0.5 "crosshair size when wielding the hook" -seta crosshair_hlac "" "crosshair to display when wielding the H.L.A.C" -seta crosshair_hlac_color "1 0.65 0.2" "crosshair color to display when wielding the H.L.A.C." -seta crosshair_hlac_alpha 1 "crosshair alpha value to display when wielding the H.L.A.C." -seta crosshair_hlac_size 0.6 "crosshair size when wielding the H.L.A.C." -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_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.5 "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" -seta crosshair_tuba_size 1 "crosshair size when wielding the tuba" -seta crosshair_fireball "" "crosshair to display when wielding the fireball" -seta crosshair_fireball_color "0.2 1.0 0.2" "crosshair color to display when wielding the fireball" -seta crosshair_fireball_alpha 1 "crosshair alpha value to display when wielding the fireball" -seta crosshair_fireball_size 1 "crosshair size when wielding the fireball" -seta crosshair_color_by_health 0 "if enabled, crosshair color will depend on current health" - -// ring around crosshair, used for various purposes (such as indicating bullets left in clip, nex charge) -seta crosshair_ring 1 "main cvar to enable or disable normal crosshair rings" -seta crosshair_ring_inner 0 "allow inner rings to be drawn too" -seta crosshair_ring_size 2 "ring size" -seta crosshair_ring_alpha 0.2 "ring alpha" - -seta crosshair_ring_nex 1 "draw a ring showing the current charge of the nexgun" -seta crosshair_ring_nex_alpha 0.15 -seta crosshair_ring_nex_inner_alpha 0.15 -seta crosshair_ring_nex_inner_color_red 0.8 -seta crosshair_ring_nex_inner_color_green 0 -seta crosshair_ring_nex_inner_color_blue 0 -seta crosshair_ring_nex_currentcharge_scale 30 -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" seta cl_reticle 1 "control for toggling whether ANY zoom reticles are shown" seta cl_reticle_stretch 0 "whether to stretch reticles so they fit the screen (brakes image proportions)" @@@ -347,6 -461,7 +347,6 @@@ locs_enable pausable 0 set g_spawnshieldtime 1 "number of seconds you are invincible after you spawned, this shield is lost after you fire" set g_antilag 2 "AntiLag (0 = no AntiLag, 1 = verified client side hit scan, 2 = server side hit scan in the past, 3 = unverified client side hit scan)" -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 2 "let client decide if it has the gun left or right; if set to 2, center handedness is allowed; see also cl_gunalign" @@@ -1029,7 -1144,7 +1029,7 @@@ set quit_and_redirect "" "set to an IP set g_campaign 0 set g_campaign_forceteam 0 "Forces the player to a given team in campaign mode, 1 = red, 2 = blue, 3 = yellow, 4 = pink" seta g_campaign_name "xonoticbeta" -set g_campaign_skill 0 +seta g_campaign_skill -1 // -2 easy -1 medium 0 hard alias singleplayer_start "g_campaign_index 0; set scmenu_campaign_goto 0" alias singleplayer_continue "set scmenu_campaign_goto -1" @@@ -1339,8 -1454,6 +1339,8 @@@ seta v_kicktime $v_kicktim seta r_subdivisions_tolerance $r_subdivisions_tolerance seta vid_gl20 $vid_gl20 seta vid_gl13 $vid_gl13 +seta r_drawviewmodel $r_drawviewmodel +seta v_idlescale $v_idlescale // ticrate //sys_ticrate 0.0166667 @@@ -1851,6 -1964,9 +1851,9 @@@ set g_weapon_charge_colormod_blue_full set g_playerstats_uri "" set g_playerstats_debug 0 "when 1, player stats are dumped to the console too" + // autoscreenshots + set g_max_info_autoscreenshot 3 "how many info_autoscreenshot entities are allowed" + // session locking locksession 1 @@@ -1889,7 -2005,6 +1892,7 @@@ exec effects-normal.cf exec physicsX.cfg exec turrets.cfg exec vehicles.cfg +exec crosshairs.cfg // load console command aliases and settings exec commands.cfg