]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'master' into TimePath/universal_weapons
authorTimePath <andrew.hardaker1995@gmail.com>
Mon, 28 Sep 2015 02:09:12 +0000 (12:09 +1000)
committerTimePath <andrew.hardaker1995@gmail.com>
Mon, 28 Sep 2015 02:09:12 +0000 (12:09 +1000)
commit6b8b403dbd938914eeaa6a02f98d0e939950d29e
tree2243a959422be6e77c3115ec0c8f18d328f6a538
parentec9c61b50671bede8fb5fba2c6c217d7bb49aedc
parent7e8197a1381871d043f791f450f56b9b3f1fcea5
Merge branch 'master' into TimePath/universal_weapons

# Conflicts:
# qcsrc/common/turrets/unit/plasma_dual.qc
37 files changed:
qcsrc/client/damage.qc
qcsrc/client/view.qc
qcsrc/common/monsters/monster/mage.qc
qcsrc/common/turrets/unit/plasma_dual.qc
qcsrc/common/vehicles/unit/racer.qc
qcsrc/common/weapons/weapon/arc.qc
qcsrc/common/weapons/weapon/blaster.qc
qcsrc/common/weapons/weapon/crylink.qc
qcsrc/common/weapons/weapon/devastator.qc
qcsrc/common/weapons/weapon/electro.qc
qcsrc/common/weapons/weapon/fireball.qc
qcsrc/common/weapons/weapon/hagar.qc
qcsrc/common/weapons/weapon/hlac.qc
qcsrc/common/weapons/weapon/hmg.qc
qcsrc/common/weapons/weapon/hook.qc
qcsrc/common/weapons/weapon/machinegun.qc
qcsrc/common/weapons/weapon/minelayer.qc
qcsrc/common/weapons/weapon/mortar.qc
qcsrc/common/weapons/weapon/porto.qc
qcsrc/common/weapons/weapon/rifle.qc
qcsrc/common/weapons/weapon/rpc.qc
qcsrc/common/weapons/weapon/seeker.qc
qcsrc/common/weapons/weapon/shockwave.qc
qcsrc/common/weapons/weapon/shotgun.qc
qcsrc/common/weapons/weapon/vaporizer.qc
qcsrc/common/weapons/weapon/vortex.qc
qcsrc/server/cl_client.qc
qcsrc/server/cl_player.qc
qcsrc/server/defs.qh
qcsrc/server/g_hook.qc
qcsrc/server/miscfunctions.qc
qcsrc/server/miscfunctions.qh
qcsrc/server/mutators/gamemode_nexball.qc
qcsrc/server/t_items.qc
qcsrc/server/weapons/selection.qc
qcsrc/server/weapons/spawning.qc
qcsrc/server/weapons/weaponsystem.qc