Merge remote branch 'origin/master' into samual/updatecommands

diff --combined qcsrc/server/g_world.qc
index b023b6e8eabb9672b80c7b2a0ed2dbf999160001,5c326b8e6213ce96361b02b368b7b552231f1d60..2d673484a915fdefa5ef95fa9ace60c22f3994e2
--- 1/qcsrc/server/g_world.qc
--- 2/qcsrc/server/g_world.qc
+++ b/qcsrc/server/g_world.qc
@@@ -382,6 -382,7 +382,7 @@@ void cvar_changes_init(
                BADCVAR("leadlimit_and_fraglimit");
                BADCVAR("leadlimit_override");
                BADCVAR("pausable");
+               BADCVAR("sv_allow_fullbright");
                BADCVAR("sv_checkforpacketsduringsleep");
                BADCVAR("sv_timeout");
                BADCVAR("welcome_message_time");
@@@ -392,6 -393,7 +393,7 @@@
                BADPREFIX("net_");
                BADPREFIX("prvm_");
                BADPREFIX("skill_");
+               BADPREFIX("sv_cullentities_");
                BADPREFIX("sv_fraginfo_");
                BADPREFIX("sv_maxidle_");
                BADPREFIX("sv_vote_");
@@@ -2022,6 -2024,7 +2024,6 @@@ float WinningCondition_Race(float fragl
        return wc;
  }
  
 -void ReadyRestart();
  float WinningCondition_QualifyingThenRace(float limit)
  {
        float wc;
@@@ -2108,7 -2111,6 +2110,7 @@@ CheckRules_Worl
  Exit deathmatch games upon conditions
  ============
  */
 +void ReadyRestart();
  void CheckRules_World()
  {
        float timelimit;