Merge branch 'release_1.3' of https://github.com/assaultcube/AC into release_1.3

This commit is contained in:
drian
2021-04-30 06:02:03 +02:00
2 changed files with 2 additions and 2 deletions
+1 -1
View File
@@ -849,7 +849,7 @@ menuinit [
menuitem "\f3[ Delete vantage point ]" clearvantagepoint
menuitem "" -1
]
]
]]
if(! $connected) [
menuitem "\f0[ Set current position and viewing angle as map vantage point ]" setvantagepoint
]
+1 -1
View File
@@ -24,7 +24,7 @@ alias key_voteno [ if $votepending [ && (vote 2) (echo you voted no) ] ]
alias key_teamchat [ saycommand % ]
alias key_commandline [ saycommand / ]
alias key_prevweapon [ weapon (prevweapon) ]
alias key_pause [ paused (! $paused) ]
alias key_pause [ if $connected togglepause [ paused (! $paused) ]]
alias editkey_editmeta2 [ editmeta2down = 1 ; onrelease [ editmeta2down = 0 ] ]
alias editkey_delete_entity [if $editmeta2down [showmenu "Deleted entities" ; menuselection "Deleted entities" (- (unlistdeletedentity) 1)] [if $editmetakeydown undelent delent]]