Revert "Merge branch 'Mario/despawn_effects'"
authorMario <zacjardine@y7mail.com>
Fri, 14 Nov 2014 09:09:39 +0000 (20:09 +1100)
committerMario <zacjardine@y7mail.com>
Fri, 14 Nov 2014 09:09:39 +0000 (20:09 +1100)
commit5fcaa5e1251bcbbdedf31d885bdca0b2b75811c7
tree3ab89814ba0a1b81e864c07de20c0cc8257ccbe0
parent28931c8069eb1d283f01a26f31ad91d921294d9c
Revert "Merge branch 'Mario/despawn_effects'"

This reverts commit 28931c8069eb1d283f01a26f31ad91d921294d9c, reversing
changes made to d55940c3b65bffebfd3c571067398c65b29e9488.
199 files changed:
_hud_common.cfg
bal-wep-rev.cfg [deleted file]
bal-wep-xonotic.cfg [deleted file]
bal-wep-xpm.cfg [deleted file]
balance-rev.cfg [deleted file]
balance-xonotic.cfg [deleted file]
balance-xpm.cfg [deleted file]
balance25.cfg [new file with mode: 0644]
balanceFruitieX.cfg [new file with mode: 0644]
balanceXDF.cfg [new file with mode: 0644]
balanceXPM.cfg [new file with mode: 0644]
balanceXonotic.cfg [new file with mode: 0644]
check-cvars.sh
crosshairs.cfg
defaultXPM.cfg
defaultXonotic.cfg
effectinfo.txt
models/weapons/g_arc.md3 [deleted file]
models/weapons/h_arc.iqm [deleted file]
models/weapons/h_arc.iqm.framegroups [deleted file]
models/weapons/v_arc.md3 [deleted file]
models/weapons/w_crylink.zym [new file with mode: 0644]
models/weapons/w_electro.zym [new file with mode: 0644]
models/weapons/w_gl.zym [new file with mode: 0644]
models/weapons/w_hagar.zym [new file with mode: 0644]
models/weapons/w_laser.zym [new file with mode: 0644]
models/weapons/w_nex.zym [new file with mode: 0644]
models/weapons/w_rl.zym [new file with mode: 0644]
models/weapons/w_shotgun.zym [new file with mode: 0644]
models/weapons/w_uzi.zym [new file with mode: 0644]
mutator_new_toys.cfg [new file with mode: 0644]
mutators.cfg
oldbalance25.cfg [deleted file]
oldbalanceFruitieX.cfg [deleted file]
oldbalanceXDF.cfg [deleted file]
oldbalanceXPM.cfg [deleted file]
qcsrc/client/Defs.qc
qcsrc/client/Main.qc
qcsrc/client/View.qc
qcsrc/client/autocvars.qh
qcsrc/client/csqcmodel_hooks.qc
qcsrc/client/damage.qc
qcsrc/client/effects.qc
qcsrc/client/hook.qc
qcsrc/client/hud.qc
qcsrc/client/particles.qc
qcsrc/client/progs.src
qcsrc/client/projectile.qc [new file with mode: 0644]
qcsrc/client/projectile.qh [new file with mode: 0644]
qcsrc/client/scoreboard.qc
qcsrc/client/waypointsprites.qc
qcsrc/client/weapons/projectile.qc [deleted file]
qcsrc/client/weapons/projectile.qh [deleted file]
qcsrc/common/command/generic.qc
qcsrc/common/constants.qh
qcsrc/common/explosion_equation.qc [new file with mode: 0644]
qcsrc/common/explosion_equation.qh [new file with mode: 0644]
qcsrc/common/items.qc [new file with mode: 0644]
qcsrc/common/items.qh [new file with mode: 0644]
qcsrc/common/monsters/monster/mage.qc
qcsrc/common/monsters/monster/shambler.qc
qcsrc/common/monsters/monster/spider.qc
qcsrc/common/monsters/monster/wyvern.qc
qcsrc/common/monsters/sv_monsters.qc
qcsrc/common/notifications.qh
qcsrc/common/stats.qh
qcsrc/common/util.qc
qcsrc/common/util.qh
qcsrc/common/weapons/all.qh [deleted file]
qcsrc/common/weapons/calculations.qc [deleted file]
qcsrc/common/weapons/calculations.qh [deleted file]
qcsrc/common/weapons/config.qc [deleted file]
qcsrc/common/weapons/config.qh [deleted file]
qcsrc/common/weapons/w_arc.qc [deleted file]
qcsrc/common/weapons/w_blaster.qc [deleted file]
qcsrc/common/weapons/w_crylink.qc [deleted file]
qcsrc/common/weapons/w_devastator.qc [deleted file]
qcsrc/common/weapons/w_electro.qc [deleted file]
qcsrc/common/weapons/w_fireball.qc [deleted file]
qcsrc/common/weapons/w_hagar.qc [deleted file]
qcsrc/common/weapons/w_hlac.qc [deleted file]
qcsrc/common/weapons/w_hook.qc [deleted file]
qcsrc/common/weapons/w_machinegun.qc [deleted file]
qcsrc/common/weapons/w_minelayer.qc [deleted file]
qcsrc/common/weapons/w_mortar.qc [deleted file]
qcsrc/common/weapons/w_porto.qc [deleted file]
qcsrc/common/weapons/w_rifle.qc [deleted file]
qcsrc/common/weapons/w_seeker.qc [deleted file]
qcsrc/common/weapons/w_shockwave.qc [deleted file]
qcsrc/common/weapons/w_shotgun.qc [deleted file]
qcsrc/common/weapons/w_tuba.qc [deleted file]
qcsrc/common/weapons/w_vaporizer.qc [deleted file]
qcsrc/common/weapons/w_vortex.qc [deleted file]
qcsrc/common/weapons/weapons.qc [deleted file]
qcsrc/common/weapons/weapons.qh [deleted file]
qcsrc/menu/progs.src
qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.c
qcsrc/menu/xonotic/util.qc
qcsrc/server/accuracy.qc [new file with mode: 0644]
qcsrc/server/accuracy.qh [new file with mode: 0644]
qcsrc/server/antilag.qh
qcsrc/server/autocvars.qh
qcsrc/server/bot/aim.qc
qcsrc/server/bot/havocbot/havocbot.qc
qcsrc/server/bot/havocbot/roles.qc
qcsrc/server/cheats.qc
qcsrc/server/cl_client.qc
qcsrc/server/cl_impulse.qc
qcsrc/server/cl_physics.qc
qcsrc/server/cl_player.qc
qcsrc/server/cl_weaponsystem.qc [new file with mode: 0644]
qcsrc/server/csqceffects.qc
qcsrc/server/csqcprojectile.qc [new file with mode: 0644]
qcsrc/server/csqcprojectile.qh [new file with mode: 0644]
qcsrc/server/defs.qh
qcsrc/server/func_breakable.qc
qcsrc/server/g_damage.qc
qcsrc/server/g_hook.qc
qcsrc/server/g_world.qc
qcsrc/server/miscfunctions.qc
qcsrc/server/mutators/base.qh
qcsrc/server/mutators/gamemode_ca.qc
qcsrc/server/mutators/gamemode_lms.qc
qcsrc/server/mutators/gamemode_nexball.qc
qcsrc/server/mutators/mutator_minstagib.qc
qcsrc/server/mutators/mutator_nades.qc
qcsrc/server/mutators/mutator_new_toys.qc
qcsrc/server/mutators/mutator_nix.qc
qcsrc/server/mutators/mutator_touchexplode.qc
qcsrc/server/progs.src
qcsrc/server/t_items.qc
qcsrc/server/t_items.qh [deleted file]
qcsrc/server/t_quake.qc
qcsrc/server/t_quake3.qc
qcsrc/server/t_teleporters.qc
qcsrc/server/teamplay.qc
qcsrc/server/tturrets/system/system_main.qc
qcsrc/server/tturrets/units/unit_ewheel.qc
qcsrc/server/tturrets/units/unit_flac.qc
qcsrc/server/tturrets/units/unit_machinegun.qc
qcsrc/server/tturrets/units/unit_walker.qc
qcsrc/server/vehicles/bumblebee.qc
qcsrc/server/vehicles/racer.qc
qcsrc/server/vehicles/raptor.qc
qcsrc/server/vehicles/spiderbot.qc
qcsrc/server/vehicles/vehicles.qc
qcsrc/server/w_all.qc [new file with mode: 0644]
qcsrc/server/w_common.qc [new file with mode: 0644]
qcsrc/server/w_crylink.qc [new file with mode: 0644]
qcsrc/server/w_electro.qh [new file with mode: 0644]
qcsrc/server/w_fireball.qc [new file with mode: 0644]
qcsrc/server/w_grenadelauncher.qc [new file with mode: 0644]
qcsrc/server/w_hagar.qc [new file with mode: 0644]
qcsrc/server/w_hlac.qc [new file with mode: 0644]
qcsrc/server/w_hook.qc [new file with mode: 0644]
qcsrc/server/w_laser.qc [new file with mode: 0644]
qcsrc/server/w_laser.qh [new file with mode: 0644]
qcsrc/server/w_minstanex.qc [new file with mode: 0644]
qcsrc/server/w_nex.qc [new file with mode: 0644]
qcsrc/server/w_porto.qc [new file with mode: 0644]
qcsrc/server/w_rifle.qc [new file with mode: 0644]
qcsrc/server/w_rocketlauncher.qc [new file with mode: 0644]
qcsrc/server/w_seeker.qc [new file with mode: 0644]
qcsrc/server/w_shotgun.qc [new file with mode: 0644]
qcsrc/server/w_tuba.qc [new file with mode: 0644]
qcsrc/server/w_uzi.qc [new file with mode: 0644]
qcsrc/server/weapons/accuracy.qc [deleted file]
qcsrc/server/weapons/accuracy.qh [deleted file]
qcsrc/server/weapons/common.qc [deleted file]
qcsrc/server/weapons/common.qh [deleted file]
qcsrc/server/weapons/csqcprojectile.qc [deleted file]
qcsrc/server/weapons/csqcprojectile.qh [deleted file]
qcsrc/server/weapons/hitplot.qc [deleted file]
qcsrc/server/weapons/hitplot.qh [deleted file]
qcsrc/server/weapons/selection.qc [deleted file]
qcsrc/server/weapons/selection.qh [deleted file]
qcsrc/server/weapons/spawning.qc [deleted file]
qcsrc/server/weapons/spawning.qh [deleted file]
qcsrc/server/weapons/throwing.qc [deleted file]
qcsrc/server/weapons/throwing.qh [deleted file]
qcsrc/server/weapons/tracing.qc [deleted file]
qcsrc/server/weapons/tracing.qh [deleted file]
qcsrc/server/weapons/weaponstats.qc [deleted file]
qcsrc/server/weapons/weaponstats.qh [deleted file]
qcsrc/server/weapons/weaponsystem.qc [deleted file]
qcsrc/server/weapons/weaponsystem.qh [deleted file]
qcsrc/warpzonelib/TODO
qcsrc/warpzonelib/client.qc
qcsrc/warpzonelib/client.qh
scripts/weapons.shader
sound/weapons/gauntlet_fire.ogg [new file with mode: 0644]
sound/weapons/gauntletbeam_fly.ogg [new file with mode: 0644]
textures/arc.tga [deleted file]
textures/arc_gloss.tga [deleted file]
textures/arc_glow.tga [deleted file]
textures/arc_norm.tga [deleted file]
textures/arc_reflect.tga [deleted file]
textures/arc_shirt.tga [deleted file]
vehicles.cfg