Merge branch 'Mario/weaponentities' into 'master'
authorMario <zacjardine@y7mail.com>
Sun, 14 Aug 2016 02:31:49 +0000 (02:31 +0000)
committerMario <zacjardine@y7mail.com>
Sun, 14 Aug 2016 02:31:49 +0000 (02:31 +0000)
Merge branch Mario/weaponentities (XL merge request)

Purges most checks like weaponentities[0], allowing for potentially multiple weapon entities.

See merge request !347

1  2 
qcsrc/common/gamemodes/gamemode/nexball/nexball.qc
qcsrc/common/monsters/sv_monsters.qc
qcsrc/common/mutators/mutator/nades/nades.qc
qcsrc/common/weapons/weapon.qh
qcsrc/common/weapons/weapon/porto.qc
qcsrc/server/bot/default/scripting.qc
qcsrc/server/weapons/selection.qc
qcsrc/server/weapons/weaponsystem.qc

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge