Weapons branch reloaded
Revert "Merge branch 'Mario/despawn_effects'" This reverts commit 28931c8069eb1d283f01a26f31ad91d921294d9c, reversing changes made to d55940c3b65bffebfd3c571067398c65b29e9488.
Update configs to match new system (sort of)
Add cvars to disable plasma exploding on player touch and change midair combo radius
Midair combos
Raise shockwave animtime to 0.3
Merge remote-tracking branch 'origin/master' into samual/weapons Conflicts: balanceXonotic.cfg qcsrc/common/weapons/w_seeker.qc qcsrc/server/cl_weapons.qc qcsrc/server/miscfunctions.qc qcsrc/server/mutators/mutator_minstagib.qc qcsrc/server/tturrets/units/unit_machinegun.qc qcsrc/server/tturrets/units/unit_walker.qc qcsrc/server/w_hagar.qc qcsrc/server/w_hlac.qc qcsrc/server/w_hook.qc qcsrc/server/w_laser.qc qcsrc/server/w_minstanex.qc qcsrc/server/w_nex.qc qcsrc/server/w_rifle.qc qcsrc/server/w_shotgun.qc qcsrc/server/w_uzi.qc qcsrc/server/weapons/tracing.qc qcsrc/server/weapons/weaponsystem.qc
Rocketlauncher: dec damage 12%, inc refire, dec guiderate, inc switchdelay
Merge remote-tracking branch 'origin/master' into samual/weapons Conflicts: qcsrc/client/hook.qc qcsrc/common/constants.qh qcsrc/common/weapons/w_electro.qc qcsrc/common/weapons/w_fireball.qc qcsrc/common/weapons/w_seeker.qc qcsrc/common/weapons/w_shockwave.qc qcsrc/common/weapons/weapons.qh qcsrc/server/cl_weapons.qc qcsrc/server/defs.qh qcsrc/server/miscfunctions.qc qcsrc/server/mutators/gamemode_nexball.qc qcsrc/server/t_items.qc qcsrc/server/tturrets/units/unit_walker.qc qcsrc/server/w_crylink.qc qcsrc/server/w_grenadelauncher.qc qcsrc/server/w_hagar.qc qcsrc/server/w_hlac.qc qcsrc/server/w_hook.qc qcsrc/server/w_laser.qc qcsrc/server/w_minelayer.qc qcsrc/server/w_minstanex.qc qcsrc/server/w_nex.qc qcsrc/server/w_rifle.qc qcsrc/server/w_rocketlauncher.qc qcsrc/server/w_uzi.qc qcsrc/server/weapons/tracing.qc qcsrc/server/weapons/weaponsystem.qc
Fix comboradius size for Electro primary
Merge remote-tracking branch 'origin/master' into samual/weapons Conflicts: balanceXonotic.cfg oldbalanceXPM.cfg qcsrc/server/autocvars.qh qcsrc/server/w_crylink.qc
FIX DAMN WHITESPACE ERRORS IN CFGS
crylink: kill jointime
More work on config
Move hook to the new cvar system
Rename some things :D
Move crylink to the new cvar system
Move nex to the new cvar system
Merge remote-tracking branch 'origin/master' into samual/weapons
Compromise: Try decreasing Nex raise switchdelay