Merge remote-tracking branch 'origin/master' into tzork/gm_nexball
authorJakob MG <jakob_mg@hotmail.com>
Tue, 28 Feb 2012 05:42:06 +0000 (06:42 +0100)
committerJakob MG <jakob_mg@hotmail.com>
Tue, 28 Feb 2012 05:42:06 +0000 (06:42 +0100)
Conflicts:
qcsrc/server/cl_weapons.qc

1  2 
defaultXonotic.cfg
qcsrc/server/cl_client.qc
qcsrc/server/cl_player.qc
qcsrc/server/cl_weapons.qc
qcsrc/server/defs.qh
qcsrc/server/miscfunctions.qc
qcsrc/server/progs.src

Simple merge
Simple merge
Simple merge
@@@ -282,6 -318,8 +318,8 @@@ float W_IsWeaponThrowable(float w
                return 0;
        if (g_cts)
                return 0;
 -      if (g_nexball && w == WEP_PORTO)
++      if (g_nexball && w == WEP_GRENADE_LAUNCHER)
+               return 0;
  
        wb = W_WeaponBit(w);
        if(!wb)
Simple merge
Simple merge
Simple merge