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

author Nick S <nick@teichisma.info>

Tue, 7 Feb 2023 13:24:53 +0000 (15:24 +0200)

committer Nick S <nick@teichisma.info>

Tue, 7 Feb 2023 13:24:53 +0000 (15:24 +0200)
author Nick S <nick@teichisma.info>
Tue, 7 Feb 2023 13:24:53 +0000 (15:24 +0200)
committer Nick S <nick@teichisma.info>
Tue, 7 Feb 2023 13:24:53 +0000 (15:24 +0200)
diff --cc qcsrc/common/mapobjects/trigger/jumppads.qc
Simple merge
author	Nick S <nick@teichisma.info>
	Tue, 7 Feb 2023 13:24:53 +0000 (15:24 +0200)
committer	Nick S <nick@teichisma.info>
	Tue, 7 Feb 2023 13:24:53 +0000 (15:24 +0200)