]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit - qcsrc/common/minigames/cl_minigames.qc
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)
commitaf71335a8e418edc55126a63aa65afd9353f413c
treefe797fc4c64e7c16dd18fb7c075a6d583369c2fc
parentda22c67eb84ab5c92914b797b0cc8b7d68e4fa4c
parent858873de7a8672d4a92a131e8387c62347d3a842
Merge branch 'Mario/weaponentities' into 'master'

Merge branch Mario/weaponentities (XL merge request)

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

See merge request !347
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