Merge branch 'master' into terencehill/bot_waypoints

# Conflicts:
#	.gitlab-ci.yml

diff --combined qcsrc/server/command/cmd.qc
index 444e86de332bc88b2e06438716dc1bebcf1b7fcf,83c4768332184c2ff6cb30e43e8799c6f929f4cf..26b41c5b8074b1951533a7c2bb9eeb784c6c11da
--- 1/qcsrc/server/command/cmd.qc
--- 2/qcsrc/server/command/cmd.qc
+++ b/qcsrc/server/command/cmd.qc
@@@ -184,11 -184,10 +184,11 @@@ void ClientCommand_wpeditor(entity call
                        {
                                if (argv(1) == "spawn")
                                {
 +                                      string s = argv(2);
                                        if (!IS_PLAYER(caller))
                                                sprint(caller, "ERROR: this command works only if you are player\n");
                                        else
 -                                              waypoint_spawn_fromeditor(caller);
 +                                              waypoint_spawn_fromeditor(caller, (s == "crosshair"), (s == "jump"), (s == "crouch"), (s == "support"));
                                        return;
                                }
                                else if (argv(1) == "remove")
@@@ -199,17 -198,6 +199,17 @@@
                                                waypoint_remove_fromeditor(caller);
                                        return;
                                }
 +                              else if (argv(1) == "hardwire")
 +                              {
 +                                      string s = argv(2);
 +                                      waypoint_start_hardwiredlink(caller, (s == "crosshair"));
 +                                      return;
 +                              }
 +                              else if (argv(1) == "lock")
 +                              {
 +                                      waypoint_lock(caller);
 +                                      return;
 +                              }
                                else if (argv(1) == "unreachable")
                                {
                                        if (!IS_PLAYER(caller))
@@@ -252,28 -240,13 +252,28 @@@
                case CMD_REQUEST_USAGE:
                {
                        sprint(caller, "\nUsage:^3 cmd wpeditor action\n");
 -                      sprint(caller, "  Where 'action' can be: spawn, remove, unreachable, saveall, relinkall,\n");
 -                      sprint(caller, "   symorigin get|set\n");
 -                      sprint(caller, "   symorigin get|set p1 p2 ... pX\n");
 -                      sprint(caller, "   symaxis get|set p1 p2\n");
 -                      sprint(caller, "    where p1 p2 ... pX are positions \"x y z\" (z can be omitted)\n");
 -                      sprint(caller, " symorigin and symaxis commands are useful to determine origin/axis of symmetry"
 -                                                      " on maps without ctf flags or where flags aren't perfectly symmetrical\n");
 +                      sprint(caller, "  Where 'action' can be:\n");
 +                      sprint(caller, "   ^5spawn^7: spawns a waypoint at player's position\n");
 +                      sprint(caller, "   ^5remove^7: removes player's nearest waypoint\n");
 +                      sprint(caller, "   ^5unreachable^7: reveals waypoints and items unreachable from the current position and spawnpoints without a nearest waypoint\n");
 +                      sprint(caller, "   ^5saveall^7: saves all waypoints and links to file\n");
 +                      sprint(caller, "   ^5relinkall^7: relinks all waypoints as if they were respawned\n");
 +                      sprint(caller, "   ^5spawn crosshair^7: spawns a waypoint at crosshair's position\n");
 +                      sprint(caller, "   ^7 in general useful to create special and hardwired links with ease from existing waypoints\n");
 +                      sprint(caller, "   ^7 in particular it's the only way to create custom jumppad waypoints (spawn another waypoint to create destination))\n");
 +                      sprint(caller, "   ^5spawn jump^7: spawns a jump waypoint (place it at least 60 qu before jump start, spawn another waypoint to create destination)\n");
 +                      sprint(caller, "   ^5spawn crouch^7: spawns a crouch waypoint (it links only to very close waypoints)\n");
 +                      sprint(caller, "   ^5spawn support^7: spawns a support waypoint (spawn another waypoint to create destination from which all incoming links are removed)\n");
 +                      sprint(caller, "   ^7 useful to replace links to problematic jumppad/teleport waypoints\n");
 +                      sprint(caller, "   ^5hardwire^7: marks the nearest waypoint as origin of a new hardwired link (spawn another waypoint over an existing one to create destination)\n");
 +                      sprint(caller, "   ^5hardwire crosshair^7: marks the waypoint at crosshair instead of the nearest waypoint\n");
 +                      sprint(caller, "   ^5lock^7: locks link display of the aimed waypoint (unlocks if no waypoint is found at crosshair's position)\n");
 +                      sprint(caller, "   ^5symorigin get|set\n");
 +                      sprint(caller, "   ^5symorigin get|set p1 p2 ... pX\n");
 +                      sprint(caller, "   ^5symaxis get|set p1 p2\n");
 +                      sprint(caller, "   ^7 where p1 p2 ... pX are positions (\"x y z\", z can be omitted) that you know are perfectly symmetrical"
 +                                                              " so you can determine origin/axis of symmetry of maps without ctf flags or where flags aren't perfectly symmetrical\n");
 +                      sprint(caller, "  See 'wpeditor_menu' for a selectable list of various commands and useful settings to edit waypoints.\n");
                        return;
                }
        }
@@@ -355,7 -328,7 +355,7 @@@ void ClientCommand_physics(entity calle
  
                        if (Physics_Valid(command) || command == "default")
                        {
-                               stuffcmd(caller, strcat("\nseta cl_physics ", command, "\nsendcvar cl_physics\n"));
+                               stuffcmd(caller, strcat("\nseta cl_physics ", command, "\n"));
                                sprint(caller, strcat("^2Physics set successfully changed to ^3", command, "\n"));
                                return;
                        }
@@@ -910,6 -883,7 +910,7 @@@ void SV_ParseClientCommand(entity this
                case "prespawn": break;                            // handled by engine in host_cmd.c
                case "sentcvar": break;                            // handled by server in this file
                case "spawn": break;                               // handled by engine in host_cmd.c
+               case "color": case "topcolor": case "bottomcolor": if(teamplay) return; else break; // handled by engine in host_cmd.c
                case "c2s": Net_ClientCommand(this, command); return; // handled by net.qh
  
                default:

diff --combined xonotic-client.cfg
index e7a0ec1a0a3e20b9c0d4b308f73a390cf0e0f70b,fa9b9ca00f9d395f1d512f1bfcf1b2d38aad9521..0bb2d446d5a6c5083fc6f70924151cc718dab084
--- 1/xonotic-client.cfg
--- 2/xonotic-client.cfg
+++ b/xonotic-client.cfg
@@@ -2,8 -2,8 +2,8 @@@
  // if you want to reset your client to defaults, it's probably a better idea to delete (parts of) config.cfg and restart
  
  
- // changes a cvar and reports it to the server (for the menu to notify the
- // server about changes)
+ // changes a cvar and reports it to the server (for the client to notify the server about changes)
+ // DEPRECATED, cvars can be set in the client code to be sent automatically (using REPLICATE)
  alias setreport "set \"$1\" \"$2\" ; sendcvar \"$1\""
  
  seta cl_firststart "" "how many times the client has been run"
@@@ -75,7 -75,6 +75,6 @@@ sensitivity 
  v_gamma 1
  viewsize 100
  bgmvolume 1
- volume 0.5
  // fullscreen 1024x768x32bit
  vid_bitsperpixel 32
  vid_fullscreen 1
@@@ -234,8 -233,6 +233,8 @@@ cl_movement 
  cl_movement_track_canjump 0
  cl_stairsmoothspeed 200
  
 +alias wpeditor_menu "quickmenu file \"\" wpeditor.txt"
 +
  alias g_waypointeditor_spawn         "wpeditor spawn"
  alias g_waypointeditor_remove        "wpeditor remove"
  alias g_waypointeditor_relinkall     "wpeditor relinkall"
@@@ -307,8 -304,6 +306,6 @@@ r_glsl_offsetmapping_lod 
  r_glsl_offsetmapping_reliefmapping 0
  r_glsl_offsetmapping_scale 0.02
  
- scr_conalpha 1
- scr_conbrightness 0.2
  scr_screenshot_jpeg 1
  scr_screenshot_jpeg_quality 0.9
  
@@@ -650,9 -645,9 +647,9 @@@ alias _gl_flashblend_update_01 "gl_flas
  alias _gl_flashblend_update_11 "gl_flashblend 0"
  alias gl_flashblend_update "_gl_flashblend_update_$r_shadow_realtime_dlight$r_showsurfaces"
  
- set cl_handicap 1     "multiplies damage received and divides damage dealt NOTE: reconnect or use 'sendcvar cl_handicap' to update the choice."
+ 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. (client setting) NOTE: reconnect or use sendcvar command to update the choice."
+ seta cl_clippedspectating 1 "movement collision for spectators so that you can't pass through walls and such"
  
  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."
  
@@@ -767,7 -762,6 +764,6 @@@ scr_conalpha2factor 0.
  scr_conalpha3factor 1
  scr_conalphafactor 0.8
  scr_conbrightness 0.35
- scr_conforcewhiledisconnected 1
  scr_conscroll2_x 0.11
  scr_conscroll2_y 0.2
  scr_conscroll3_x 0