]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit - qcsrc/common/turrets/turret/phaser_weapon.qc
Merge branch 'master' into Mario/weaponentities
authorMario <mario@smbclan.net>
Mon, 8 Aug 2016 11:17:16 +0000 (21:17 +1000)
committerMario <mario@smbclan.net>
Mon, 8 Aug 2016 11:17:16 +0000 (21:17 +1000)
commit67db56b06d6333621dc19ba3b8dcf8976f5acfbb
tree7229260e98ec1f6c2bf7da22d502a2d64496d712
parenta4287628344552de70d9c1196704d4cf973fe356
parent2d338f2c2457f27336f8e68790797225592d31c2
Merge branch 'master' into Mario/weaponentities
qcsrc/common/weapons/weapon/shockwave.qc
qcsrc/common/weapons/weapon/shotgun.qc
qcsrc/server/cl_client.qc