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 fbed63fc40b671ffb09f0d43d11eb5a9eecf5bad..8e47e6fa5bd880bc815444ae80c154985793ca6a 100644 (file)
--- a/qcsrc/client/Defs.qc
+++ b/qcsrc/client/Defs.qc
@@ -260,3 +260,14 @@ vector w_org, w_backoff;
 
 float campingrifle_scope;
 float nex_scope;
+
+float cr_maxbullets;
+
+float bgmtime;
+
+string weaponorder_byimpulse;
+string weaponorder_bypriority;
+
+float nex_charge_movingavg;
+
+float serverflags;