From: Mario <mario.mario@y7mail.com>
Date: Thu, 11 Jul 2013 23:13:48 +0000 (+1000)
Subject: Merge branch 'master' into Mario/monsters
X-Git-Tag: xonotic-v0.8.0~241^2^2~179
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=624a2c9a6f5d3b9a91f5f935ee9ac59c83ad24bd;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'master' into Mario/monsters
---

624a2c9a6f5d3b9a91f5f935ee9ac59c83ad24bd
diff --cc qcsrc/client/Main.qc
index 86440f0db,42fadc0c1..6eef5cc0d
--- a/qcsrc/client/Main.qc
+++ b/qcsrc/client/Main.qc
@@@ -164,17 -115,7 +115,9 @@@ void CSQC_Init(void
  	precache_model("null");
  	precache_sound("misc/hit.wav");
  	precache_sound("misc/typehit.wav");
- 	if (autocvar_cl_precacheplayermodels)
- 	{
- 		precache_all_playermodels("models/player/*.zym");
- 		precache_all_playermodels("models/player/*.dpm");
- 		precache_all_playermodels("models/player/*.md3");
- 		precache_all_playermodels("models/player/*.psk");
- 		precache_all_playermodels("models/player/*.iqm");
- 	}
  
 +	Monsters_Precache();
 +	generator_precache();
  	Projectile_Precache();
  	Hook_Precache();
  	GibSplash_Precache();