Merge remote-tracking branch 'remotes/origin/master' into mapchooser-updates

Conflicts:
	plugins/nominations.sp
	plugins/rockthevote.sp
This commit is contained in:
Ross Bemrose
2015-06-04 21:39:04 -04:00
618 changed files with 4747 additions and 103139 deletions
+1
View File
@@ -64,6 +64,7 @@ public APLRes AskPluginLoad2(Handle myself, bool late, char[] error, int err_max
|| StrEqual(game, "garrysmod", false)
|| StrEqual(game, "swarm", false)
|| StrEqual(game, "dota", false)
|| StrEqual(game, "bms", false)
|| GetEngineVersion() == Engine_Insurgency)
{
strcopy(error, err_max, "Nextmap is incompatible with this game");