Merge branch 'master' into martin-t/uncrustify

diff --cc qcsrc/client/view.qc
Simple merge

diff --cc qcsrc/common/debug.qh
Simple merge

diff --cc qcsrc/common/effects/qc/globalsound.qc
Simple merge

diff --cc qcsrc/common/effects/qc/globalsound.qh
Simple merge

diff --cc qcsrc/common/mapinfo.qc
Simple merge

diff --cc qcsrc/common/notifications/all.inc
Simple merge

diff --cc qcsrc/common/triggers/func/conveyor.qc
Simple merge

diff --cc qcsrc/common/triggers/func/door.qc
Simple merge

diff --cc qcsrc/common/triggers/func/door_secret.qc
Simple merge

diff --cc qcsrc/common/triggers/func/pointparticles.qc
Simple merge

diff --cc qcsrc/common/triggers/misc/laser.qc
Simple merge

diff --cc qcsrc/common/triggers/misc/teleport_dest.qc
Simple merge

diff --cc qcsrc/common/triggers/platforms.qc
Simple merge

diff --cc qcsrc/common/vehicles/sv_vehicles.qc
Simple merge

diff --cc qcsrc/common/vehicles/vehicle/bumblebee.qc
Simple merge

diff --cc qcsrc/common/viewloc.qc
index e20b660e57dd773a3cf3b2d98a6c276fbfbfd8ad,e4e5ba991bec4fafa3dfc4bfbe278d69f4e2214c..27cc849da3b99cbaa8abd6d3b7c8526aa6bf696a
--- 1/qcsrc/common/viewloc.qc
--- 2/qcsrc/common/viewloc.qc
+++ b/qcsrc/common/viewloc.qc
@@@ -49,13 -50,15 +50,15 @@@ void viewloc_PlayerPhysics(entity this
                }
  
                //if(!PHYS_INPUT_BUTTON_CROUCH(this) && !IS_DUCKED(this))
+               if(!(this.viewloc.spawnflags & VIEWLOC_FREEMOVE))
+               {
  #ifdef SVQC
                        //PHYS_INPUT_BUTTON_CROUCH(this) = (old_movement_x < 0);
 -                      if (old_movement.x < 0)
 +                      if (old_movement.x < 0) {
                                PHYS_INPUT_BUTTON_CROUCH(this) = true;
 +                      }
  #elif defined(CSQC)
 -                      if (old_movement.x < 0)
 -                      {
 +                      if (old_movement.x < 0) {
                                input_buttons |= BIT(4);
                                this.flags |= FL_DUCKED;
                        }

diff --cc qcsrc/lib/warpzone/server.qc
Simple merge

diff --cc qcsrc/server/bot/default/bot.qc
Simple merge

diff --cc qcsrc/server/bot/default/navigation.qc
Simple merge

diff --cc qcsrc/server/g_world.qc
Simple merge

diff --cc qcsrc/server/mutators/mutator/gamemode_freezetag.qc
Simple merge

diff --cc qcsrc/server/player.qc
Simple merge

diff --cc qcsrc/server/utils.qh
Simple merge