X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=defaultXonotic.cfg;h=ea4b42fcc7510436b16b57fa3fff6724226473f2;hp=84157c2bf78089c1f3f9ac64adfc08f2ff012029;hb=fe3d394464669b17362be0ea0a2dd306bee8a322;hpb=182c29e16af46d7604372126913d09477615aa1b

diff --git a/defaultXonotic.cfg b/defaultXonotic.cfg
index 84157c2bf..ea4b42fcc 100644
--- a/defaultXonotic.cfg
+++ b/defaultXonotic.cfg
@@ -217,7 +217,15 @@ seta crosshair_fireball_alpha 1	"crosshair alpha value to display when wielding
 seta crosshair_fireball_size 1	"crosshair size when wielding the fireball"
 seta crosshair_ring_size 2	"bullet counter ring size for Rifle, velocity ring for Nex"
 seta crosshair_campingrifle_bulletcounter_alpha 0.15
+
 seta crosshair_nexvelocity_alpha 0.15
+seta crosshair_nexvelocity_currentcharge_scale 30
+seta crosshair_nexvelocity_currentcharge_alpha 0.15
+seta crosshair_nexvelocity_currentcharge_color_red 0.8
+seta crosshair_nexvelocity_currentcharge_color_green 0
+seta crosshair_nexvelocity_currentcharge_color_blue 0
+seta crosshair_nexvelocity_currentcharge_movingavg_rate 0.05
+
 seta cl_reticle_stretch 0 "whether to stretch reticles so they fit the screen (brakes image proportions)"
 seta cl_reticle_item_nex 1 "draw aiming recticle for the nex weapon's zoom, 0 disables and values between 0 and 1 change alpha"
 seta cl_reticle_item_normal 1 "draw recticle when zooming with the zoom button, 0 disables and values between 0 and 1 change alpha"
@@ -630,8 +638,9 @@ set g_ons_respawn_waves 0
 set g_rc_respawn_waves 0
 set g_rc_respawn_delay 0
 set g_cts_respawn_waves 0
-set g_cts_respawn_delay 0
+set g_cts_respawn_delay 0.25
 set g_cts_selfdamage 1 "0 = disable all selfdamage and falldamage in cts"
+set g_cts_finish_kill_delay 10 "prevent cheating by running back to the start line, and starting out with more speed than otherwise possible"
 
 // overtime
 seta timelimit_overtime 2 "duration in minutes of one added overtime, added to the timelimit"
@@ -1657,6 +1666,7 @@ set g_showweaponspawns 1	"display sprites for weapon spawns found on the map whe
 
 alias records "cmd records"
 alias rankings "cmd rankings"
+alias ladder "cmd ladder"
 
 // ballistics use physical units, but qu based
 //   Quake-Newton: 1 qN  = 1 qu * 1 g / 1 s^2
@@ -2001,3 +2011,18 @@ r_font_size_snapping 2
 // database management
 set sv_db_saveasdump 0 "write server.db in dump format (loads slower, easier to read/parse)"
 set cl_db_saveasdump 0 "write client.db in dump format (loads slower, easier to read/parse)"
+
+// uid2name
+seta cl_allow_uid2name -1 "-1 = ask if the player wants to disable/enable this feature, 0 = disable, 1 = enable uid2name (allows showing your name in race rankings for instance)"
+
+// polygonoffset for submodel SUCKS SUCKS SUCKS (only a hack for quake1, we don't need that)
+r_polygonoffset_submodel_offset 0
+r_polygonoffset_submodel_factor 0
+// workaround for "decals flicker all the time" - note that this polygonoffset still is not perfect, also, why do decals need higher polygonoffset when in a warpzone
+// this workaround causes decals to sometimes be visible through walls! (not seen it happen yet though other than on zfightometer)
+// once the issue is found, please revert back to the default of -14
+r_polygonoffset_decals_offset -100
+r_polygonoffset_decals_factor 0
+// this is mainly for _decal entities (their shaders should use "polygonoffset" shader parameter) - this is "good enough" as it seems, but smaller than the decals one so these don't zfight decals
+mod_q3shader_default_polygonoffset -50
+mod_q3shader_default_polygonfactor 0