Merge branches 'TimePath/weaponsys' and 'Mario/modpack'
authorTimePath <andrew.hardaker1995@gmail.com>
Fri, 21 Aug 2015 06:47:39 +0000 (16:47 +1000)
committerTimePath <andrew.hardaker1995@gmail.com>
Fri, 21 Aug 2015 06:47:39 +0000 (16:47 +1000)
commit8b38ad6987192a2129a7aa55410fd6d729425a28
treecc510905a3a742087c7bccc1a16751916ee3e215
parenta97f97fea293089f2e7b6c26304d4355a649cde3
parent6849fbb9ac40a1c49b1f6c58cdcb236dabbf38db
parent5e49383b6f8696d44d3e280590c0ff8b3be22256
Merge branches 'TimePath/weaponsys' and 'Mario/modpack'
45 files changed:
qcsrc/Makefile
qcsrc/client/main.qc
qcsrc/client/progs.src
qcsrc/common/monsters/monster/shambler.qc
qcsrc/common/monsters/sv_monsters.qc
qcsrc/common/physics.qc
qcsrc/common/weapons/all.qc
qcsrc/common/weapons/w_arc.qc
qcsrc/common/weapons/w_blaster.qc
qcsrc/common/weapons/w_crylink.qc
qcsrc/common/weapons/w_devastator.qc
qcsrc/common/weapons/w_electro.qc
qcsrc/common/weapons/w_fireball.qc
qcsrc/common/weapons/w_hagar.qc
qcsrc/common/weapons/w_hlac.qc
qcsrc/common/weapons/w_hmg.qc
qcsrc/common/weapons/w_hook.qc
qcsrc/common/weapons/w_machinegun.qc
qcsrc/common/weapons/w_minelayer.qc
qcsrc/common/weapons/w_mortar.qc
qcsrc/common/weapons/w_porto.qc
qcsrc/common/weapons/w_rifle.qc
qcsrc/common/weapons/w_rpc.qc
qcsrc/common/weapons/w_seeker.qc
qcsrc/common/weapons/w_shockwave.qc
qcsrc/common/weapons/w_shotgun.qc
qcsrc/common/weapons/w_tuba.qc
qcsrc/common/weapons/w_vaporizer.qc
qcsrc/menu/menu.qc
qcsrc/server/cl_client.qc
qcsrc/server/cl_player.qc
qcsrc/server/g_damage.qc
qcsrc/server/g_hook.qc
qcsrc/server/g_world.qc
qcsrc/server/miscfunctions.qc
qcsrc/server/miscfunctions.qh
qcsrc/server/mutators/gamemode_nexball.qc
qcsrc/server/mutators/mutator_buffs.qc
qcsrc/server/mutators/mutator_instagib.qc
qcsrc/server/mutators/mutator_nades.qc
qcsrc/server/mutators/mutator_nix.qc
qcsrc/server/mutators/mutator_overkill.qc
qcsrc/server/progs.src
qcsrc/server/vehicles/vehicle.qc
qcsrc/server/weapons/weaponsystem.qc