Merge remote branch 'origin/master' into samual/keepaway

[xonotic/xonotic-data.pk3dir.git] / qcsrc / client / Defs.qc

diff --git a/qcsrc/client/Defs.qc b/qcsrc/client/Defs.qc
index 0fcd337732e18cb319fcdca03de2a29e48b1f05f..8e47e6fa5bd880bc815444ae80c154985793ca6a 100644 (file)
--- a/qcsrc/client/Defs.qc
+++ b/qcsrc/client/Defs.qc
@@ -266,3 +266,8 @@ float cr_maxbullets;
 float bgmtime;
 
 string weaponorder_byimpulse;
+string weaponorder_bypriority;
+
+float nex_charge_movingavg;
+
+float serverflags;