Merge pull request #3003 from Mailaender/build-palette-hotkey-modifier

Resolve hotkey conflicts between build palette and world command widget once and for all
2013-04-08 15:27:53 -07:00
parent 8f7819fb24 70b40a54be
commit 66eff85aa4
2 changed files with 6 additions and 5 deletions
--- a/OpenRA.Game/GameRules/Settings.cs
+++ b/OpenRA.Game/GameRules/Settings.cs
@@ -146,9 +146,9 @@ namespace OpenRA.GameRules

 		public string AttackMoveKey = "a";
 		public string StopKey = "s";
-		public string ScatterKey = "d";
+		public string ScatterKey = "x";
 		public string DeployKey = "f";
-		public string StanceCycleKey = "g";
+		public string StanceCycleKey = "z";

 		public string CycleTabsKey = "tab";
 	}