Merge branch 'master' into no-tscn

2019-05-19 02:14:24 -04:00
parent bc3942127b 8c6f6f3fb0
commit f489bee686
23 changed files with 359 additions and 207 deletions
--- a/Resources/Groups/groups.yml
+++ b/Resources/Groups/groups.yml
@@ -45,4 +45,9 @@
  - delete
  - tp
  - tpgrid
+  - setgamepreset
+  - startround
+  - endround
+  - restartround
+  - respawn
  CanViewVar: true
--- a/Resources/keybinds.yml
+++ b/Resources/keybinds.yml
@@ -45,13 +45,13 @@ binds:
  key: MouseMiddle
  type: State
 - function: SwapHands
-  key: Tab
+  key: X
  type: State
 - function: Drop
  key: Q
  type: State
 - function: ActivateItemInHand
-  key: F
+  key: Z
  type: State
 - function: OpenCharacterMenu
  key: C