Merge remote-tracking branch 'origin/bones_was_here/q3compat_gravity' into morosophos...

author Nick S <nick@teichisma.info>

Wed, 15 Feb 2023 18:38:48 +0000 (20:38 +0200)

committer Nick S <nick@teichisma.info>

Wed, 15 Feb 2023 18:38:48 +0000 (20:38 +0200)
author Nick S <nick@teichisma.info>
Wed, 15 Feb 2023 18:38:48 +0000 (20:38 +0200)
committer Nick S <nick@teichisma.info>
Wed, 15 Feb 2023 18:38:48 +0000 (20:38 +0200)
diff --cc qcsrc/common/mapobjects/trigger/jumppads.qc
Simple merge
author	Nick S <nick@teichisma.info>
	Wed, 15 Feb 2023 18:38:48 +0000 (20:38 +0200)
committer	Nick S <nick@teichisma.info>
	Wed, 15 Feb 2023 18:38:48 +0000 (20:38 +0200)