X-Git-Url: https://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=xonotic-client.cfg;h=349a393c61a4150610685da12e6adfd66c926b57;hp=4ea44c0e959c00d9242ca7b99227aa4643f64d59;hb=c0896f3ad07e80af9cc46f4d48960ea048a55617;hpb=6afdf61d7ac0614d3a0c1bee447bfebc54566730

diff --git a/xonotic-client.cfg b/xonotic-client.cfg
index 4ea44c0e9..349a393c6 100644
--- a/xonotic-client.cfg
+++ b/xonotic-client.cfg
@@ -23,8 +23,15 @@ alias use "impulse 21"
 cl_particles_forcetraileffects 1
 
 alias dropweapon "impulse 17"
-alias +show_info +button7
-alias -show_info -button7
+
+alias +show_info0 "+button7"
+alias -show_info0 "-button7"
+alias +show_info1 "menu_showwelcomedialog"
+alias -show_info1 ""
+
+seta cl_welcome_in_menu_dialog 1 "1: show the welcome message in a dedicated menu dialog; 0: show it as a centerprint message"
+alias +show_info +show_info$cl_welcome_in_menu_dialog
+alias -show_info -show_info$cl_welcome_in_menu_dialog
 
 // merge lightmaps up to 2048x2048 textures
 mod_q3bsp_lightmapmergepower 4
@@ -172,13 +179,14 @@ r_motionblur 0 // motion blur value, default is 0
 r_damageblur 0 // motion blur when damaged, default is 0 (removed in Xonotic)
 net_slist_queriespersecond 60 // to be reduced if any major issues arise (ping times increased etc.)
 
+// TODO: revisit bloom settings on the GL32 renderer!
 r_bloom_blur 4
-r_bloom_brighten 2
+r_bloom_brighten 1
 r_bloom_colorexponent 1
-r_bloom_colorscale 1
+r_bloom_colorscale 1.5
 r_bloom_colorsubtract 0.125
 r_bloom_resolution 320
-r_bloom_scenebrightness 0.85
+r_bloom_scenebrightness 1
 
 seta vid_x11_display ""	"xonotic-linux-*.sh will use this to start xonotic on an other/new X display"
 // This can have three possible settings:
@@ -317,8 +325,7 @@ seta cl_casings_sloppy 1 "sloppy casings, may temporarily penetrate walls"
 seta cl_projectiles_sloppy 1 "sloppy projectiles, may temporarily penetrate walls"
 cl_stainmaps 0
 cl_particles_smoke 1
-set vid_gl20 1
-set gl_vbo 3
+gl_vbo 1 // removed in GL32 renderer
 r_glsl_deluxemapping 1
 r_glsl_offsetmapping 0
 r_glsl_offsetmapping_lod 1
@@ -399,10 +406,10 @@ set g_waypointsprite_distancealphaexponent 2
 seta g_waypointsprite_edgefadealpha 0.5 "alpha multiplier near the edge"
 seta g_waypointsprite_edgefadedistance 50 "distance in virtual pixels from edge where to start fading"
 seta g_waypointsprite_edgefadescale 1 "scale multiplier near the edge"
-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_edgeoffset_bottom 0.06 "offset of how close the waypoint can be to the bottom edge of the screen"
+seta g_waypointsprite_edgeoffset_left 0.06 "offset of how close the waypoint can be to the left edge of the screen"
+seta g_waypointsprite_edgeoffset_right 0.06 "offset of how close the waypoint can be to the right edge of the screen"
+seta g_waypointsprite_edgeoffset_top 0.06 "offset of how close the waypoint can be to the top edge of the screen"
 seta g_waypointsprite_fontsize 12
 seta g_waypointsprite_itemstime 2 "show waypoints to indicate that some important items (mega health, large armor) are about to respawn: 1 when spectating, 2 even playing in warmup stage"
 set g_waypointsprite_minscale 0.5
@@ -485,7 +492,10 @@ seta menu_tooltips 1 "menu tooltips: 0 disabled, 1 enabled, 2 also shows cvar or
 set menu_picmip_bypass 0 "bypass texture quality enforcement based on system resources, not recommended and may cause crashes!"
 set menu_showboxes 0 "show item bounding boxes (debug)"
 set menu_cvarlist_onlymodified 0 "show only modified cvars in the cvar list"
-set menu_force_on_disconnection 1 "force to show the menu this number of seconds after you get disconnected (0 to disable)"
+set menu_force_on_disconnection 1 "force to show the menu after you get disconnected"
+
+set _menu_credits_export 0 "set to 1 and restart the menu to export credits to credits.txt (menu will automatically reset to 0)"
+alias menu_credits_export "_menu_credits_export 1; menu_restart"
 
 r_textbrightness 0.2
 r_textcontrast 0.8
@@ -548,7 +558,7 @@ seta menu_slist_showlaggy 0 "show servers even if they are very high latency (se
 seta menu_slist_modfilter "" // set to either: !modname or modname. modname of = means "same as we are running now".
 
 // other serverlist cvars
-seta menu_slist_categories 1
+seta menu_slist_categories 0
 seta menu_slist_categories_onlyifmultiple 1
 seta menu_slist_purethreshold 0
 seta menu_slist_maxping 300
@@ -753,7 +763,8 @@ set cl_accuracy_data_receive 0 "1 receive weapon accuracy data statistics at the
 set developer_csqcentities 0 "csqc entity spam"
 
 seta cl_forceplayermodels 0 "make everyone look like your own model (requires server to have sv_defaultcharacter 0)"
-seta cl_forceplayercolors 0 "make enemies look like your own color (requires server to have sv_defaultcharacter 0); 2: enable it even in teamplay (only when there is exactly one enemy team); 3: enable it only playing Duel"
+seta cl_forceplayercolors 0 "make enemies look like your own color (requires server to have sv_defaultcharacter 0); 1: in all game modes without teams (if cl_forceplayercolors_unique is 0), 2: always, 3: only in Duel, 4: only in game modes with 2 teams, 5: in team games and Duel"
+seta cl_forceuniqueplayercolors 0 "assign each enemy unique colors in all game modes without teams except duel (requires server to have sv_defaultcharacter 0)"
 seta cl_forcemyplayermodel "" "set to the model file name you want to show yourself as (does not affect how enemies look with cl_forceplayermodels)"
 seta cl_forcemyplayerskin 0 "set to the skin number you want to show yourself as (does not affect how enemies look with cl_forceplayermodels)"
 seta cl_forcemyplayercolors 0 "set to the color value (encoding is same as _cl_color) for your own player model (ignored in teamplay; does not affect how enemies look with cl_forceplayermodels)"
@@ -841,6 +852,9 @@ seta cl_allow_uid2name -1 "-1 = ask if the player wants to disable/enable this f
 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)"
 seta cl_allow_uidranking 1 "0 = disable, 1 = enable uid ranking (allows statistics like elo to rank you in leaderboards)"
 
+// terms of service
+seta _termsofservice_accepted 0
+
 // 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