]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Merge branch 'master' into Mario/mutator_minstagib
authorMario <mario.mario@y7mail.com>
Tue, 9 Apr 2013 00:39:58 +0000 (10:39 +1000)
committerMario <mario.mario@y7mail.com>
Tue, 9 Apr 2013 00:39:58 +0000 (10:39 +1000)
1  2 
qcsrc/server/autocvars.qh
qcsrc/server/cl_client.qc
qcsrc/server/cl_physics.qc
qcsrc/server/cl_player.qc
qcsrc/server/cl_weaponsystem.qc
qcsrc/server/g_damage.qc
qcsrc/server/g_world.qc
qcsrc/server/miscfunctions.qc
qcsrc/server/mutators/base.qh
qcsrc/server/progs.src
qcsrc/server/teamplay.qc

Simple merge
index a2ee7ece342a143758f54fb732510cb8b203943e,4c7d5c57564d8f7b674c610629e45faac08ab7b7..671771bcb37e580f6e77780ce36123e1f1d95763
@@@ -401,9 -401,10 +401,8 @@@ void PutObserverInServer (void
                WriteEntity(MSG_ONE, self);
        }
  
-       DropAllRunes(self);
        MUTATOR_CALLHOOK(MakePlayerObserver);
  
 -      minstagib_stop_countdown(self);
 -
        Portal_ClearAll(self);
        
        if(self.alivetime)
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge