Merge branch 'master' into drjaska/effectinfo

diff --cc commands.cfg
index 1d83e6be9d2ee9c9ebf3ef24890bd773c9419132,3a1ab30b706b3a3a6f57ee6815732969f0fe415a..9a10ccf745e9acb8f80ee066a37168a6eb4381c6
--- 1/commands.cfg
--- 2/commands.cfg
+++ b/commands.cfg
@@@ -149,14 -150,11 +150,18 @@@ alias radar "qc_cmd_cl hud radar ${* ?}
  alias scoreboard_columns_help "qc_cmd_cl hud scoreboard_columns_help"
  alias scoreboard_columns_set "qc_cmd_cl hud scoreboard_columns_set ${* ?}"
  
+ set _scoreboard_team_selection_available 0 // set to 1 by CSQC
+ alias _team_selection_show1 "_scoreboard_team_selection 1"
+ alias _team_selection_show0 menu_showteamselect
+ alias team_selection_show "_team_selection_show$_scoreboard_team_selection_available"
  
 +// effectinfo.txt reloading commands for clients
 +alias disabletracers "cl_particles_reloadeffects effectinfo.txt" "Disable enhanced weapon particle effect tracers"
 +alias enablebrieftracers "cl_particles_reloadeffects effectinfo-withbrieftracers.txt" "Enable enhanced weapon particle effect tracers. Durations are about quarter of a second to a second depending on the weapon"
 +alias enablelongtracers "cl_particles_reloadeffects effectinfo-withlongtracers.txt" "Enable 4 times as long tracers"
 +alias enablebrieftracersandblastredu "cl_particles_reloadeffects effectinfo-withbrieftracersandrocketblastreduction.txt" "Enable enhanced weapon particle effect tracers. Durations are about quarter of a second to a second depending on the weapon and reduce visibility blocking of devastator rocket explosions"
 +alias enablelongtracersandblastredu "cl_particles_reloadeffects effectinfo-withlongtracersandrocketblastreduction.txt" "Enable 4 times as long tracers and reduce visibility blocking of devastator rocket explosions"
 +
  // ========================================================
  //  cmd (client-to-server command) - server/command/cmd.qc
  // ========================================================