Merge remote-tracking branch 'origin/zykure/playerstats' into samual/combined_updates
authorSamual Lenks <samual@xonotic.org>
Mon, 19 Aug 2013 17:14:18 +0000 (13:14 -0400)
committerSamual Lenks <samual@xonotic.org>
Mon, 19 Aug 2013 17:14:18 +0000 (13:14 -0400)
Conflicts:
qcsrc/server/cl_client.qc
qcsrc/server/miscfunctions.qc

1  2 
qcsrc/menu/menu.qc
qcsrc/server/cl_client.qc
qcsrc/server/defs.qh
qcsrc/server/miscfunctions.qc
qcsrc/server/progs.src

Simple merge
@@@ -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
Simple merge
@@@ -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;
  
@@@ -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