Merge branch 'terencehill/bot_ai' into 'master'

diff --combined qcsrc/server/client.qc
index ef569519959788bd35dca4fcb00c5ea43eae0621,8ccd64b1e1eadbd29ef50c44b5503e3b8e78c2c3..0164444950cb09e1d5d7ab0989d9b9eba301cbe9
--- 1/qcsrc/server/client.qc
--- 2/qcsrc/server/client.qc
+++ b/qcsrc/server/client.qc
@@@ -622,7 -622,10 +622,10 @@@ void PutPlayerInServer(entity this
        this.angles = spot.angles;
        this.angles_z = 0; // never spawn tilted even if the spot says to
        if (IS_BOT_CLIENT(this))
+       {
                this.v_angle = this.angles;
+               bot_aim_reset(this);
+       }
        this.fixangle = true; // turn this way immediately
        this.oldvelocity = this.velocity = '0 0 0';
        this.avelocity = '0 0 0';
@@@ -1054,8 -1057,6 +1057,8 @@@ string getwelcomemessage(entity this
        return s;
  }
  
 +bool autocvar_sv_qcphysics = false; // TODO this is for testing - remove when qcphysics work
 +
  /**
  =============
  ClientConnect
@@@ -1148,7 -1149,7 +1151,7 @@@ void ClientConnect(entity this
        if (IS_REAL_CLIENT(this))
                sv_notice_join(this);
  
 -      this.move_qcphysics = true;
 +      this.move_qcphysics = autocvar_sv_qcphysics;
  
        // update physics stats (players can spawn before physics runs)
        Physics_UpdateStats(this);