X-Git-Url: http://git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=xonotic-client.cfg;h=bfae64fff1b848ba039f82dd5c0061da03fd422f;hp=9dee8744cf08c855a31707978673b92abd410e0c;hb=HEAD;hpb=f2ceec6ea53a4094e47a30c226a0bb0716d24ae3

diff --git a/xonotic-client.cfg b/xonotic-client.cfg
index 9dee8744c..f71fdad12 100644
--- a/xonotic-client.cfg
+++ b/xonotic-client.cfg
@@ -69,8 +69,8 @@ seta cl_unpress_attack_on_weapon_switch 0 "automatically unpress fire and fire1
 seta cl_weapon_switch_reload 1 "When trying to switch to the currently held weapon, reload it"
 seta cl_weapon_switch_fallback_to_impulse 1 "When trying to switch to a weapon that is not available, switch to an alternative from the same impulse"
 
-seta cl_spawn_event_particles 1 "pointparticles effect whenever a player spawns"
-seta cl_spawn_event_sound 1 "sound effect whenever a player spawns"
+seta cl_spawn_event_particles 1 "pointparticles effect whenever a player spawns (if allowed by the server)"
+seta cl_spawn_event_sound 1 "sound effect whenever a player spawns (if allowed by the server)"
 //seta cl_spawn_point_model 0 "place a model at all spawn points" // still needs a model
 seta cl_spawn_point_particles 1 "pointparticles effect at all spawn points" // managed by effects-.cfg files
 seta cl_spawn_point_dist_max 1200 "maximum distance from which spawnpoint particles will be visible"
@@ -80,13 +80,12 @@ sensitivity 3
 v_gamma 1
 viewsize 100
 bgmvolume 0.75
-// fullscreen 1024x768x32bit
-vid_bitsperpixel 32
+
+// fullscreen 1024x768
 vid_fullscreen 1
 vid_width 1024
 vid_height 768
 vid_pixelheight 1
-vid_resizable 0 // cannot be turned on before it is sure it cannot cause a r_restart
 vid_desktopfullscreen 1
 prvm_language en
 set _menu_prvm_language ""
@@ -306,7 +305,7 @@ r_shadow_realtime_world_lightmaps 1
 r_shadow_realtime_world_importlightentitiesfrommap 0 // Whether build process uses keepLights is nontransparent and may change, so better make keepLights not matter.
 cl_decals_fadetime 5
 cl_decals_time 1
-seta cl_gunalign 3 "Gun alignment; 1 = center, 3 = right, 4 = left; requires reconnect"
+seta cl_gunalign 3 "Gun alignment; 1 = center, 3 = right, 4 = left; requires reconnect. In servers which override shot origin this cvar is purely visual, in servers which do not this does affect where your shots come from"
 seta cl_gunoffset "0 0 0" "Adjust the weapon viewmodel position, applies only to your own first person view and is relative to cl_gunalign"
 seta cl_nogibs 0 "reduce number of violence effects, or remove them totally"
 seta cl_particlegibs 0 "simpler gibs"
@@ -694,7 +693,16 @@ set cl_handicap 1	"multiplies damage received and divides damage dealt"
 
 seta cl_clippedspectating 1 "movement collision for spectators so that you can't pass through walls and such"
 
+// cl_autoscreenshot_screenshot is called by the server when the game ends with map name and match id as parameters
+// it takes care of hiding all the UI parts that may overlap the scoredoard before taking a screenshot
+// TODO remove "alias cl_autoscreenshot_screenshot_s;" after the next release
+// cl_autoscreenshot_screenshot_s is created by the server via stuffcmd for backwards compatibility
+// and not used by cl_autoscreenshot_screenshot, which intentionally clears it (not delete)
 seta cl_autoscreenshot 1 "Take a screenshot upon the end of a match... 0 = Disable completely, 1 = Allow sv_autoscreenshot to take a screenshot when requested, 2 = Always take an autoscreenshot anyway."
+alias _cl_autoscreenshot_save "set _con_chattime_save $con_chattime; set _hud_panel_scoreboard_fadeinspeed_save $hud_panel_scoreboard_fadeinspeed; set _menu_slowmo_save $menu_slowmo; set _scr_conheight_save $scr_conheight; set _con_textsize_save $con_textsize; set _scr_conalpha_save $scr_conalpha"
+alias _cl_autoscreenshot_set "con_chattime 0.001; hud_panel_scoreboard_fadeinspeed 999; menu_slowmo 999; scr_conheight 0; con_textsize 1; scr_conalpha 0"
+alias _cl_autoscreenshot_restore "set con_chattime $_con_chattime_save; set hud_panel_scoreboard_fadeinspeed $_hud_panel_scoreboard_fadeinspeed_save; set menu_slowmo $_menu_slowmo_save; set scr_conheight $_scr_conheight_save; set con_textsize $_con_textsize_save; set scr_conalpha $_scr_conalpha_save"
+alias cl_autoscreenshot_screenshot "alias cl_autoscreenshot_screenshot_s ""; togglemenu 0; -con_chat_maximize; _cl_autoscreenshot_save; _cl_autoscreenshot_set; defer 0.1 \"screenshot screenshots/autoscreenshot/${1}-${2}.jpg\"; defer 0.1 \"_cl_autoscreenshot_restore\""
 
 seta cl_jetpack_jump 1 "Activate jetpack by pressing jump in the air. 0 = Disable, 1 = Stop when touching ground, 2 = Enable"