From: Samual Lenks <samual@xonotic.org>
Date: Mon, 19 Aug 2013 17:14:18 +0000 (-0400)
Subject: Merge remote-tracking branch 'origin/zykure/playerstats' into samual/combined_updates
X-Git-Tag: xonotic-v0.8.0~139^2~1^2~148
X-Git-Url: https://git.xonotic.org/?a=commitdiff_plain;h=075742aea571f7811b4a96da750a8d02af97073c;p=xonotic%2Fxonotic-data.pk3dir.git

Merge remote-tracking branch 'origin/zykure/playerstats' into samual/combined_updates

Conflicts:
	qcsrc/server/cl_client.qc
	qcsrc/server/miscfunctions.qc
---

075742aea571f7811b4a96da750a8d02af97073c
diff --cc qcsrc/server/cl_client.qc
index d7ca62ba0,f09163e1f..95fc1a562
--- a/qcsrc/server/cl_client.qc
+++ b/qcsrc/server/cl_client.qc
@@@ -2404,10 -2425,13 +2405,10 @@@ void PlayerPreThink (void
  
  		if(frametime)
  			player_anim();
- 		
+ 
 -		if(g_nexball)
 -			nexball_setstatus();
 -
  		// secret status
  		secrets_setstatus();
- 		
+ 
  		self.dmg_team = max(0, self.dmg_team - autocvar_g_teamdamage_resetspeed * frametime);
  
  		//self.angles_y=self.v_angle_y + 90;   // temp
diff --cc qcsrc/server/miscfunctions.qc
index ef05b5a5b,af8067ca0..3831d8969
--- a/qcsrc/server/miscfunctions.qc
+++ b/qcsrc/server/miscfunctions.qc
@@@ -915,18 -919,10 +915,18 @@@ void readlevelcvars(void
  	CHECK_MUTATOR_ADD("g_rocket_flying", mutator_rocketflying, !cvar("g_minstagib"));
  	CHECK_MUTATOR_ADD("g_vampire", mutator_vampire, !cvar("g_minstagib"));
  	CHECK_MUTATOR_ADD("g_superspectate", mutator_superspec, 1);
 +	CHECK_MUTATOR_ADD("g_pinata", mutator_pinata, !cvar("g_minstagib"));
 +	CHECK_MUTATOR_ADD("g_midair", mutator_midair, 1);
 +	CHECK_MUTATOR_ADD("g_bloodloss", mutator_bloodloss, !cvar("g_minstagib"));
 +	CHECK_MUTATOR_ADD("g_random_gravity", mutator_random_gravity, 1);
 +	CHECK_MUTATOR_ADD("g_multijump", mutator_multijump, 1);
 +	CHECK_MUTATOR_ADD("g_melee_only", mutator_melee_only, !cvar("g_minstagib"));
 +	CHECK_MUTATOR_ADD("g_nades", mutator_nades, 1);
  	CHECK_MUTATOR_ADD("g_sandbox", sandbox, 1);
 +	CHECK_MUTATOR_ADD("g_campcheck", mutator_campcheck, 1);
- 	
+ 
  	#undef CHECK_MUTATOR_ADD
- 	
+ 
  	if(cvar("sv_allow_fullbright"))
  		serverflags |= SERVERFLAG_ALLOW_FULLBRIGHT;
  
diff --cc qcsrc/server/progs.src
index e9e9a4b8c,2997bd251..2e42a3c4b
--- a/qcsrc/server/progs.src
+++ b/qcsrc/server/progs.src
@@@ -43,10 -43,9 +43,10 @@@ mutators/gamemode_ctf.q
  mutators/gamemode_domination.qh
  mutators/gamemode_keyhunt.qh // TODO fix this
  mutators/gamemode_keepaway.qh
- mutators/gamemode_nexball.qh 
+ mutators/gamemode_nexball.qh
  mutators/gamemode_lms.qh
  mutators/mutator_dodging.qh
 +mutators/mutator_nades.qh
  
  //// tZork Turrets ////
  tturrets/include/turrets_early.qh