Merge remote-tracking branch 'matt/bleed'

OpenRA.Game/Game.cs

@@ -392,6 +392,7 @@ namespace OpenRA
 			// Work around a miscompile in mono 2.6.7:
 			// booleans that default to true cannot be set false by an initializer
 			settings.AdvertiseOnline = false;
+			settings.AllowUPnP = false;
 
 			server = new Server.Server(new IPEndPoint(IPAddress.Loopback, 0),
 				Game.Settings.Game.Mods, settings, modData);

OpenRA.Game/Graphics/CursorProvider.cs

@@ -25,9 +25,13 @@ namespace OpenRA.Graphics
 		{
 			cursors = new Dictionary<string, CursorSequence>();
 			var sequences = new MiniYaml(null, sequenceFiles.Select(s => MiniYaml.FromFile(s)).Aggregate(MiniYaml.MergeLiberal));
+			var transparent = false;
+
+			if (sequences.NodesDict.ContainsKey("Transparent"))
+				transparent = true;
 
 			foreach (var s in sequences.NodesDict["Palettes"].Nodes)
-				Game.modData.Palette.AddPalette(s.Key, new Palette(FileSystem.Open(s.Value.Value), true));
+				Game.modData.Palette.AddPalette(s.Key, new Palette(FileSystem.Open(s.Value.Value), transparent));
 
 			foreach (var s in sequences.NodesDict["Cursors"].Nodes)
 				LoadSequencesForCursor(s.Key, s.Value);

OpenRA.Game/Traits/World/PlayerColorPalette.cs

@@ -17,7 +17,7 @@ namespace OpenRA.Traits
 	{
 		public readonly string BasePalette = null;
 		public readonly string BaseName = "player";
-		public readonly PaletteFormat PaletteFormat = PaletteFormat.ra;
+		public readonly int[] RemapIndex = {};
 
 		public object Create( ActorInitializer init ) { return new PlayerColorPalette( init.self.Owner, this ); }
 	}
@@ -37,7 +37,7 @@ namespace OpenRA.Traits
 		{
 			var paletteName = "{0}{1}".F( info.BaseName, owner.InternalName );
 			var newpal = new Palette(wr.GetPalette(info.BasePalette),
-							 new PlayerColorRemap(info.PaletteFormat, owner.ColorRamp));
+							 new PlayerColorRemap(info.RemapIndex, owner.ColorRamp));
 			wr.AddPalette(paletteName, newpal);
 		}
 	}