From: Jakob MG <jakob_mg@hotmail.com>
Date: Tue, 28 Sep 2010 09:54:21 +0000 (+0200)
Subject: Merge branch 'master' into tzork/ents-onoff
X-Git-Tag: xonotic-v0.1.0preview~310^2~7
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=bc51fd3d6308269b5ad770ef62b23fe98ee2cfe1;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'master' into tzork/ents-onoff

Conflicts:
	qcsrc/server/defs.qh
---

bc51fd3d6308269b5ad770ef62b23fe98ee2cfe1
diff --cc qcsrc/server/defs.qh
index 26e7075d3,d4ee31d80..f452e5110
--- a/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
  
 +#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;
++.float (float act_state) setactive;
++=======
+ .entity realowner;