Merge branch 'master' into tzork/ents-onoff

Conflicts:
	qcsrc/server/defs.qh

diff --cc qcsrc/server/defs.qh
index 26e7075d3c3943ca5b3033a90eeb4ea9bd5ad0e0,d4ee31d802d475ba8aedb5be65ec4aa6aa6e188c..f452e5110678cdf184e231ae3f00421ad03e03bc
--- 1/qcsrc/server/defs.qh
--- 2/qcsrc/server/defs.qh
+++ b/qcsrc/server/defs.qh
@@@ -636,10 -636,4 +636,12 @@@ string deathmessage
  
  .float ballistics_density; // wall piercing factor, larger = bullet can pass through more
  
- .float (float act_state) setactive;
 +#define ACTIVE_NOT            0
 +#define ACTIVE_ACTIVE         1
 +#define ACTIVE_IDLE   2
 +#define ACTIVE_BUSY   2
 +#define ACTIVE_TOGGLE 3
 +.float active;
++.float (float act_state) setactive;
++=======
+ .entity realowner;

diff --cc qcsrc/server/g_triggers.qc
Simple merge