Merge remote-tracking branch 'origin/terencehill/bot_waypoints' into terencehill...

# Conflicts:
#	qcsrc/common/triggers/trigger/jumppads.qc

diff --cc qcsrc/common/triggers/trigger/jumppads.qc
index ded21c377e291b3584dbb77be51abf8c707d478a,d10a1e33037d69ae81b22943c8ab26ed8e5ffe63..5bb6d39877ac610803f0a9fb029db9d36420554b
--- 1/qcsrc/common/triggers/trigger/jumppads.qc
--- 2/qcsrc/common/triggers/trigger/jumppads.qc
+++ b/qcsrc/common/triggers/trigger/jumppads.qc
@@@ -327,17 -325,7 +328,17 @@@ bool trigger_push_test(entity this, ent
                        entity e = spawn();
                        setsize(e, PL_MIN_CONST, PL_MAX_CONST);
                        e.dphitcontentsmask = DPCONTENTS_SOLID | DPCONTENTS_BODY | DPCONTENTS_PLAYERCLIP | DPCONTENTS_BOTCLIP;
-                       e.velocity = trigger_push_calculatevelocity(org, t, this.height);
+                       e.velocity = trigger_push_calculatevelocity(org, t, this.height, e);
 +
 +                      if(item)
 +                      {
 +                              setorigin(e, org);
 +                              tracetoss(e, e);
 +                              bool r = (trace_ent == item);
 +                              delete(e);
 +                              return r;
 +                      }
 +
                        vel = e.velocity;
                        vector best_target = '0 0 0';
                        vector best_org = '0 0 0';

diff --cc qcsrc/common/triggers/trigger/jumppads.qh
Simple merge

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