X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=defaultXonotic.cfg;h=7ed41440f88ebbc56a349ee841a6194804cda7fe;hb=44595603cb4118272d1756d6cef0b660abf3a7e1;hp=b5d1bbfc02da2c2e08db3dffb1e3088305c74f4d;hpb=24cd62823ffd4389f0e50f2cd2aa0b0735c15710;p=xonotic%2Fxonotic-data.pk3dir.git diff --git a/defaultXonotic.cfg b/defaultXonotic.cfg index b5d1bbfc0..7ed41440f 100644 --- a/defaultXonotic.cfg +++ b/defaultXonotic.cfg @@ -161,30 +161,23 @@ cl_bobfallcycle 3 "speed of the bobfall swing" cl_bobfallspeed 200 "necessary amount of speed for bob-falling to occur" cl_bobmodel 1 // whether to have gun model move around on screen when moving (only works if cl_bob is not 0), default is 1 cl_bobmodel_side 0.2 // amount the gun sways to the sides -cl_bobmodel_speed 5 // rate at which the gun sways +cl_bobmodel_speed 10 // rate at which the gun sways cl_bobmodel_up 0.1 // amount the gun sways up and down -cl_leanmodel 1 // enables weapon leaning effect when looking around -cl_leanmodel_side_speed 0.7 "gun leaning sideways speed" -cl_leanmodel_side_limit 35 "gun leaning sideways limit" -cl_leanmodel_side_highpass1 30 "gun leaning sideways pre-highpass in 1/s" -cl_leanmodel_side_highpass 3 "gun leaning sideways highpass in 1/s" -cl_leanmodel_side_lowpass 20 "gun leaning sideways lowpass in 1/s" -cl_leanmodel_up_speed 0.65 "gun leaning upward speed" -cl_leanmodel_up_limit 50 "gun leaning upward limit" -cl_leanmodel_up_highpass1 5 "gun leaning upward pre-highpass in 1/s" -cl_leanmodel_up_highpass 15 "gun leaning upward highpass in 1/s" -cl_leanmodel_up_lowpass 20 "gun leaning upward lowpass in 1/s" + cl_followmodel 1 // enables weapon pushing / pulling effect when walking -cl_followmodel_side_speed 0.25 "gun following sideways speed" -cl_followmodel_side_limit 6 "gun following sideways limit" -cl_followmodel_side_highpass1 30 "gun following sideways pre-highpass in 1/s" -cl_followmodel_side_highpass 5 "gun following sideways highpass in 1/s" -cl_followmodel_side_lowpass 10 "gun following sideways lowpass in 1/s" -cl_followmodel_up_speed 0.5 "gun following upward speed" -cl_followmodel_up_limit 5 "gun following upward limit" -cl_followmodel_up_highpass1 60 "gun following upward pre-highpass in 1/s" -cl_followmodel_up_highpass 2 "gun following upward highpass in 1/s" -cl_followmodel_up_lowpass 10 "gun following upward lowpass in 1/s" +seta cl_followmodel_speed 0.3 "gun following speed" +seta cl_followmodel_limit 135 "gun following limit" +seta cl_followmodel_velocity_absolute 0 "make the effect ignore velocity direction changes (side effect: it causes a glitch when teleporting / passing through a warpzone)" +seta cl_followmodel_velocity_lowpass 0.05 "gun following velocity lowpass averaging time" +seta cl_followmodel_highpass 0.05 "gun following highpass averaging time" +seta cl_followmodel_lowpass 0.03 "gun following lowpass averaging time" + +cl_leanmodel 1 // enables weapon leaning effect when looking around +seta cl_leanmodel_speed 0.3 "gun leaning speed" +seta cl_leanmodel_limit 30 "gun leaning limit" +seta cl_leanmodel_highpass1 0.2 "gun leaning pre-highpass averaging time" +seta cl_leanmodel_highpass 0.2 "gun leaning highpass averaging time" +seta cl_leanmodel_lowpass 0.05 "gun leaning lowpass averaging time" 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 @@ -408,6 +401,7 @@ alias g_waypointeditor_unreachable "impulse 107" locs_enable 0 pausable 0 set g_spawnshieldtime 1 "number of seconds you are invincible after you spawned, this shield is lost after you fire" +set g_spawnshield_blockdamage 1 "how much spawn shield protects you from damage (1 = full protection)" 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_antilag_nudge 0 "don't touch" set g_shootfromeye 0 "shots are fired from your eye/crosshair; visual gun position can still be influenced by cl_gunalign 1 and 2" @@ -1346,7 +1340,7 @@ set g_frozen_damage_trigger 1 "if 1, frozen players falling into the void will d set g_frozen_force 0.6 "How much to multiply the force on a frozen player with" // player statistics server URI -set g_playerstats_uri "" "Output player statistics information to either: URL (with ://), console (with a dash like this: -), or supply a filename to output to data directory." +set g_playerstats_gamereport_uri "http://stats.xonotic.org/stats/submit" "Output player statistics information to either: URL (with ://), console (with a dash like this: -), or supply a filename to output to data directory." // autoscreenshots set g_max_info_autoscreenshot 3 "how many info_autoscreenshot entities are allowed" @@ -1395,7 +1389,6 @@ exec balance-xonotic.cfg exec effects-normal.cfg exec physicsX.cfg exec turrets.cfg -exec vehicles.cfg exec crosshairs.cfg exec gamemodes.cfg exec mutators.cfg