]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'master' into Mario/intrusive_2
authorMario <mario@smbclan.net>
Sat, 22 Oct 2016 17:48:51 +0000 (03:48 +1000)
committerMario <mario@smbclan.net>
Sat, 22 Oct 2016 17:48:51 +0000 (03:48 +1000)
commit8c965aa90470cfa8cbfaff88db71b6b5899a90ce
tree864a1dc02e8ce8ee72cac028815d948bd2927dba
parent604ccb93bec64f7ecb2e1c8ea999636c4230b5c0
parent59dc17daa3fa802182911d0bb63ca385e8bdbf1c
Merge branch 'master' into Mario/intrusive_2
15 files changed:
qcsrc/common/monsters/monster/shambler.qc
qcsrc/common/monsters/monster/spider.qc
qcsrc/common/monsters/sv_monsters.qc
qcsrc/common/mutators/mutator/nades/nades.qc
qcsrc/common/vehicles/sv_vehicles.qc
qcsrc/common/weapons/weapon/arc.qc
qcsrc/common/weapons/weapon/devastator.qc
qcsrc/common/weapons/weapon/hagar.qc
qcsrc/common/weapons/weapon/hook.qc
qcsrc/common/weapons/weapon/mortar.qc
qcsrc/common/weapons/weapon/seeker.qc
qcsrc/server/client.qc
qcsrc/server/defs.qh
qcsrc/server/mutators/mutator/gamemode_ctf.qc
qcsrc/server/player.qc