From: Nick S <nick@teichisma.info>
Date: Mon, 6 Feb 2023 10:28:59 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/Juhu/q3_jumppads' into morosophos/server-current4
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=78274c6249ffa4eed8bb865ecf7e893c69845588;p=xonotic%2Fxonotic-data.pk3dir.git

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

78274c6249ffa4eed8bb865ecf7e893c69845588
diff --cc qcsrc/common/mapobjects/trigger/jumppads.qh
index 9dad3c6ea,cd41a8eea..70845017c
--- a/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(); }