xonotic-data.pk3dir:Mario/gametype_votes: a L merge request: Adds a gametype vote screen before the map vote screen for easy gametype...
git-manager created issue #1936 (closed) on 2014-03-19T23:53:47Z:
Adds a gametype vote screen before the map vote screen for easy gametype switching.
Disabled by default, the options and timers can be customized, with support for an almost infinite number of maps/modes.
Repository: xonotic/xonotic-data.pk3dir.git Commit: 84d3168e Branch: Mario/gametype_votes
Merge commands:
cd data/xonotic-data.pk3dir
git checkout master
git reset --hard origin/master
git pull && git diff '84d3168e45d3923201fe690255afdb656c708615'..'origin/Mario/gametype_votes'
# 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/gametype_votes'
# 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/gametype_votes'
Diffstat:
defaultXonotic.cfg | 6 +
gamemodes.cfg | 22 ++
qcsrc/client/mapvoting.qc | 358 +++++++++++++++++++----
qcsrc/common/constants.qh | 7 +-
qcsrc/common/mapinfo.qc | 16 +-
qcsrc/common/mapinfo.qh | 37 ++-
qcsrc/server/autocvars.qh | 5 +
qcsrc/server/g_world.qc | 543 ++--------------------------------
qcsrc/server/mapvoting.qc | 728 +++++++++++++++++++++++++++++++++++++++++++++
qcsrc/server/mapvoting.qh | 39 +++
qcsrc/server/progs.src | 4 +
11 files changed, 1162 insertions(+), 603 deletions(-)
Revision log:
commit 84d3168e45d3923201fe690255afdb656c708615
Author: Mario
Commit: Mario
Gametype vote screen by Melanosuchus
User agreed to the license.
Diff:
*** DIFF TOO LARGE, PLEASE CHECK YOURSELF ***