X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=defaultXonotic.cfg;h=05cc6c8931286d0ee81988f4a697f6eaaad336d9;hb=df087e3fdb0858fcf7596c027a62389f8e38feae;hp=2c371e86492db4c795907498ac79158c577a2dda;hpb=34ed122504b57635a885bd9e262343e07e719c3e;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/defaultXonotic.cfg b/defaultXonotic.cfg
index 2c371e864..05cc6c893 100644
--- a/defaultXonotic.cfg
+++ b/defaultXonotic.cfg
@@ -9,6 +9,7 @@
 //
 // e.g. Xonotic 1.5.1 RC1 will be 15101
 set g_xonoticversion git "Xonotic version (formatted for humans)"
+
 gameversion 100 // 0.1.0
 gameversion_min 0 // git builds see all versions
 gameversion_max 65535 // git builds see all versions
@@ -181,6 +182,7 @@ 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_size 2	"bullet counter ring size for Rifle, velocity ring for Nex"
@@ -415,7 +417,7 @@ set bot_ai_aimskill_firetolerance_mindegrees 2 "Minimum angle tolerance. Used on
 set bot_ai_aimskill_firetolerance_maxdegrees 60 "Maximum firing angle. Used on close range"
 set bot_ai_aimskill_mouse 1 "How much of the aiming filters are applied"
 set bot_ai_keyboard_distance 250 "Keyboard emulation is disabled after this distance to the goal"
-set bot_ai_keyboard_treshold 0.57
+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"
@@ -1365,7 +1367,6 @@ seta slowmo 1
 seta menu_skin "luminos"
 set menu_slowmo 1
 seta menu_sounds 0 "enables menu sound effects. 1 enables click sounds, 2 also enables hover sounds"
-set menu_picmip_bypass 0 "bypass texture quality enforcement based on system resources, not recommended and may cause crashes!"
 
 r_textbrightness 0.2
 r_textcontrast 0.8
@@ -1742,7 +1743,7 @@ set camera_speed_roll 		0.9	"Camera rotation speed"
 set camera_speed_chase 		4	"Camera movement speed on the x/y/z axis while chasing the player"
 set camera_speed_free 		8	"Camera movement speed on the x/y/z axis in free mode"
 set camera_speed_attenuation 	10	"Camera movements attenuation factor. Bigger is smoother. Applies to mouse movements"
-set camera_mouse_treshold 	0.5	"Use to ignore small mouse movements. This allows for smoother camera control"
+set camera_mouse_threshold 	0.5	"Use to ignore small mouse movements. This allows for smoother camera control"
 set camera_chase_smoothly 	0	"Attenuate player movements (only in chase mode)"
 set camera_look_player		0	"Always look to the player. Mouse input is ignored in this mode"
 set camera_look_attenuation 	8	"Attenuation of \"looking\" movements, only if camera_look_player is set. Bigger is smoother"
@@ -2048,6 +2049,8 @@ set cl_db_saveasdump 0 "write client.db in dump format (loads slower, easier to
 
 // 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)"
+seta cl_allow_uidtracking 1 "-1 = ask if the player wants to disable/enable this feature, 0 = disable, 1 = enable uid tracking (allows associating your data with your player ID)"
+// FIXME set to -1 before release, once we have a dialog for this!
 
 // polygonoffset for submodel SUCKS SUCKS SUCKS (only a hack for quake1, we don't need that)
 r_polygonoffset_submodel_offset 0