Update error messages.

Adds support for the new blacklist response in servernames

OpenRA.Game/Input/IInputHandler.cs

@@ -69,5 +69,6 @@ namespace OpenRA
 		public Modifiers Modifiers;
 		public int MultiTapCount;
 		public char UnicodeChar;
+		public bool IsRepeat;
 	}
 }

OpenRA.Game/InstalledMods.cs

@@ -46,7 +46,11 @@ namespace OpenRA
 			{
 				try
 				{
-					var directory = new DirectoryInfo(Platform.ResolvePath(path));
+					var resolved = Platform.ResolvePath(path);
+					if (!Directory.Exists(resolved))
+						continue;
+
+					var directory = new DirectoryInfo(resolved);
 					foreach (var subdir in directory.EnumerateDirectories())
 						mods.Add(Pair.New(subdir.Name, subdir.FullName));
 

OpenRA.Game/Map/MapCache.cs

@@ -201,7 +201,19 @@ namespace OpenRA
 				foreach (var p in todo)
 				{
 					if (p.Preview != null)
-						Game.RunAfterTick(() => p.SetMinimap(sheetBuilder.Add(p.Preview)));
+					{
+						Game.RunAfterTick(() =>
+						{
+							try
+							{
+								p.SetMinimap(sheetBuilder.Add(p.Preview));
+							}
+							catch (Exception e)
+							{
+								Log.Write("debug", "Failed to load minimap with exception: {0}", e);
+							}
+						});
+					}
 
 					// Yuck... But this helps the UI Jank when opening the map selector significantly.
 					Thread.Sleep(Environment.ProcessorCount == 1 ? 25 : 5);

OpenRA.Game/ObjectCreator.cs

@@ -11,6 +11,7 @@
 
 using System;
 using System.Collections.Generic;
+using System.IO;
 using System.Linq;
 using System.Reflection;
 using OpenRA.Primitives;
@@ -26,6 +27,7 @@ namespace OpenRA
 		readonly Cache<string, Type> typeCache;
 		readonly Cache<Type, ConstructorInfo> ctorCache;
 		readonly Pair<Assembly, string>[] assemblies;
+		readonly bool isMonoRuntime = Type.GetType("Mono.Runtime") != null;
 
 		public ObjectCreator(Assembly a)
 		{
@@ -54,7 +56,18 @@ namespace OpenRA
 				Assembly assembly;
 				if (!ResolvedAssemblies.TryGetValue(hash, out assembly))
 				{
-					assembly = Assembly.Load(data);
+					Stream symbolStream = null;
+					var hasSymbols = false;
+
+					// Mono has its own symbol format.
+					if (isMonoRuntime)
+						hasSymbols = modFiles.TryOpen(path + ".mdb", out symbolStream);
+
+					// .NET uses .pdb files.
+					else
+						hasSymbols = modFiles.TryOpen(path.Substring(0, path.Length - 4) + ".pdb", out symbolStream);
+
+					assembly = hasSymbols ? Assembly.Load(data, symbolStream.ReadAllBytes()) : Assembly.Load(data);
 					ResolvedAssemblies.Add(hash, assembly);
 				}
 

OpenRA.Game/Orders/UnitOrderGenerator.cs

@@ -139,8 +139,15 @@ namespace OpenRA.Orders
 			if (mi.Modifiers.HasModifier(Modifiers.Alt))
 				modifiers |= TargetModifiers.ForceMove;
 
+			// The Select(x => x) is required to work around an issue on mono 5.0
+			// where calling OrderBy* on SelectManySingleSelectorIterator can in some
+			// circumstances (which we were unable to identify) replace entries in the
+			// enumeration with duplicates of other entries.
+			// Other action that replace the SelectManySingleSelectorIterator with a
+			// different enumerator type (e.g. .Where(true) or .ToList()) also work.
 			var orders = self.TraitsImplementing<IIssueOrder>()
 				.SelectMany(trait => trait.Orders.Select(x => new { Trait = trait, Order = x }))
+				.Select(x => x)
 				.OrderByDescending(x => x.Order.OrderPriority);
 
 			for (var i = 0; i < 2; i++)

OpenRA.Game/Settings.cs

@@ -120,6 +120,9 @@ namespace OpenRA
 		[Desc("At which frames per second to cap the framerate.")]
 		public int MaxFramerate = 60;
 
+		[Desc("Disable high resolution DPI scaling on Windows operating systems.")]
+		public bool DisableWindowsDPIScaling = true;
+
 		public int BatchSize = 8192;
 		public int SheetSize = 2048;
 

OpenRA.Mods.Cnc/Activities/LayMines.cs

@@ -53,11 +53,12 @@ namespace OpenRA.Mods.Cnc.Activities
 				if (rearmTarget == null)
 					return new Wait(20);
 
+				// Add a CloseEnough range of 512 to the Repair activity in order to ensure that we're at the host actor
 				return ActivityUtils.SequenceActivities(
 					new MoveAdjacentTo(self, Target.FromActor(rearmTarget)),
 					movement.MoveTo(self.World.Map.CellContaining(rearmTarget.CenterPosition), rearmTarget),
 					new Rearm(self),
-					new Repair(self, rearmTarget),
+					new Repair(self, rearmTarget, new WDist(512)),
 					this);
 			}
 

OpenRA.Mods.Common/AI/HackyAI.cs

@@ -342,7 +342,7 @@ namespace OpenRA.Mods.Common.AI
 			foreach (var defense in Info.DefenseQueues)
 				builders.Add(new BaseBuilder(this, defense, p, playerPower, playerResource));
 
-			Random = new MersenneTwister((int)p.PlayerActor.ActorID);
+			Random = new MersenneTwister(Game.CosmeticRandom.Next());
 
 			// Avoid all AIs trying to rush in the same tick, randomize their initial rush a little.
 			var smallFractionOfRushInterval = Info.RushInterval / 20;
@@ -562,7 +562,7 @@ namespace OpenRA.Mods.Common.AI
 
 					foreach (var r in nearbyResources)
 					{
-						var found = findPos(r, baseCenter, Info.MinBaseRadius, Info.MaxBaseRadius);
+						var found = findPos(baseCenter, r, Info.MinBaseRadius, Info.MaxBaseRadius);
 						if (found != null)
 							return found;
 					}

OpenRA.Mods.Common/Activities/Air/HeliReturnToBase.cs

@@ -43,12 +43,12 @@ namespace OpenRA.Mods.Common.Activities
 			if (IsCanceled)
 				return NextActivity;
 
-			if (dest == null || Reservable.IsReserved(dest))
+			if (dest == null || dest.IsDead || Reservable.IsReserved(dest))
 				dest = ChooseHelipad(self);
 
 			var initialFacing = heli.Info.InitialFacing;
 
-			if (dest == null)
+			if (dest == null || dest.IsDead)
 			{
 				var rearmBuildings = heli.Info.RearmBuildings;
 				var nearestHpad = self.World.ActorsHavingTrait<Reservable>()

OpenRA.Mods.Common/Activities/Air/ReturnToBase.cs

@@ -49,7 +49,7 @@ namespace OpenRA.Mods.Common.Activities
 
 		void Calculate(Actor self)
 		{
-			if (dest == null || Reservable.IsReserved(dest))
+			if (dest == null || dest.IsDead || Reservable.IsReserved(dest))
 				dest = ChooseAirfield(self, true);
 
 			if (dest == null)
@@ -116,7 +116,7 @@ namespace OpenRA.Mods.Common.Activities
 			if (!isCalculated)
 				Calculate(self);
 
-			if (dest == null)
+			if (dest == null || dest.IsDead)
 			{
 				var nearestAfld = ChooseAirfield(self, false);
 

OpenRA.Mods.Common/Activities/Hunt.cs

@@ -20,9 +20,11 @@ namespace OpenRA.Mods.Common.Activities
 	public class Hunt : Activity
 	{
 		readonly IEnumerable<Actor> targets;
+		readonly IMove move;
 
 		public Hunt(Actor self)
 		{
+			move = self.Trait<IMove>();
 			var attack = self.Trait<AttackBase>();
 			targets = self.World.ActorsHavingTrait<Huntable>().Where(
 				a => self != a && !a.IsDead && a.IsInWorld && a.AppearsHostileTo(self)
@@ -39,7 +41,7 @@ namespace OpenRA.Mods.Common.Activities
 				return this;
 
 			return ActivityUtils.SequenceActivities(
-				new AttackMoveActivity(self, new Move(self, target.Location, WDist.FromCells(2))),
+				new AttackMoveActivity(self, move.MoveTo(target.Location, 2)),
 				new Wait(25),
 				this);
 		}

OpenRA.Mods.Common/Activities/Repair.cs

@@ -19,16 +19,13 @@ namespace OpenRA.Mods.Common.Activities
 	public class Repair : Activity
 	{
 		readonly RepairsUnitsInfo repairsUnits;
+		readonly Health health;
 		readonly Target host;
 		readonly WDist closeEnough;
 
 		int remainingTicks;
-		Health health;
 		bool played = false;
 
-		public Repair(Actor self, Actor host)
-			: this(self, host, WDist.Zero) { }
-
 		public Repair(Actor self, Actor host, WDist closeEnough)
 		{
 			this.host = Target.FromActor(host);

OpenRA.Mods.Common/Commands/PlayerCommands.cs

@@ -35,19 +35,20 @@ namespace OpenRA.Mods.Common.Commands
 
 		public void InvokeCommand(string name, string arg)
 		{
-			if (world.LocalPlayer == null)
-				return;
-
 			switch (name)
 			{
 				case "pause":
-					world.IssueOrder(new Order("PauseGame", null, false)
-					{
-						TargetString = world.Paused ? "UnPause" : "Pause"
-					});
+					if (Game.IsHost || (world.LocalPlayer != null && world.LocalPlayer.WinState != WinState.Lost))
+						world.IssueOrder(new Order("PauseGame", null, false)
+						{
+							TargetString = world.Paused ? "UnPause" : "Pause"
+						});
+
 					break;
 				case "surrender":
-					world.IssueOrder(new Order("Surrender", world.LocalPlayer.PlayerActor, false));
+					if (world.LocalPlayer != null)
+						world.IssueOrder(new Order("Surrender", world.LocalPlayer.PlayerActor, false));
+
 					break;
 			}
 		}

OpenRA.Mods.Common/ServerTraits/MasterServerPinger.cs

@@ -14,6 +14,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Net;
 using System.Text;
+using System.Text.RegularExpressions;
 using OpenRA.Server;
 using S = OpenRA.Server.Server;
 
@@ -23,6 +24,13 @@ namespace OpenRA.Mods.Common.Server
 	{
 		// 3 minutes. Server has a 5 minute TTL for games, so give ourselves a bit of leeway.
 		const int MasterPingInterval = 60 * 3;
+
+		static readonly Dictionary<int, string> MasterServerErrors = new Dictionary<int, string>()
+		{
+			{ 1, "Server port is not accessible from the internet." },
+			{ 2, "Server name contains a blacklisted word." }
+		};
+
 		public int TickTimeout { get { return MasterPingInterval * 10000; } }
 
 		public void Tick(S server)
@@ -89,14 +97,31 @@ namespace OpenRA.Mods.Common.Server
 						if (isInitialPing)
 						{
 							var masterResponseText = Encoding.UTF8.GetString(masterResponse);
+							Log.Write("server", "Master server: " + masterResponseText);
+
+							var errorCode = 0;
+							var errorMessage = string.Empty;
+
+							if (masterResponseText.Length > 0)
+							{
+								var regex = new Regex(@"^\[(?<code>\d+)\](?<message>.*)");
+								var match = regex.Match(masterResponseText);
+								errorMessage = match.Success && int.TryParse(match.Groups["code"].Value, out errorCode) ?
+									match.Groups["message"].Value.Trim() : "Failed to parse error message";
+							}
+
 							isInitialPing = false;
 							lock (masterServerMessages)
 							{
 								masterServerMessages.Enqueue("Master server communication established.");
-								if (masterResponseText.Contains("[001]"))  // Server does not respond code
+								if (errorCode != 0)
 								{
-									Log.Write("server", masterResponseText);
-									masterServerMessages.Enqueue("Warning: Server ports are not forwarded.");
+									// Hardcoded error messages take precedence over the server-provided messages
+									string message;
+									if (!MasterServerErrors.TryGetValue(errorCode, out message))
+										message = errorMessage;
+
+									masterServerMessages.Enqueue("Warning: " + message);
 									masterServerMessages.Enqueue("Game has not been advertised online.");
 								}
 							}

OpenRA.Mods.Common/Traits/Air/Aircraft.cs

@@ -391,8 +391,10 @@ namespace OpenRA.Mods.Common.Traits
 			var name = a.Info.Name;
 			if (Info.RearmBuildings.Contains(name))
 				yield return new Rearm(self);
+
+			// Add a CloseEnough range of 512 to ensure we're at the host actor
 			if (Info.RepairBuildings.Contains(name))
-				yield return new Repair(self, a);
+				yield return new Repair(self, a, new WDist(512));
 		}
 
 		public void ModifyDeathActorInit(Actor self, TypeDictionary init)

OpenRA.Mods.Common/Traits/Attack/AttackOmni.cs

@@ -26,23 +26,25 @@ namespace OpenRA.Mods.Common.Traits
 
 		public override Activity GetAttackActivity(Actor self, Target newTarget, bool allowMove, bool forceAttack)
 		{
-			return new SetTarget(this, newTarget);
+			return new SetTarget(this, newTarget, allowMove);
 		}
 
 		protected class SetTarget : Activity
 		{
 			readonly Target target;
 			readonly AttackOmni attack;
+			readonly bool allowMove;
 
-			public SetTarget(AttackOmni attack, Target target)
+			public SetTarget(AttackOmni attack, Target target, bool allowMove)
 			{
 				this.target = target;
 				this.attack = attack;
+				this.allowMove = allowMove;
 			}
 
 			public override Activity Tick(Actor self)
 			{
-				if (IsCanceled || !target.IsValidFor(self))
+				if (IsCanceled || !target.IsValidFor(self) || !attack.IsReachableTarget(target, allowMove))
 					return NextActivity;
 
 				attack.DoAttack(self, target);

OpenRA.Mods.Common/Traits/Buildings/Bridge.cs

@@ -57,7 +57,7 @@ namespace OpenRA.Mods.Common.Traits
 					yield return Pair.New(Template, 100);
 
 				if (DamagedTemplate != 0)
-					yield return Pair.New(DamagedTemplate, 50);
+					yield return Pair.New(DamagedTemplate, 49);
 
 				if (DestroyedTemplate != 0)
 					yield return Pair.New(DestroyedTemplate, 0);

OpenRA.Mods.Common/Traits/Carryall.cs

@@ -42,7 +42,7 @@ namespace OpenRA.Mods.Common.Traits
 		public virtual object Create(ActorInitializer init) { return new Carryall(init.Self, this); }
 	}
 
-	public class Carryall : INotifyKilled, ISync, IRender, INotifyActorDisposing, IIssueOrder, IResolveOrder, IOrderVoice
+	public class Carryall : INotifyKilled, ISync, ITick, IRender, INotifyActorDisposing, IIssueOrder, IResolveOrder, IOrderVoice
 	{
 		public enum CarryallState
 		{
@@ -68,7 +68,7 @@ namespace OpenRA.Mods.Common.Traits
 
 		public Carryall(Actor self, CarryallInfo info)
 		{
-			this.Info = info;
+			Info = info;
 
 			Carryable = null;
 			State = CarryallState.Idle;
@@ -79,6 +79,13 @@ namespace OpenRA.Mods.Common.Traits
 			facing = self.Trait<IFacing>();
 		}
 
+		void ITick.Tick(Actor self)
+		{
+			// Cargo may be killed in the same tick as, but after they are attached
+			if (Carryable != null && Carryable.IsDead)
+				DetachCarryable(self);
+		}
+
 		void INotifyActorDisposing.Disposing(Actor self)
 		{
 			if (State == CarryallState.Carrying)
@@ -156,7 +163,7 @@ namespace OpenRA.Mods.Common.Traits
 
 		IEnumerable<IRenderable> IRender.Render(Actor self, WorldRenderer wr)
 		{
-			if (State == CarryallState.Carrying)
+			if (State == CarryallState.Carrying && !Carryable.IsDead)
 			{
 				if (carryablePreview == null)
 				{

OpenRA.Mods.Common/Traits/Cloak.cs

@@ -69,6 +69,7 @@ namespace OpenRA.Mods.Common.Traits
 
 		CPos? lastPos;
 		bool wasCloaked = false;
+		bool firstTick = true;
 		int cloakedToken = ConditionManager.InvalidConditionToken;
 
 		public Cloak(CloakInfo info)
@@ -145,7 +146,8 @@ namespace OpenRA.Mods.Common.Traits
 				if (conditionManager != null && cloakedToken == ConditionManager.InvalidConditionToken && !string.IsNullOrEmpty(Info.CloakedCondition))
 					cloakedToken = conditionManager.GrantCondition(self, Info.CloakedCondition);
 
-				if (!self.TraitsImplementing<Cloak>().Any(a => a != this && a.Cloaked))
+				// Sounds shouldn't play if the actor starts cloaked
+				if (!(firstTick && Info.InitialDelay == 0) && !self.TraitsImplementing<Cloak>().Any(a => a != this && a.Cloaked))
 					Game.Sound.Play(SoundType.World, Info.CloakSound, self.CenterPosition);
 			}
 			else if (!isCloaked && wasCloaked)
@@ -153,11 +155,12 @@ namespace OpenRA.Mods.Common.Traits
 				if (cloakedToken != ConditionManager.InvalidConditionToken)
 					cloakedToken = conditionManager.RevokeCondition(self, cloakedToken);
 
-				if (!self.TraitsImplementing<Cloak>().Any(a => a != this && a.Cloaked))
+				if (!(firstTick && Info.InitialDelay == 0) && !self.TraitsImplementing<Cloak>().Any(a => a != this && a.Cloaked))
 					Game.Sound.Play(SoundType.World, Info.UncloakSound, self.CenterPosition);
 			}
 
 			wasCloaked = isCloaked;
+			firstTick = false;
 		}
 
 		public bool IsVisible(Actor self, Player viewer)

OpenRA.Mods.Common/Traits/Repairable.cs

@@ -114,7 +114,8 @@ namespace OpenRA.Mods.Common.Traits
 			if (CanRearmAt(order.TargetActor) && CanRearm())
 				self.QueueActivity(new Rearm(self));
 
-			self.QueueActivity(new Repair(self, order.TargetActor));
+			// Add a CloseEnough range of 512 to ensure we're at the host actor
+			self.QueueActivity(new Repair(self, order.TargetActor, new WDist(512)));
 
 			var rp = order.TargetActor.TraitOrDefault<RallyPoint>();
 			if (rp != null)

OpenRA.Mods.Common/Widgets/Logic/Ingame/ObserverShroudSelectorLogic.cs

@@ -133,7 +133,7 @@ namespace OpenRA.Mods.Common.Widgets.Logic
 
 		public bool HandleKeyPress(KeyInput e)
 		{
-			if (e.Event == KeyInputEvent.Down)
+			if (e.Event == KeyInputEvent.Down && !e.IsRepeat)
 			{
 				var h = Hotkey.FromKeyInput(e);
 				if (h == Game.Settings.Keys.ObserverCombinedView && !limitViews)

OpenRA.Mods.Common/Widgets/Logic/Installation/DownloadPackageLogic.cs

@@ -164,9 +164,9 @@ namespace OpenRA.Mods.Common.Widgets.Logic
 
 					Game.RunAfterTick(() => { Ui.CloseWindow(); onSuccess(); });
 				}
-				catch (Exception)
+				catch (Exception e)
 				{
-					Log.Write("install", "Extraction failed");
+					Log.Write("install", "Archive extraction failed: " + e.ToString());
 
 					foreach (var f in extracted)
 					{
@@ -174,7 +174,7 @@ namespace OpenRA.Mods.Common.Widgets.Logic
 						File.Delete(f);
 					}
 
-					onError("Invalid archive");
+					onError("Archive extraction failed");
 				}
 				finally
 				{

OpenRA.Mods.Common/Widgets/Logic/Lobby/LobbyUtils.cs

@@ -294,6 +294,8 @@ namespace OpenRA.Mods.Common.Widgets.Logic
 				name.YieldKeyboardFocus();
 				return true;
 			};
+
+			HideChildWidget(parent, "SLOT_OPTIONS");
 		}
 
 		public static void SetupNameWidget(Widget parent, Session.Slot s, Session.Client c)
@@ -517,5 +519,12 @@ namespace OpenRA.Mods.Common.Widgets.Logic
 
 			return address;
 		}
+
+		static void HideChildWidget(Widget parent, string widgetId)
+		{
+			var widget = parent.GetOrNull(widgetId);
+			if (widget != null)
+				widget.IsVisible = () => false;
+		}
 	}
 }

OpenRA.Mods.Common/Widgets/Logic/MultiplayerLogic.cs

@@ -10,6 +10,7 @@
 #endregion
 
 using System;
+using System.Collections;
 using System.Collections.Generic;
 using System.Drawing;
 using System.Linq;
@@ -56,7 +57,7 @@ namespace OpenRA.Mods.Common.Widgets.Logic
 		{
 			switch (searchStatus)
 			{
-				case SearchStatus.Failed: return "Failed to contact master server.";
+				case SearchStatus.Failed: return "Failed to query server list.";
 				case SearchStatus.NoGames: return "No games found. Try changing filters.";
 				default: return "";
 			}
@@ -300,18 +301,24 @@ namespace OpenRA.Mods.Common.Widgets.Logic
 			{
 				currentQuery = null;
 
-				if (i.Error != null)
+				List<GameServer> games = null;
+				if (i.Error == null)
 				{
-					RefreshServerListInner(null);
-					return;
+					try
+					{
+						var data = Encoding.UTF8.GetString(i.Result);
+						var yaml = MiniYaml.FromString(data);
+
+						games = yaml.Select(a => new GameServer(a.Value))
+							.Where(gs => gs.Address != null)
+							.ToList();
+					}
+					catch
+					{
+						searchStatus = SearchStatus.Failed;
+					}
 				}
 
-				var data = Encoding.UTF8.GetString(i.Result);
-				var yaml = MiniYaml.FromString(data);
-
-				var games = yaml.Select(a => new GameServer(a.Value))
-					.Where(gs => gs.Address != null);
-
 				Game.RunAfterTick(() => RefreshServerListInner(games));
 			};
 
@@ -343,7 +350,7 @@ namespace OpenRA.Mods.Common.Widgets.Logic
 			currentMap = server != null ? modData.MapCache[server.Map] : null;
 		}
 
-		void RefreshServerListInner(IEnumerable<GameServer> games)
+		void RefreshServerListInner(List<GameServer> games)
 		{
 			if (games == null)
 				return;

OpenRA.Mods.Common/Widgets/WorldInteractionControllerWidget.cs

@@ -241,7 +241,8 @@ namespace OpenRA.Mods.Common.Widgets
 			{
 				var key = Hotkey.FromKeyInput(e);
 
-				if (key == Game.Settings.Keys.PauseKey && World.LocalPlayer != null) // Disable pausing for spectators
+				if (key == Game.Settings.Keys.PauseKey
+					&& (Game.IsHost || (World.LocalPlayer != null && World.LocalPlayer.WinState != WinState.Lost))) // Disable pausing for spectators and defeated players
 					World.SetPauseState(!World.Paused);
 				else if (key == Game.Settings.Keys.SelectAllUnitsKey && !World.IsGameOver)
 				{

OpenRA.Platforms.Default/Sdl2GraphicsDevice.cs

@@ -40,7 +40,7 @@ namespace OpenRA.Platforms.Default
 			WindowSize = windowSize;
 
 			// Disable legacy scaling on Windows
-			if (Platform.CurrentPlatform == PlatformType.Windows)
+			if (Platform.CurrentPlatform == PlatformType.Windows && !Game.Settings.Graphics.DisableWindowsDPIScaling)
 				SetProcessDPIAware();
 
 			SDL.SDL_Init(SDL.SDL_INIT_NOPARACHUTE | SDL.SDL_INIT_VIDEO);
@@ -63,6 +63,11 @@ namespace OpenRA.Platforms.Default
 			Console.WriteLine("Using resolution: {0}x{1}", WindowSize.Width, WindowSize.Height);
 
 			var windowFlags = SDL.SDL_WindowFlags.SDL_WINDOW_OPENGL | SDL.SDL_WindowFlags.SDL_WINDOW_ALLOW_HIGHDPI;
+
+			// HiDPI doesn't work properly on OSX with (legacy) fullscreen mode
+			if (Platform.CurrentPlatform == PlatformType.OSX && windowMode == WindowMode.Fullscreen)
+				SDL.SDL_SetHint(SDL.SDL_HINT_VIDEO_HIGHDPI_DISABLED, "1");
+
 			window = SDL.SDL_CreateWindow("OpenRA", SDL.SDL_WINDOWPOS_CENTERED, SDL.SDL_WINDOWPOS_CENTERED,
 				WindowSize.Width, WindowSize.Height, windowFlags);
 
@@ -82,7 +87,7 @@ namespace OpenRA.Platforms.Default
 			else if (Platform.CurrentPlatform == PlatformType.Windows)
 			{
 				float ddpi, hdpi, vdpi;
-				if (SDL.SDL_GetDisplayDPI(0, out ddpi, out hdpi, out vdpi) == 0)
+				if (!Game.Settings.Graphics.DisableWindowsDPIScaling && SDL.SDL_GetDisplayDPI(0, out ddpi, out hdpi, out vdpi) == 0)
 				{
 					WindowScale = ddpi / 96;
 					WindowSize = new Size((int)(SurfaceSize.Width / WindowScale), (int)(SurfaceSize.Height / WindowScale));
@@ -107,7 +112,23 @@ namespace OpenRA.Platforms.Default
 				ReleaseWindowMouseFocus();
 
 			if (windowMode == WindowMode.Fullscreen)
+			{
 				SDL.SDL_SetWindowFullscreen(window, (uint)SDL.SDL_WindowFlags.SDL_WINDOW_FULLSCREEN);
+
+				// Fullscreen mode on OSX will ignore the configured display resolution
+				// and instead always picks an arbitrary scaled resolution choice that may
+				// not match the window size, leading to graphical and input issues.
+				// We work around this by force disabling HiDPI and resetting the window and
+				// surface sizes to match the size that is forced by SDL.
+				// This is usually not what the player wants, but is the best we can consistently do.
+				if (Platform.CurrentPlatform == PlatformType.OSX)
+				{
+					int width, height;
+					SDL.SDL_GetWindowSize(window, out width, out height);
+					WindowSize = SurfaceSize = new Size(width, height);
+					WindowScale = 1;
+				}
+			}
 			else if (windowMode == WindowMode.PseudoFullscreen)
 			{
 				// Work around a visual glitch in OSX: the window is offset

OpenRA.Platforms.Default/Sdl2Input.cs

@@ -170,7 +170,8 @@ namespace OpenRA.Platforms.Default
 								Key = keyCode,
 								Modifiers = mods,
 								UnicodeChar = (char)e.key.keysym.sym,
-								MultiTapCount = tapCount
+								MultiTapCount = tapCount,
+								IsRepeat = e.key.repeat != 0
 							};
 
 							// Special case workaround for windows users

mods/cnc/chrome/editor.yaml

@@ -77,7 +77,7 @@ Container@NEW_MAP_BG:
 			Font: Bold
 			Key: return
 
-Background@SAVE_MAP_PANEL:
+Container@SAVE_MAP_PANEL:
 	Logic: SaveMapLogic
 	X: (WINDOW_RIGHT - WIDTH)/2
 	Y: (WINDOW_BOTTOM - HEIGHT)/2

mods/cnc/chrome/mainmenu.yaml

@@ -173,7 +173,7 @@ Container@MENU_BACKGROUND:
 							Width: 140
 							Height: 35
 							Text: Back
-				Background@MAP_EDITOR_MENU:
+				Container@MAP_EDITOR_MENU:
 					Width: PARENT_RIGHT
 					Visible: False
 					Children:

mods/cnc/maps/desert-rats-cnc/map.yaml

@@ -0,0 +1,536 @@
+MapFormat: 11
+
+RequiresMod: cnc
+
+Title: Desert Rats
+
+Author: Madness
+
+Tileset: DESERT
+
+MapSize: 72,72
+
+Bounds: 1,1,70,70
+
+Visibility: Lobby
+
+Categories: Conquest
+
+Players:
+	PlayerReference@Neutral:
+		Name: Neutral
+		OwnsWorld: True
+		NonCombatant: True
+		Faction: Random
+	PlayerReference@Creeps:
+		Name: Creeps
+		NonCombatant: True
+		Faction: Random
+		Enemies: Multi0, Multi1
+	PlayerReference@Multi0:
+		Name: Multi0
+		Playable: True
+		Faction: Random
+		Enemies: Creeps
+	PlayerReference@Multi1:
+		Name: Multi1
+		Playable: True
+		Faction: Random
+		Enemies: Creeps
+
+Actors:
+	Actor0: mpspawn
+		Owner: Neutral
+		Location: 22,16
+	Actor3: t18
+		Owner: Neutral
+		Location: 16,4
+	Actor4: t18
+		Owner: Neutral
+		Location: 4,8
+	Actor5: t08
+		Owner: Neutral
+		Location: 8,2
+	Actor6: v19
+		Owner: Neutral
+		Location: 9,6
+	Actor7: v19
+		Owner: Neutral
+		Location: 18,5
+	Actor8: t18
+		Owner: Neutral
+		Location: 28,4
+	Actor9: t04
+		Owner: Neutral
+		Location: 27,5
+	Actor10: t08
+		Owner: Neutral
+		Location: 30,8
+	Actor11: t04
+		Owner: Neutral
+		Location: 30,8
+	Actor12: t18
+		Owner: Neutral
+		Location: 41,11
+	Actor13: t04
+		Owner: Neutral
+		Location: 39,12
+	Actor14: wood
+		Owner: Neutral
+		Location: 46,11
+	Actor15: wood
+		Owner: Neutral
+		Location: 46,10
+	Actor16: wood
+		Owner: Neutral
+		Location: 47,10
+	Actor17: wood
+		Owner: Neutral
+		Location: 48,10
+	Actor18: wood
+		Owner: Neutral
+		Location: 49,10
+	Actor19: wood
+		Owner: Neutral
+		Location: 50,10
+	Actor20: wood
+		Owner: Neutral
+		Location: 50,11
+	Actor21: v21
+		Owner: Neutral
+		Location: 49,12
+	Actor22: wood
+		Owner: Neutral
+		Location: 51,13
+	Actor23: wood
+		Owner: Neutral
+		Location: 52,13
+	Actor24: wood
+		Owner: Neutral
+		Location: 52,14
+	Actor25: c2
+		Owner: Neutral
+		Location: 49,11
+		SubCell: 3
+		Facing: 92
+	Actor26: t18
+		Owner: Neutral
+		Location: 47,10
+	Actor27: t08
+		Owner: Neutral
+		Location: 50,14
+	Actor28: t08
+		Owner: Neutral
+		Location: 36,23
+	Actor29: t04
+		Owner: Neutral
+		Location: 38,21
+	Actor30: t04
+		Owner: Neutral
+		Location: 36,21
+	Actor31: t04
+		Owner: Neutral
+		Location: 36,24
+	Actor32: t04
+		Owner: Neutral
+		Location: 20,23
+	Actor33: t04
+		Owner: Neutral
+		Location: 13,5
+	Actor34: t04
+		Owner: Neutral
+		Location: 10,6
+	Actor35: t04
+		Owner: Neutral
+		Location: 8,6
+	Actor36: t04
+		Owner: Neutral
+		Location: 19,5
+	Actor37: rock5
+		Owner: Neutral
+		Location: 27,31
+	Actor38: t18
+		Owner: Neutral
+		Location: 28,28
+	Actor39: t04
+		Owner: Neutral
+		Location: 26,30
+	Actor40: t04
+		Owner: Neutral
+		Location: 22,39
+	Actor41: t08
+		Owner: Neutral
+		Location: 23,39
+	Actor42: split2
+		Owner: Neutral
+		Location: 21,32
+	Actor43: v31
+		Owner: Neutral
+		Location: 2,34
+	Actor44: v25
+		Owner: Neutral
+		Location: 2,35
+	Actor45: v24
+		Owner: Neutral
+		Location: 5,35
+	Actor46: v27
+		Owner: Neutral
+		Location: 5,38
+	Actor47: v30
+		Owner: Neutral
+		Location: 5,40
+	Actor48: t18
+		Owner: Neutral
+		Location: 6,40
+	Actor49: t18
+		Owner: Neutral
+		Location: 1,35
+	Actor50: v22
+		Owner: Neutral
+		Location: 1,38
+	Actor51: v29
+		Owner: Neutral
+		Location: 3,39
+	Actor52: t08
+		Owner: Neutral
+		Location: 1,39
+	Actor54: v27
+		Owner: Neutral
+		Location: 2,43
+	Actor55: v24
+		Owner: Neutral
+		Location: 2,39
+	Actor56: t18
+		Owner: Neutral
+		Location: 6,50
+	Actor57: v35
+		Owner: Neutral
+		Location: 5,51
+	Actor58: t04
+		Owner: Neutral
+		Location: 5,51
+	Actor59: t08
+		Owner: Neutral
+		Location: 1,60
+	Actor60: t18
+		Owner: Neutral
+		Location: 5,61
+	Actor61: t18
+		Owner: Neutral
+		Location: 18,69
+	Actor63: t08
+		Owner: Neutral
+		Location: 4,70
+	Actor64: t18
+		Owner: Neutral
+		Location: 0,69
+	Actor65: t18
+		Owner: Neutral
+		Location: 1,66
+	Actor66: v32
+		Owner: Neutral
+		Location: 6,69
+	Actor67: t18
+		Owner: Neutral
+		Location: 8,68
+	Actor68: split2
+		Owner: Neutral
+		Location: 13,64
+	Actor69: t18
+		Owner: Neutral
+		Location: 19,46
+	Actor70: t09
+		Owner: Neutral
+		Location: 19,47
+	Actor71: t04
+		Owner: Neutral
+		Location: 19,47
+	Actor72: wood
+		Owner: Neutral
+		Location: 25,60
+	Actor73: wood
+		Owner: Neutral
+		Location: 25,61
+	Actor74: wood
+		Owner: Neutral
+		Location: 24,61
+	Actor75: wood
+		Owner: Neutral
+		Location: 23,61
+	Actor76: wood
+		Owner: Neutral
+		Location: 22,61
+	Actor77: wood
+		Owner: Neutral
+		Location: 21,61
+	Actor78: wood
+		Owner: Neutral
+		Location: 21,60
+	Actor79: wood
+		Owner: Neutral
+		Location: 19,57
+	Actor80: wood
+		Owner: Neutral
+		Location: 19,58
+	Actor81: wood
+		Owner: Neutral
+		Location: 20,58
+	Actor82: t18
+		Owner: Neutral
+		Location: 29,58
+	Actor83: t09
+		Owner: Neutral
+		Location: 32,58
+	Actor84: t04
+		Owner: Neutral
+		Location: 31,56
+	Actor85: t18
+		Owner: Neutral
+		Location: 23,59
+	Actor86: t08
+		Owner: Neutral
+		Location: 21,56
+	Actor87: v24
+		Owner: Neutral
+		Location: 21,58
+	Actor88: c6
+		Owner: Neutral
+		Location: 22,60
+		SubCell: 3
+		Facing: 92
+	Actor89: t18
+		Owner: Neutral
+		Location: 43,65
+	Actor90: t04
+		Owner: Neutral
+		Location: 42,64
+	Actor91: t04
+		Owner: Neutral
+		Location: 39,63
+	Actor92: t08
+		Owner: Neutral
+		Location: 40,63
+	Actor93: t04
+		Owner: Neutral
+		Location: 32,69
+	Actor94: t18
+		Owner: Neutral
+		Location: 34,46
+	Actor95: t04
+		Owner: Neutral
+		Location: 34,45
+	Actor96: t09
+		Owner: Neutral
+		Location: 35,48
+	Actor97: t04
+		Owner: Neutral
+		Location: 32,49
+	Actor98: rock1
+		Owner: Neutral
+		Location: 19,40
+	Actor99: t18
+		Owner: Neutral
+		Location: 21,42
+	Actor100: v19
+		Owner: Neutral
+		Location: 24,43
+	Actor101: v27
+		Owner: Neutral
+		Location: 24,45
+	Actor102: v23.husk
+		Owner: Neutral
+		Location: 22,44
+	Actor103: t18
+		Owner: Neutral
+		Location: 34,37
+	Actor104: t18
+		Owner: Neutral
+		Location: 36,32
+	Actor105: t04
+		Owner: Neutral
+		Location: 36,37
+	Actor106: t04
+		Owner: Neutral
+		Location: 34,33
+	Actor107: t04
+		Owner: Neutral
+		Location: 32,36
+	Actor108: t04
+		Owner: Neutral
+		Location: 37,36
+	Actor109: t09
+		Owner: Neutral
+		Location: 37,37
+	Actor110: t04
+		Owner: Neutral
+		Location: 44,33
+	Actor111: v19
+		Owner: Neutral
+		Location: 47,28
+	Actor112: v27
+		Owner: Neutral
+		Location: 47,26
+	Actor113: t18
+		Owner: Neutral
+		Location: 49,26
+	Actor114: rock1
+		Owner: Neutral
+		Location: 51,29
+	Actor115: v23
+		Owner: Neutral
+		Location: 48,27
+	Actor116: t09
+		Owner: Neutral
+		Location: 49,28
+	Actor117: t04
+		Owner: Neutral
+		Location: 51,27
+	Actor118: t18
+		Owner: Neutral
+		Location: 51,22
+	Actor119: t09
+		Owner: Neutral
+		Location: 50,23
+	Actor120: t04
+		Owner: Neutral
+		Location: 52,22
+	Actor121: t18
+		Owner: Neutral
+		Location: 42,40
+	Actor122: t04
+		Owner: Neutral
+		Location: 43,39
+	Actor123: split2
+		Owner: Neutral
+		Location: 50,39
+	Actor124: t08
+		Owner: Neutral
+		Location: 47,32
+	Actor125: t04
+		Owner: Neutral
+		Location: 46,31
+	Actor126: t04
+		Owner: Neutral
+		Location: 50,46
+	Actor127: v25
+		Owner: Neutral
+		Location: 68,35
+	Actor128: v24
+		Owner: Neutral
+		Location: 65,35
+	Actor129: v33
+		Owner: Neutral
+		Location: 68,38
+	Actor130: v27
+		Owner: Neutral
+		Location: 66,33
+	Actor131: v22
+		Owner: Neutral
+		Location: 68,33
+	Actor132: v29
+		Owner: Neutral
+		Location: 68,32
+	Actor133: v24
+		Owner: Neutral
+		Location: 69,29
+	Actor134: v27
+		Owner: Neutral
+		Location: 69,28
+	Actor135: v30
+		Owner: Neutral
+		Location: 65,31
+	Actor136: v28
+		Owner: Neutral
+		Location: 66,30
+	Actor137: t18
+		Owner: Neutral
+		Location: 65,28
+	Actor138: t18
+		Owner: Neutral
+		Location: 69,34
+	Actor139: t08
+		Owner: Neutral
+		Location: 69,32
+	Actor140: t04
+		Owner: Neutral
+		Location: 69,25
+	Actor141: t04
+		Owner: Neutral
+		Location: 66,45
+	Actor142: t18
+		Owner: Neutral
+		Location: 63,18
+	Actor143: v36
+		Owner: Neutral
+		Location: 64,20
+	Actor144: t04
+		Owner: Neutral
+		Location: 63,19
+	Actor145: t18
+		Owner: Neutral
+		Location: 62,1
+	Actor146: t18
+		Owner: Neutral
+		Location: 66,-1
+	Actor147: t18
+		Owner: Neutral
+		Location: 71,3
+	Actor148: t08
+		Owner: Neutral
+		Location: 70,11
+	Actor149: t18
+		Owner: Neutral
+		Location: 65,7
+	Actor150: v33
+		Owner: Neutral
+		Location: 64,2
+	Actor151: t09
+		Owner: Neutral
+		Location: 63,2
+	Actor152: t04
+		Owner: Neutral
+		Location: 38,1
+	Actor153: split2
+		Owner: Neutral
+		Location: 58,7
+	Actor154: t18
+		Owner: Neutral
+		Location: 67,58
+	Actor155: t04
+		Owner: Neutral
+		Location: 66,60
+	Actor157: t08
+		Owner: Neutral
+		Location: 63,69
+	Actor160: v19
+		Owner: Neutral
+		Location: 62,65
+	Actor161: v19
+		Owner: Neutral
+		Location: 53,66
+	Actor162: t18
+		Owner: Neutral
+		Location: 51,64
+	Actor163: t04
+		Owner: Neutral
+		Location: 51,65
+	Actor164: t04
+		Owner: Neutral
+		Location: 56,64
+	Actor165: t04
+		Owner: Neutral
+		Location: 62,63
+	Actor166: mpspawn
+		Owner: Neutral
+		Location: 49,55
+	Actor167: t04
+		Owner: Neutral
+		Location: 4,10
+	Actor168: split2
+		Owner: Neutral
+		Location: 61,58
+	Actor169: split2
+		Owner: Neutral
+		Location: 10,13
+
+Rules: rules.yaml

mods/cnc/maps/desert-rats-cnc/rules.yaml

@@ -0,0 +1,6 @@
+World:
+	GlobalLightingPaletteEffect:
+		Red: 1.1
+		Green: 0.95
+		Blue: 1.051
+		Ambient: 0.68