Merge remote-tracking branch 'origin/Juhu/q3_jumppads' into morosophos/server-current4

diff --cc qcsrc/common/mapobjects/trigger/jumppads.qc
Simple merge

diff --cc qcsrc/common/mapobjects/trigger/jumppads.qh
index 9dad3c6ea084c594fa16fddbfa08b5ad69212d9b,cd41a8eea272f0260b604a93f89e0ae07c7529fd..70845017c62051bda45c425400e10bc8a675cdfd
--- 1/qcsrc/common/mapobjects/trigger/jumppads.qh
--- 2/qcsrc/common/mapobjects/trigger/jumppads.qh
+++ b/qcsrc/common/mapobjects/trigger/jumppads.qh
@@@ -3,15 -3,8 +3,16 @@@
  
  const int PUSH_ONCE = BIT(0); // legacy, deactivate with relay instead
  const int PUSH_SILENT = BIT(1); // not used?
+ const int PUSH_STATIC = BIT(12);
  
 +const int PUSH_VELOCITY_PLAYERDIR_XY = BIT(0);
 +const int PUSH_VELOCITY_ADD_XY = BIT(1);
 +const int PUSH_VELOCITY_PLAYERDIR_Z = BIT(2);
 +const int PUSH_VELOCITY_ADD_Z = BIT(3);
 +const int PUSH_VELOCITY_BIDIRECTIONAL_XY = BIT(4);
 +const int PUSH_VELOCITY_BIDIRECTIONAL_Z = BIT(5);
 +const int PUSH_VELOCITY_CLAMP_NEGATIVE_ADDS = BIT(6);
 +
  IntrusiveList g_jumppads;
  STATIC_INIT(g_jumppads) { g_jumppads = IL_NEW(); }