Patches #1783

Merge in xonotic/xonotic-data.pk3dir.git: matthiaskrgr/cmds

Added by git-manager 11 months ago. Updated 11 months ago.

Status:ResolvedStart date:09/30/2013
Priority:NormalDue date:
Assignee:C.Brutail% Done:

100%

Category:-
Target version:Xonotic - 0.8

Description

Purpose of the branch:

Adds "exit" alias which runs "quit" command; to terminate the game using "exit".

Adds "vext" alias as short form for "vcall extendmatchtime".

Repository: xonotic/xonotic-data.pk3dir.git
Commit: 03886ce5509aaa50bbb45ecb80ce02e54cfa8e62
Branch: matthiaskrgr/cmds

Merge commands:

cd data/xonotic-data.pk3dir
git checkout master
git reset --hard origin/master
git pull && git diff '03886ce5509aaa50bbb45ecb80ce02e54cfa8e62'..'origin/matthiaskrgr/cmds'

# 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/matthiaskrgr/cmds'

# 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 'matthiaskrgr/cmds'

Diffstat:

 commands.cfg |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

Revision log:

commit 03886ce5509aaa50bbb45ecb80ce02e54cfa8e62
Merge: 05734f3 c9817f1
Author: Matthias Krüger <matthias.krueger@famsik.de>
Commit: Matthias Krüger <matthias.krueger@famsik.de>

    Merge branch 'master' into matthiaskrgr/cmds

commit 05734f3aaf497b18dd59e3ddbf37b875ce090250
Merge: 96b8717 62a098d
Author: Matthias Krüger <matthias.krueger@famsik.de>
Commit: Matthias Krüger <matthias.krueger@famsik.de>

    Merge branch 'master' into matthiaskrgr/cmds

commit 96b8717bb2de39aa53b37ac4bb884f9af26e1bd5
Author: Matthias Krüger <matthias.krueger@famsik.de>
Commit: Matthias Krüger <matthias.krueger@famsik.de>

    vextend -> vext (even shorted)

commit a61ee9b56a72ee97f08f2f377aee75dd1c1714c8
Merge: d44b930 0031d67
Author: Matthias Krüger <matthias.krueger@famsik.de>
Commit: Matthias Krüger <matthias.krueger@famsik.de>

    Merge branch 'master' into matthiaskrgr/cmds

commit d44b930371675f0c4078a1b1393c7255533f37b6
Author: Matthias Krüger <matthias.krueger@famsik.de>
Commit: Matthias Krüger <matthias.krueger@famsik.de>

    alias commands: vextend = vcall extendmatchtime

commit b6ab83d92e2d74fe0c88573caab34fe35a881279
Merge: c7d6231 4122acc
Author: Matthias Krüger <matthias.krueger@famsik.de>
Commit: Matthias Krüger <matthias.krueger@famsik.de>

    Merge branch 'master' into matthiaskrgr/cmd_exit_ask_quit

commit c7d6231fc269d2b4e4b5bf8b335b5bb224d92c7d
Author: Matthias Krüger <matthias.krueger@famsik.de>
Commit: Matthias Krüger <matthias.krueger@famsik.de>

    simply make "exit" call "quit".

commit 1474e07a9a4b6e657e11ad4855b20046cf143d25
Merge: ab59400 ad4d291
Author: Matthias Krüger <matthias.krueger@famsik.de>
Commit: Matthias Krüger <matthias.krueger@famsik.de>

    Merge branch 'master' into matthiaskrgr/cmd_exit_ask_quit

commit ab59400f6b4b5e497e9dcd062ca0968e073af9ce
Author: Matthias Krüger <matthias.krueger@famsik.de>
Commit: Matthias Krüger <matthias.krueger@famsik.de>

    When we run "exit" in the command line, ask the player if they wanted to run 'quit' instead.

User agreed to the license.

Diff:

diff --git a/commands.cfg b/commands.cfg
index dca2334..71e6eb2 100644
--- a/commands.cfg
+++ b/commands.cfg
@@ -122,6 +122,7 @@ alias hud                  "qc_cmd_cl     hud                  ${* ?}" // Comman
 alias localprint           "qc_cmd_cl     localprint           ${* ?}" // Create your own centerprint sent to yourself
 //alias mv_download        "qc_cmd_cl     mv_download          ${* ?}" // Retrieve mapshot picture from the server
 alias sendcvar             "qc_cmd_cl     sendcvar             ${* ?}" // Send a cvar to the server (like weaponpriority)
+alias exit                 "quit" 

 // other aliases for local commands
 alias hud_configure "qc_cmd_cl hud configure" 
@@ -336,6 +337,7 @@ alias vdomap "vdo gotomap ${1 ?}" 
 alias vdokick "vdo kick ${* ?}" 
 alias vdokickban "vdo kickban ${* ?}" 
 alias vdoend "vdo endmatch" 
+alias vext "vcall extendmatchtime" 

 // ======================
 //  rcon server commands

Associated revisions

Revision fe8fef8c
Added by divVerent 11 months ago

Merge matthiaskrgr/cmds by squashing, fixes #1783.

History

#1 Updated by matthiaskrgr 11 months ago

  • Assignee set to C.Brutail
  • Target version set to 0.8

#2 Updated by C.Brutail 11 months ago

  • Status changed from New to Feedback

Worksforme TM.

Both two commands work as described. Imho ready to merge.

#3 Updated by divVerent 11 months ago

SO MANY COMMITS for two lines? I'll squash.

#4 Updated by divVerent 11 months ago

  • Status changed from Feedback to Resolved
  • % Done changed from 0 to 100

Also available in: Atom PDF