Merge branch 'master' into Mario/player_alpha

# Conflicts:
#	qcsrc/server/mutators/events.qh

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

diff --cc qcsrc/server/mutators/events.qh
index 6d79b20804c9b7cb6905374a48cd8f71dd922d19,864623bbae4b888f5c3ca4e56e40d70b0d513246..946c998af6963a544aef6a6b2768ebd5733a1a5d
--- 1/qcsrc/server/mutators/events.qh
--- 2/qcsrc/server/mutators/events.qh
+++ b/qcsrc/server/mutators/events.qh
@@@ -1204,12 -1204,11 +1204,21 @@@ MUTATOR_HOOKABLE(Freeze, EV_Freeze)
      /**/
  MUTATOR_HOOKABLE(Unfreeze, EV_Unfreeze);
  
+ /**
+  * Called when a player is trying to join, argument is the number of players allowed to join the match
+  */
+ #define EV_GetPlayerLimit(i, o) \
+     /** g_maxplayers */             i(int, MUTATOR_ARGV_0_int) \
+     /**/                            o(int, MUTATOR_ARGV_0_int) \
+     /**/
+ MUTATOR_HOOKABLE(GetPlayerLimit, EV_GetPlayerLimit);
++
 +/** Called when setting the player's alpha, useful for powerups */
 +#define EV_SetPlayerAlpha(i, o) \
 +    /** player */       i(entity, MUTATOR_ARGV_0_entity) \
 +    /** player alpha */ i(float, MUTATOR_ARGV_1_float) \
 +    /**/                o(float, MUTATOR_ARGV_1_float) \
 +    /** weapon alpha */ i(float, MUTATOR_ARGV_2_float) \
 +    /**/                o(float, MUTATOR_ARGV_2_float) \
 +    /**/
 +MUTATOR_HOOKABLE(SetPlayerAlpha, EV_SetPlayerAlpha);