From: terencehill <piuntn@gmail.com>
Date: Tue, 17 May 2022 17:52:36 +0000 (+0200)
Subject: Merge branch 'master' into terencehill/scoreboard_ui
X-Git-Tag: xonotic-v0.8.6~409^2~12
X-Git-Url: https://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=commitdiff_plain;h=54c73db251372d28956d780656c4a0a78a2e54ca

Merge branch 'master' into terencehill/scoreboard_ui

# Conflicts:
#	qcsrc/client/main.qc
---

54c73db251372d28956d780656c4a0a78a2e54ca
diff --cc qcsrc/client/main.qc
index b6114910e9,8bd5d78638..bf34cce82f
--- a/qcsrc/client/main.qc
+++ b/qcsrc/client/main.qc
@@@ -450,10 -454,7 +454,11 @@@ float CSQC_InputEvent(int bInputType, f
  {
  	TC(int, bInputType);
  	bool override = false;
+ 
 +	override |= HUD_Scoreboard_InputEvent(bInputType, nPrimary, nSecondary);
 +	if (override)
 +		return true;
 +
  	override |= HUD_Panel_InputEvent(bInputType, nPrimary, nSecondary);
  	if (override)
  		return true;