xonotic-data.pk3dir:Mario/buffs: a L merge request: Adds buffs to the game.
git-manager created issue #1980 (closed) on 2014-05-30T20:56:19Z:
Adds buffs to the game.
Repository: xonotic/xonotic-data.pk3dir.git Commit: 0eea4feb Branch: Mario/buffs
Merge commands:
cd data/xonotic-data.pk3dir
git checkout master
git reset --hard origin/master
git pull && git diff '0eea4feb7610f2b703f00d6b869c90205fe687e3'..'origin/Mario/buffs'
# please check that the diff you just saw did not contain anything complex that
# needs a new merge request, and review these changes
git merge --edit --log --no-ff 'origin/Mario/buffs'
# please make sure this merge worked, and if not, fix merge conflicts and git
# commit BEFORE the next command
#
# also, THIS is the point to do final pre-merge testing
#
# use git reset --hard origin/master to bail out
git push && git push --delete origin 'Mario/buffs'
Diffstat:
_hud_descriptions.cfg | 10 +
hud_luminos.cfg | 10 +
hud_luminos_minimal.cfg | 10 +
hud_luminos_minimal_xhair.cfg | 10 +
hud_luminos_old.cfg | 10 +
hud_nexuiz.cfg | 10 +
mutators.cfg | 47 ++
qcsrc/client/Main.qc | 1 +
qcsrc/client/autocvars.qh | 2 +
qcsrc/client/hud.qc | 60 +++
qcsrc/client/hud.qh | 3 +-
qcsrc/client/progs.src | 3 +
qcsrc/common/buffs.qc | 44 ++
qcsrc/common/buffs.qh | 83 +++
qcsrc/common/constants.qh | 2 +
qcsrc/common/deathtypes.qh | 1 +
qcsrc/common/notifications.qh | 12 +
qcsrc/menu/classes.c | 1 +
qcsrc/menu/xonotic/dialog_hudpanel_buffs.c | 22 +
qcsrc/menu/xonotic/mainwindow.c | 4 +
qcsrc/server/autocvars.qh | 30 ++
qcsrc/server/cl_client.qc | 13 +-
qcsrc/server/cl_physics.qc | 6 +-
qcsrc/server/cl_weaponsystem.qc | 4 +
qcsrc/server/g_world.qc | 2 +
qcsrc/server/miscfunctions.qc | 1 +
qcsrc/server/mutators/base.qh | 11 +
qcsrc/server/mutators/mutator_buffs.qc | 753 ++++++++++++++++++++++++++++
qcsrc/server/mutators/mutator_buffs.qh | 28 +
qcsrc/server/mutators/mutators.qh | 1 +
qcsrc/server/progs.src | 5 +
31 files changed, 1193 insertions(+), 6 deletions(-)
Revision log:
commit 0eea4feb7610f2b703f00d6b869c90205fe687e3
Author: Mario
Commit: Mario
Remove a now useless deathtype
commit 3722c33af53a175856235fdef2f744a5a833ad5f
Author: Mario
Commit: Mario
Add descriptions to the buff cvars
commit 5aff30682b3eec74e0110d293290b22071d13240
Author: Mario
Commit: Mario
Disable ammo buff in melee only mode
commit 0e73fb13fe56e1c6856bacd89591f2c5d5321994
Author: Mario
Commit: Mario
Buffs mutator, loosely based on the old relics mutator
User agreed to the license.
Diff:
*** DIFF TOO LARGE, PLEASE CHECK YOURSELF ***