Fix an invalid owner init entry in nod05.

to fix transparency again

.gitattributes

@@ -1,4 +1,6 @@
 # Enforce LF normalization on Windows
+*.yaml eol=lf
+*.lua eol=lf
 * text=lf
 
 # Custom for Visual Studio

.gitignore

@@ -28,17 +28,8 @@ mods/*/*.mdb
 /*.pdb
 /*.mdb
 /*.exe
-thirdparty/StyleCop*
-thirdparty/ICSharpCode.SharpZipLib.dll*
-thirdparty/MaxMind*
-thirdparty/RestSharp*
-thirdparty/Newtonsoft.Json*
-thirdparty/SharpFont*
-thirdparty/windows/freetype6.dll
-thirdparty/nunit*
-thirdparty/windows/SDL2.dll
-thirdparty/Mono.Nat.dll
-thirdparty/nuget.exe
+thirdparty/download/*
+*.mmdb.gz
 
 # backup files by various editors
 *~

.travis.yml

@@ -2,15 +2,26 @@
 # see travis-ci.org for details
 
 language: csharp
+mono: 3.12.0
 
-# Use the Docker-based infrastructure
-sudo: false
-cache: apt
+# Don't use the container based infrastructure
+sudo: true
 
+cache:
+  directories:
+  - thirdparty/download
+
+# Environment variables
+env:
+  secure: "C0+Hlfa0YGErxUuWV00Tj6p45otC/D3YwYFuLpi2mj1rDFn/4dgh5WRngjvdDBVbXJ3duaZ78jPHWm1jr7vn2jqj9yETsCIK9psWd38ep/FEBM0SDr6MUD89OuXk/YyvxJAE+UXF6bXg7giey09g/CwBigjMW7ynET3wNAWPHPs="
+
+# Fetch dependencies
 # Run the build script
-# call RALint to check for YAML errors
+# Check source code with StyleCop
+# call OpenRA to check for YAML errors
 script:
- - travis_retry make cli-dependencies
+ - sudo apt-get remove nuget # https://github.com/travis-ci/travis-ci/issues/3940
+ - travis_retry make all-dependencies
  - make all
  - make check
  - make test
@@ -38,9 +49,7 @@ notifications:
     skip_join: true
 
 before_deploy:
- - apt-get download nsis nsis-common markdown
- - dpkg -x nsis*deb $HOME
- - dpkg -x markdown*deb $HOME
+ - sudo apt-get install nsis nsis-common dpkg markdown
  - export PATH=$PATH:$HOME/usr/bin
  - DOTVERSION=`echo ${TRAVIS_TAG} | sed "s/-/\\./g"`
  - cd packaging

AUTHORS

@@ -4,6 +4,7 @@ hard work of many contributors.
 The OpenRA developers are:
     * Chris Forbes (chrisf)
     * Curtis Shmyr (hamb)
+    * Igor Popov (ihptru)
     * Matthias Mailänder (Mailaender)
     * Oliver Brakmann (obrakmann)
     * Paul Chote (pchote)
@@ -38,6 +39,7 @@ Also thanks to:
     * D2k Sardaukar
     * Daniel Derejvanik (Harisson)
     * Danny Keary (Dan9550)
+    * David Jiménez (Rydra)
     * David Russell (DavidARussell)
     * DeadlySurprise
     * Erasmus Schroder (rasco)
@@ -45,16 +47,17 @@ Also thanks to:
     * Fahrradkette
     * Frank Razenberg (zzattack)
     * Gareth Needham (Ripley`)
+    * Glen Anderson (GlenAnderson)
     * Glenn Martin Jensen (Baxxster)
     * Gordon Martin (Happy0)
     * Guido Lipke (LipkeGu)
     * Huw Pascoe
     * Ian T. Jacobsen (Smilex)
-    * Igor Popov (ihptru)
     * Imago
     * Iran
     * Jacob Dufault (jacobdufault)
     * James Dunne (jsd)
+    * Jan-Willem Buurlage (jwbuurlage)
     * Jason (atlimit8)
     * Jeff Harris (jeff_1amstudios)
     * Jes
@@ -77,11 +80,13 @@ Also thanks to:
     * Michael Sztolcman (s1w_)
     * Mustafa Alperen Seki (MustaphaTR)
     * Neil Shivkar (havok13888)
+    * Nooze
     * Nukem
     * Okunev Yu Dmitry (xaionaro)
     * Olaf van der Spek
     * Paolo Chiodi (paolochiodi)
     * Paul Dovydaitis (pdovy)
+    * Pavel Penev (penev92)
     * Pavlos Touboulidis (pav)
     * Pizzaoverhead
     * Psydev

Makefile

@@ -40,7 +40,7 @@
 CSC         = dmcs
 CSFLAGS     = -nologo -warn:4 -debug:full -optimize- -codepage:utf8 -unsafe -warnaserror
 DEFINE      = DEBUG;TRACE
-COMMON_LIBS = System.dll System.Core.dll System.Data.dll System.Data.DataSetExtensions.dll System.Drawing.dll System.Xml.dll thirdparty/ICSharpCode.SharpZipLib.dll thirdparty/FuzzyLogicLibrary.dll thirdparty/Mono.Nat.dll thirdparty/MaxMind.Db.dll thirdparty/MaxMind.GeoIP2.dll thirdparty/Eluant.dll
+COMMON_LIBS = System.dll System.Core.dll System.Data.dll System.Data.DataSetExtensions.dll System.Drawing.dll System.Xml.dll thirdparty/download/ICSharpCode.SharpZipLib.dll thirdparty/download/FuzzyLogicLibrary.dll thirdparty/download/Mono.Nat.dll thirdparty/download/MaxMind.Db.dll thirdparty/download/MaxMind.GeoIP2.dll thirdparty/download/Eluant.dll
 
 
 
@@ -71,9 +71,17 @@ INSTALL_DATA = $(INSTALL) -m644
 
 # program targets
 CORE = rsdl2 rnull game utility
-TOOLS = editor tsbuild crashdialog
+TOOLS = editor crashdialog
 VERSION     = $(shell git name-rev --name-only --tags --no-undefined HEAD 2>/dev/null || echo git-`git rev-parse --short HEAD`)
 
+# dependencies
+UNAME_S := $(shell uname -s)
+ifeq ($(UNAME_S),Linux)
+os-dependencies = linux-dependencies
+else ifeq ($(UNAME_S),Darwin)
+os-dependencies = osx-dependencies
+endif
+
 
 
 ######################## PROGRAM TARGET RULES ##########################
@@ -83,7 +91,7 @@ VERSION     = $(shell git name-rev --name-only --tags --no-undefined HEAD 2>/dev
 game_SRCS := $(shell find OpenRA.Game/ -iname '*.cs')
 game_TARGET = OpenRA.Game.exe
 game_KIND = winexe
-game_LIBS = $(COMMON_LIBS) $(game_DEPS) thirdparty/SDL2-CS.dll thirdparty/SharpFont.dll
+game_LIBS = $(COMMON_LIBS) $(game_DEPS) thirdparty/download/SDL2-CS.dll thirdparty/download/SharpFont.dll
 game_FLAGS = -win32icon:OpenRA.Game/OpenRA.ico
 PROGRAMS += game
 game: $(game_TARGET)
@@ -93,7 +101,7 @@ rsdl2_SRCS := $(shell find OpenRA.Renderer.Sdl2/ -iname '*.cs')
 rsdl2_TARGET = OpenRA.Renderer.Sdl2.dll
 rsdl2_KIND = library
 rsdl2_DEPS = $(game_TARGET)
-rsdl2_LIBS = $(COMMON_LIBS) thirdparty/SDL2-CS.dll $(rsdl2_DEPS)
+rsdl2_LIBS = $(COMMON_LIBS) thirdparty/download/SDL2-CS.dll $(rsdl2_DEPS)
 
 rnull_SRCS := $(shell find OpenRA.Renderer.Null/ -iname '*.cs')
 rnull_TARGET = OpenRA.Renderer.Null.dll
@@ -108,7 +116,7 @@ mod_common_SRCS := $(shell find OpenRA.Mods.Common/ -iname '*.cs')
 mod_common_TARGET = mods/common/OpenRA.Mods.Common.dll
 mod_common_KIND = library
 mod_common_DEPS = $(game_TARGET)
-mod_common_LIBS = $(COMMON_LIBS) $(STD_MOD_LIBS) thirdparty/StyleCop.dll thirdparty/StyleCop.CSharp.dll thirdparty/StyleCop.CSharp.Rules.dll
+mod_common_LIBS = $(COMMON_LIBS) $(STD_MOD_LIBS) thirdparty/download/StyleCop.dll thirdparty/download/StyleCop.CSharp.dll thirdparty/download/StyleCop.CSharp.Rules.dll
 PROGRAMS += mod_common
 mod_common: $(mod_common_TARGET)
 
@@ -160,7 +168,7 @@ editor_SRCS := $(shell find OpenRA.Editor/ -iname '*.cs')
 editor_TARGET = OpenRA.Editor.exe
 editor_KIND = winexe
 editor_DEPS = $(game_TARGET) $(mod_common_TARGET)
-editor_LIBS = System.Windows.Forms.dll System.Data.dll System.Drawing.dll $(editor_DEPS) thirdparty/Eluant.dll
+editor_LIBS = System.Windows.Forms.dll System.Data.dll System.Drawing.dll $(editor_DEPS) thirdparty/download/Eluant.dll
 editor_EXTRA = -resource:OpenRA.Editor.Form1.resources -resource:OpenRA.Editor.MapSelect.resources
 editor_FLAGS = -win32icon:OpenRA.Editor/OpenRA.Editor.Icon.ico
 
@@ -208,9 +216,6 @@ check: utility mods
 	@echo
 	@echo "Checking for code style violations in OpenRA.Test..."
 	@mono --debug OpenRA.Utility.exe ra --check-code-style OpenRA.Test
-	@echo
-	@echo "Checking for code style violations in OpenRA.TilesetBuilder..."
-	@mono --debug OpenRA.Utility.exe ra --check-code-style OpenRA.TilesetBuilder
 
 test: utility mods
 	@echo
@@ -226,22 +231,6 @@ test: utility mods
 	@echo "Testing Red Alert mod MiniYAML..."
 	@mono --debug OpenRA.Utility.exe ra --check-yaml
 
-# Builds and exports tilesets from a bitmap
-tsbuild_SRCS := $(shell find OpenRA.TilesetBuilder/ -iname '*.cs')
-tsbuild_TARGET = OpenRA.TilesetBuilder.exe
-tsbuild_KIND = winexe
-tsbuild_DEPS = $(game_TARGET)
-tsbuild_LIBS = $(COMMON_LIBS) $(tsbuild_DEPS) System.Windows.Forms.dll
-tsbuild_EXTRA = -resource:OpenRA.TilesetBuilder.FormBuilder.resources -resource:OpenRA.TilesetBuilder.FormNew.resources -resource:OpenRA.TilesetBuilder.Surface.resources
-PROGRAMS += tsbuild
-OpenRA.TilesetBuilder.FormBuilder.resources:
-	resgen2 OpenRA.TilesetBuilder/FormBuilder.resx OpenRA.TilesetBuilder.FormBuilder.resources 1> /dev/null
-OpenRA.TilesetBuilder.FormNew.resources:
-	resgen2 OpenRA.TilesetBuilder/frmNew.resx OpenRA.TilesetBuilder.FormNew.resources 1> /dev/null
-OpenRA.TilesetBuilder.Surface.resources:
-	resgen2 OpenRA.TilesetBuilder/Surface.resx OpenRA.TilesetBuilder.Surface.resources 1> /dev/null
-tsbuild: OpenRA.TilesetBuilder.FormBuilder.resources OpenRA.TilesetBuilder.FormNew.resources OpenRA.TilesetBuilder.Surface.resources $(tsbuild_TARGET)
-
 
 ##### Launchers / Utilities #####
 
@@ -259,7 +248,7 @@ utility_SRCS := $(shell find OpenRA.Utility/ -iname '*.cs')
 utility_TARGET = OpenRA.Utility.exe
 utility_KIND = exe
 utility_DEPS = $(game_TARGET)
-utility_LIBS = $(COMMON_LIBS) $(utility_DEPS) thirdparty/ICSharpCode.SharpZipLib.dll
+utility_LIBS = $(COMMON_LIBS) $(utility_DEPS) thirdparty/download/ICSharpCode.SharpZipLib.dll
 PROGRAMS += utility
 utility: $(utility_TARGET)
 
@@ -290,43 +279,58 @@ $(foreach prog,$(PROGRAMS),$(eval $(call BUILD_ASSEMBLY,$(prog))))
 
 ########################## MAKE/INSTALL RULES ##########################
 #
-default: cli-dependencies core
+default: core
 
 core: game renderers mods utility
 
-tools: editor tsbuild gamemonitor
+tools: editor gamemonitor
 
-package: cli-dependencies core editor gamemonitor docs version
+package: all-dependencies core tools docs version
 
 mods: mod_common mod_ra mod_cnc mod_d2k mod_ts
 
-all: cli-dependencies core tools
+all: dependencies core tools
 
 clean:
-	@-$(RM_F) *.exe *.dll ./OpenRA*/*.dll ./OpenRA*/*.mdb *.mdb mods/**/*.dll mods/**/*.mdb *.resources
+	@-$(RM_F) *.exe *.dll *.dylib *.dll.config ./OpenRA*/*.dll ./OpenRA*/*.mdb *.mdb mods/**/*.dll mods/**/*.mdb *.resources
 	@-$(RM_RF) ./*/bin ./*/obj
+	@-$(RM_RF) ./thirdparty/download
 
 distclean: clean
 
-dependencies: cli-dependencies native-dependencies
-
 cli-dependencies:
-	cd thirdparty && ./fetch-thirdparty-deps.sh && cd ..
-	@ $(CP_R) thirdparty/*.dll .
-	@ $(CP_R) thirdparty/*.dll.config .
+	@./thirdparty/fetch-thirdparty-deps.sh
+	@ $(CP_R) thirdparty/download/*.dll .
+	@ $(CP_R) thirdparty/download/*.dll.config .
+	@ $(CP) thirdparty/SDL2-CS.dll.config .
 
-native-dependencies:
-	@./configure
+linux-dependencies: cli-dependencies linux-native-dependencies
 
-version: mods/ra/mod.yaml mods/cnc/mod.yaml mods/d2k/mod.yaml mods/modchooser/mod.yaml
+linux-native-dependencies:
+	@./thirdparty/configure-linux-native-deps.sh
+
+windows-dependencies:
+	@./thirdparty/fetch-thirdparty-deps-windows.sh
+
+osx-dependencies: cli-dependencies
+	@./thirdparty/fetch-thirdparty-deps-osx.sh
+	@ $(CP_R) thirdparty/download/osx/*.dylib .
+	@ $(CP_R) thirdparty/download/osx/*.dll.config .
+
+dependencies: $(os-dependencies)
+	@./thirdparty/fetch-geoip-db.sh
+	@ $(CP) thirdparty/download/GeoLite2-Country.mmdb.gz .
+
+all-dependencies: cli-dependencies windows-dependencies osx-dependencies
+
+version: mods/ra/mod.yaml mods/cnc/mod.yaml mods/d2k/mod.yaml mods/modchooser/mod.yaml mods/all/mod.yaml
 	@for i in $? ; do \
 		awk '{sub("Version:.*$$","Version: $(VERSION)"); print $0}' $${i} > $${i}.tmp && \
 		mv -f $${i}.tmp $${i} ; \
 	done
 
-# Documentation (d2k depends on all mod libraries)
-docs: utility mods
-	@mono --debug OpenRA.Utility.exe d2k --docs > DOCUMENTATION.md
+docs: utility mods version
+	@mono --debug OpenRA.Utility.exe all --docs > DOCUMENTATION.md
 	@mono --debug OpenRA.Utility.exe ra --lua-docs > Lua-API.md
 
 install: install-core
@@ -351,7 +355,7 @@ install-core: default
 	@$(CP_R) mods/modchooser "$(DATA_INSTALL_DIR)/mods/"
 
 	@$(INSTALL_DATA) "global mix database.dat" "$(DATA_INSTALL_DIR)/global mix database.dat"
-	@$(INSTALL_DATA) "GeoLite2-Country.mmdb" "$(DATA_INSTALL_DIR)/GeoLite2-Country.mmdb"
+	@$(INSTALL_DATA) "GeoLite2-Country.mmdb.gz" "$(DATA_INSTALL_DIR)/GeoLite2-Country.mmdb.gz"
 	@$(INSTALL_DATA) AUTHORS "$(DATA_INSTALL_DIR)/AUTHORS"
 	@$(INSTALL_DATA) COPYING "$(DATA_INSTALL_DIR)/COPYING"
 
@@ -377,7 +381,6 @@ install-tools: tools
 	@-echo "Installing OpenRA tools to $(DATA_INSTALL_DIR)"
 	@$(INSTALL_DIR) "$(DATA_INSTALL_DIR)"
 	@$(INSTALL_PROGRAM) $(foreach prog,$(TOOLS),$($(prog)_TARGET)) "$(DATA_INSTALL_DIR)"
-	@$(RM) $(DATA_INSTALL_DIR)/OpenRA.TilesetBuilder.exe # TODO: won't work outside the source tree
 
 install-linux-icons:
 	@$(INSTALL_DIR) "$(DESTDIR)$(datadir)/icons/"
@@ -388,6 +391,18 @@ install-linux-desktop:
 	@$(INSTALL_DATA) packaging/linux/openra.desktop "$(DESTDIR)$(datadir)/applications"
 	@$(INSTALL_DATA) packaging/linux/openra-editor.desktop "$(DESTDIR)$(datadir)/applications"
 
+install-linux-mime:
+	@$(INSTALL_DIR) "$(DESTDIR)$(datadir)/mime/packages/"
+	@$(INSTALL_DATA) packaging/linux/openra-mimeinfo.xml "$(DESTDIR)$(datadir)/mime/packages/openra.xml"
+
+	@$(INSTALL_DIR) "$(DESTDIR)$(datadir)/applications"
+	@$(INSTALL_DATA) packaging/linux/openra-join-servers.desktop "$(DESTDIR)$(datadir)/applications"
+	@$(INSTALL_DATA) packaging/linux/openra-replays.desktop "$(DESTDIR)$(datadir)/applications"
+
+install-linux-appdata:
+	@$(INSTALL_DIR) "$(DESTDIR)$(datadir)/appdata/"
+	@$(INSTALL_DATA) packaging/linux/openra.appdata.xml "$(DESTDIR)$(datadir)/appdata/"
+
 install-linux-scripts:
 	@echo "#!/bin/sh" > openra
 	@echo 'cd "$(gameinstalldir)"' >> openra
@@ -423,6 +438,8 @@ uninstall:
 	@-$(RM_F) "$(DESTDIR)$(datadir)/icons/hicolor/48x48/apps/openra-editor.png"
 	@-$(RM_F) "$(DESTDIR)$(datadir)/icons/hicolor/64x64/apps/openra.png"
 	@-$(RM_F) "$(DESTDIR)$(datadir)/icons/hicolor/128x128/apps/openra.png"
+	@-$(RM_F) "$(DESTDIR)$(datadir)/mime/packages/openra.xml"
+	@-$(RM_F) "$(DESTDIR)$(datadir)/appdata/openra.appdata.xml"
 
 help:
 	@echo to compile, run:

OpenRA.Editor/ActorTool.cs

@@ -26,12 +26,12 @@ namespace OpenRA.Editor
 
 		public void Apply(Surface surface)
 		{
-			if (surface.Map.Actors.Value.Any(a => a.Value.Location() == surface.GetBrushLocation()))
+			if (surface.Actors.Any(a => a.Value.Location() == surface.GetBrushLocation()))
 				return;
 
 			var owner = surface.NewActorOwner;
 			var id = NextActorName(surface);
-			surface.Map.Actors.Value[id] = new ActorReference(actorTemplate.Info.Name.ToLowerInvariant())
+			surface.Actors[id] = new ActorReference(actorTemplate.Info.Name.ToLowerInvariant())
 			{
 				new LocationInit(surface.GetBrushLocation()),
 				new OwnerInit(owner)
@@ -44,7 +44,7 @@ namespace OpenRA.Editor
 			for (;;)
 			{
 				var possible = "Actor{0}".F(id++);
-				if (!surface.Map.Actors.Value.ContainsKey(possible)) return possible;
+				if (!surface.Actors.ContainsKey(possible)) return possible;
 			}
 		}
 	}

OpenRA.Editor/Form1.cs

@@ -126,8 +126,11 @@ namespace OpenRA.Editor
 
 			// upgrade maps that have no player definitions. editor doesnt care,
 			// but this breaks the game pretty badly.
-			if (map.Players.Count == 0)
-				map.MakeDefaultPlayers();
+			if (map.PlayerDefinitions.Count == 0)
+			{
+				var players = new MapPlayers(map.Rules, map.SpawnPoints.Value.Length);
+				map.PlayerDefinitions = players.ToMiniYaml();
+			}
 
 			PrepareMapResources(Game.ModData, map);
 
@@ -170,7 +173,7 @@ namespace OpenRA.Editor
 			foreach (var p in palettes) { p.Visible = false; p.SuspendLayout(); }
 
 			var templateOrder = tileset.EditorTemplateOrder ?? new string[] { };
-			foreach (var tc in tileset.Templates.GroupBy(t => t.Value.Category).OrderBy(t => Array.IndexOf(templateOrder, t.Key)))
+			foreach (var tc in tileset.Templates.GroupBy(t => t.Value.Category).OrderBy(t => templateOrder.IndexOf(t.Key)))
 			{
 				var category = tc.Key ?? "(Uncategorized)";
 				var categoryHeader = new Label
@@ -210,7 +213,7 @@ namespace OpenRA.Editor
 
 						var template = t.Value;
 						tilePalette.Controls.Add(ibox);
-						tt.SetToolTip(ibox, "{1}:{0} ({2}x{3})".F(template.Image, template.Id, template.Size.X, template.Size.Y));
+						tt.SetToolTip(ibox, "{1}:{0} ({2}x{3})".F(template.Images[0], template.Id, template.Size.X, template.Size.Y));
 					}
 					catch { }
 				}
@@ -238,7 +241,9 @@ namespace OpenRA.Editor
 					if (rsi != null && rsi.EditorPalette != null && rsi.EditorPalette.Contains("terrain"))
 						templatePalette = palette;
 
-					var template = RenderUtils.RenderActor(info, tileset, templatePalette);
+					var race = Program.Rules.Actors["world"].Traits.WithInterface<CountryInfo>().First().Race;
+					var sequenceProvider = Program.Rules.Sequences[tileset.Id];
+					var template = RenderUtils.RenderActor(info, sequenceProvider, tileset, templatePalette, race);
 					var ibox = new PictureBox
 					{
 						Image = template.Bitmap,
@@ -267,7 +272,7 @@ namespace OpenRA.Editor
 			{
 				try
 				{
-					var template = RenderUtils.RenderResourceType(a, tileset.Extensions, shadowedPalette);
+					var template = RenderUtils.RenderResourceType(a, tileset, shadowedPalette);
 					var ibox = new PictureBox
 					{
 						Image = template.Bitmap,
@@ -313,7 +318,7 @@ namespace OpenRA.Editor
 		void PopulateActorOwnerChooser()
 		{
 			actorOwnerChooser.Items.Clear();
-			actorOwnerChooser.Items.AddRange(surface1.Map.Players.Values.ToArray());
+			actorOwnerChooser.Items.AddRange(new MapPlayers(surface1.Map.PlayerDefinitions).Players.Values.ToArray());
 			actorOwnerChooser.SelectedIndex = 0;
 			surface1.NewActorOwner = ((PlayerReference)actorOwnerChooser.SelectedItem).Name;
 		}
@@ -410,8 +415,9 @@ namespace OpenRA.Editor
 					map.ResizeCordon((int)nmd.CordonLeft.Value, (int)nmd.CordonTop.Value,
 						(int)nmd.CordonRight.Value, (int)nmd.CordonBottom.Value);
 
-					map.Players.Clear();
-					map.MakeDefaultPlayers();
+					var players = new MapPlayers(map.Rules, map.SpawnPoints.Value.Length);
+					map.PlayerDefinitions = players.ToMiniYaml();
+
 					map.FixOpenAreas(Program.Rules);
 
 					NewMap(map);
@@ -500,8 +506,8 @@ namespace OpenRA.Editor
 		void SetupDefaultPlayers(object sender, EventArgs e)
 		{
 			dirty = true;
-			surface1.Map.Players.Clear();
-			surface1.Map.MakeDefaultPlayers();
+			var players = new MapPlayers(surface1.Map.Rules, surface1.Map.SpawnPoints.Value.Length);
+			surface1.Map.PlayerDefinitions = players.ToMiniYaml();
 
 			surface1.Chunks.Clear();
 			surface1.Invalidate();
@@ -575,10 +581,11 @@ namespace OpenRA.Editor
 
 		void AboutToolStripMenuItemClick(object sender, EventArgs e)
 		{
-			MessageBox.Show("OpenRA and OpenRA Editor are Free/Libre Open Source Software released under the GNU General Public License version 3. See AUTHORS and COPYING for details.",
-							"About",
-							MessageBoxButtons.OK,
-							MessageBoxIcon.Asterisk);
+			MessageBox.Show(
+				"OpenRA and OpenRA Editor are Free/Libre Open Source Software released under the GNU General Public License version 3. See AUTHORS and COPYING for details.",
+				"About",
+				MessageBoxButtons.OK,
+				MessageBoxIcon.Asterisk);
 		}
 
 		void HelpToolStripButton_Click(object sender, EventArgs e)

OpenRA.Editor/OpenRA.Editor.csproj

@@ -59,7 +59,7 @@
     <Reference Include="System.Windows.Forms" />
     <Reference Include="System.Xml" />
     <Reference Include="Eluant">
-      <HintPath>..\thirdparty\Eluant.dll</HintPath>
+      <HintPath>..\thirdparty\download\Eluant.dll</HintPath>
       <Private>False</Private>
     </Reference>
   </ItemGroup>

OpenRA.Editor/RenderUtils.cs

@@ -14,6 +14,7 @@ using System.Linq;
 using OpenRA.FileFormats;
 using OpenRA.FileSystem;
 using OpenRA.Graphics;
+using OpenRA.Mods.Common.Graphics;
 using OpenRA.Mods.Common.SpriteLoaders;
 using OpenRA.Traits;
 
@@ -46,27 +47,30 @@ namespace OpenRA.Editor
 			return bitmap;
 		}
 
-		public static ActorTemplate RenderActor(ActorInfo info, TileSet tileset, IPalette p)
+		static readonly string[] LegacyExtensions = new[] { ".shp", ".tem", "" };
+
+		static string ResolveFilename(string name, TileSet tileSet)
 		{
-			var image = info.Traits.Get<ILegacyEditorRenderInfo>().EditorImage(info);
-			using (var s = GlobalFileSystem.OpenWithExts(image, tileset.Extensions))
+			var ssl = Game.ModData.SpriteSequenceLoader as TilesetSpecificSpriteSequenceLoader;
+			var extensions = ssl != null ? new[] { ssl.TilesetExtensions[tileSet.Id], ssl.DefaultSpriteExtension }.Append(LegacyExtensions) :
+				LegacyExtensions.AsEnumerable();
+
+			foreach (var e in extensions)
+				if (GlobalFileSystem.Exists(name + e))
+					return name + e;
+
+			return name;
+		}
+
+		public static ActorTemplate RenderActor(ActorInfo info, SequenceProvider sequenceProvider, TileSet tileset, IPalette p, string race)
+		{
+			var image = info.Traits.Get<ILegacyEditorRenderInfo>().EditorImage(info, sequenceProvider, race);
+			image = ResolveFilename(image, tileset);
+			using (var s = GlobalFileSystem.Open(image))
 			{
 				var shp = new ShpTDSprite(s);
 				var bitmap = RenderShp(shp, p);
 
-				try
-				{
-					using (var s2 = GlobalFileSystem.OpenWithExts(image + "2", tileset.Extensions))
-					{
-						var shp2 = new ShpTDSprite(s2);
-						var roofBitmap = RenderShp(shp2, p);
-
-						using (var g = System.Drawing.Graphics.FromImage(bitmap))
-							g.DrawImage(roofBitmap, 0, 0);
-					}
-				}
-				catch { }
-
 				return new ActorTemplate
 				{
 					Bitmap = bitmap,
@@ -76,10 +80,10 @@ namespace OpenRA.Editor
 			}
 		}
 
-		public static ResourceTemplate RenderResourceType(ResourceTypeInfo info, string[] exts, IPalette p)
+		public static ResourceTemplate RenderResourceType(ResourceTypeInfo info, TileSet tileset, IPalette p)
 		{
-			var image = info.EditorSprite;
-			using (var s = GlobalFileSystem.OpenWithExts(image, exts))
+			var image = ResolveFilename(info.EditorSprite, tileset);
+			using (var s = GlobalFileSystem.Open(image))
 			{
 				// TODO: Do this properly
 				var shp = new ShpTDSprite(s);

OpenRA.Editor/Surface.cs

@@ -43,6 +43,7 @@ namespace OpenRA.Editor
 	class Surface : Control
 	{
 		public Map Map { get; private set; }
+		public Dictionary<string, ActorReference> Actors { get; private set; }
 		public TileSet TileSet { get; private set; }
 		public TileSetRenderer TileSetRenderer { get; private set; }
 		public IPalette Palette { get; private set; }
@@ -84,6 +85,9 @@ namespace OpenRA.Editor
 		public void Bind(Map m, TileSet ts, TileSetRenderer tsr, IPalette p, IPalette pp)
 		{
 			Map = m;
+			if (m != null)
+				Actors = m.ActorDefinitions.ToDictionary(n => n.Key, n => new ActorReference(n.Value.Value, n.Value.ToDictionary()));
+
 			TileSet = ts;
 			TileSetRenderer = tsr;
 			Palette = p;
@@ -132,7 +136,7 @@ namespace OpenRA.Editor
 		{
 			base.OnDoubleClick(e);
 
-			var x = Map.Actors.Value.FirstOrDefault(a => a.Value.Location() == GetBrushLocation());
+			var x = Actors.FirstOrDefault(a => a.Value.Location() == GetBrushLocation());
 			if (x.Key != null)
 				ActorDoubleClicked(x);
 		}
@@ -203,8 +207,8 @@ namespace OpenRA.Editor
 
 			currentTool = null;
 
-			var key = Map.Actors.Value.FirstOrDefault(a => a.Value.Location() == brushLocation);
-			if (key.Key != null) Map.Actors.Value.Remove(key.Key);
+			var key = Actors.FirstOrDefault(a => a.Value.Location() == brushLocation);
+			if (key.Key != null) Actors.Remove(key.Key);
 
 			if (Map.MapResources.Value[brushLocation].Type != 0)
 			{
@@ -274,6 +278,15 @@ namespace OpenRA.Editor
 						var ui = u * ChunkSize + i;
 						var vj = v * ChunkSize + j;
 						var uv = new MPos(ui, vj);
+						if (uv.U >= Map.MapSize.X || uv.V >= Map.MapSize.Y)
+						{
+							for (var x = 0; x < TileSetRenderer.TileSize; x++)
+								for (var y = 0; y < TileSetRenderer.TileSize; y++)
+									p[(j * TileSetRenderer.TileSize + y) * stride + i * TileSetRenderer.TileSize + x] = 0;
+
+							continue;
+						}
+
 						var tr = Map.MapTiles.Value[uv];
 						var tile = TileSetRenderer.Data(tr.Type);
 						if (tile == null)
@@ -283,7 +296,8 @@ namespace OpenRA.Editor
 						var rawImage = tile[index];
 						for (var x = 0; x < TileSetRenderer.TileSize; x++)
 							for (var y = 0; y < TileSetRenderer.TileSize; y++)
-								p[(j * TileSetRenderer.TileSize + y) * stride + i * TileSetRenderer.TileSize + x] = Palette.GetColor(rawImage[x + TileSetRenderer.TileSize * y]).ToArgb();
+								p[(j * TileSetRenderer.TileSize + y) * stride + i * TileSetRenderer.TileSize + x] =
+									Palette.GetColor(rawImage[x + TileSetRenderer.TileSize * y]).ToArgb();
 
 						if (Map.MapResources.Value[uv].Type != 0)
 						{
@@ -385,8 +399,8 @@ namespace OpenRA.Editor
 
 		ColorPalette GetPaletteForPlayerInner(string name)
 		{
-			var pr = Map.Players[name];
-			var pcpi = Program.Rules.Actors["player"].Traits.Get<PlayerColorPaletteInfo>();
+			var pr = new MapPlayers(Map.PlayerDefinitions).Players[name];
+			var pcpi = Program.Rules.Actors["world"].Traits.Get<PlayerColorPaletteInfo>();
 			var remap = new PlayerColorRemap(pcpi.RemapIndex, pr.Color, pcpi.Ramp);
 			return new ImmutablePalette(PlayerPalette, remap).AsSystemPalette();
 		}
@@ -455,7 +469,7 @@ namespace OpenRA.Editor
 					height * (TileSetRenderer.TileSize * Zoom));
 			}
 
-			foreach (var ar in Map.Actors.Value)
+			foreach (var ar in Actors)
 			{
 				if (actorTemplates.ContainsKey(ar.Value.Type))
 					DrawActor(e.Graphics, ar.Value.Location(), actorTemplates[ar.Value.Type],
@@ -465,7 +479,7 @@ namespace OpenRA.Editor
 			}
 
 			if (ShowActorNames)
-				foreach (var ar in Map.Actors.Value)
+				foreach (var ar in Actors)
 					if (!ar.Key.StartsWith("Actor"))	// if it has a custom name
 						e.Graphics.DrawStringContrast(Font, ar.Key,
 							(int)(ar.Value.Location().X * TileSetRenderer.TileSize * Zoom + Offset.X),
@@ -499,7 +513,7 @@ namespace OpenRA.Editor
 
 			if (currentTool == null)
 			{
-				var x = Map.Actors.Value.FirstOrDefault(a => a.Value.Location() == GetBrushLocation());
+				var x = Actors.FirstOrDefault(a => a.Value.Location() == GetBrushLocation());
 				if (x.Key != null && actorTemplates.ContainsKey(x.Value.Type))
 					DrawActorBorder(e.Graphics, x.Value.Location(), actorTemplates[x.Value.Type]);
 			}

OpenRA.Editor/TileSetRenderer.cs

@@ -50,10 +50,10 @@ namespace OpenRA.Editor
 			this.TileSize = Math.Min(tileSize.Width, tileSize.Height);
 
 			templates = new Dictionary<ushort, byte[][]>();
-			var frameCache = new FrameCache(Game.ModData.SpriteLoaders, tileset.Extensions);
+			var frameCache = new FrameCache(Game.ModData.SpriteLoaders);
 			foreach (var t in tileset.Templates)
 			{
-				var allFrames = frameCache[t.Value.Image];
+				var allFrames = frameCache[t.Value.Images[0]];
 				var frames = t.Value.Frames != null ? t.Value.Frames.Select(f => allFrames[f]).ToArray() : allFrames;
 				templates.Add(t.Value.Id, frames.Select(f => ExtractSquareTile(f)).ToArray());
 			}

OpenRA.Game.exe.config

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<configuration>
+  <runtime>
+    <loadFromRemoteSources enabled="true" />
+  </runtime>
+</configuration>

OpenRA.Game/Actor.cs

@@ -25,11 +25,12 @@ namespace OpenRA
 	public class Actor : IScriptBindable, IScriptNotifyBind, ILuaTableBinding, ILuaEqualityBinding, ILuaToStringBinding, IEquatable<Actor>
 	{
 		public readonly ActorInfo Info;
+
 		public readonly World World;
+
 		public readonly uint ActorID;
 
-		[Sync]
-		public Player Owner;
+		[Sync] public Player Owner { get; set; }
 
 		public bool IsInWorld { get; internal set; }
 		public bool Destroyed { get; private set; }
@@ -65,8 +66,9 @@ namespace OpenRA
 			}
 		}
 
-		readonly IEnumerable<IRenderModifier> traitsImplementingRenderModifier;
-		readonly IEnumerable<IRender> traitsImplementingRender;
+		readonly IRenderModifier[] renderModifiers;
+		readonly IRender[] renders;
+		readonly IDisable[] disables;
 
 		internal Actor(World world, string name, TypeDictionary initDict)
 		{
@@ -108,8 +110,9 @@ namespace OpenRA
 				return new Rectangle(offset.X, offset.Y, size.X, size.Y);
 			});
 
-			traitsImplementingRenderModifier = TraitsImplementing<IRenderModifier>();
-			traitsImplementingRender = TraitsImplementing<IRender>();
+			renderModifiers = TraitsImplementing<IRenderModifier>().ToArray();
+			renders = TraitsImplementing<IRender>().ToArray();
+			disables = TraitsImplementing<IDisable>().ToArray();
 		}
 
 		public void Tick()
@@ -125,14 +128,14 @@ namespace OpenRA
 		public IEnumerable<IRenderable> Render(WorldRenderer wr)
 		{
 			var renderables = Renderables(wr);
-			foreach (var modifier in traitsImplementingRenderModifier)
+			foreach (var modifier in renderModifiers)
 				renderables = modifier.ModifyRender(this, wr, renderables);
 			return renderables;
 		}
 
 		IEnumerable<IRenderable> Renderables(WorldRenderer wr)
 		{
-			foreach (var render in traitsImplementingRender)
+			foreach (var render in renders)
 				foreach (var renderable in render.Render(this, wr))
 					yield return renderable;
 		}
@@ -181,7 +184,10 @@ namespace OpenRA
 
 		public override string ToString()
 		{
-			return "{0} {1}{2}".F(Info.Name, ActorID, IsInWorld ? "" : " (not in world)");
+			var name = Info.Name + " " + ActorID;
+			if (!IsInWorld)
+				name += " (not in world)";
+			return name;
 		}
 
 		public T Trait<T>()
@@ -232,16 +238,21 @@ namespace OpenRA
 		{
 			World.AddFrameEndTask(w =>
 			{
-				if (this.Destroyed)
+				if (Destroyed)
 					return;
 
 				var oldOwner = Owner;
+				var wasInWorld = IsInWorld;
 
 				// momentarily remove from world so the ownership queries don't get confused
-				w.Remove(this);
+				if (wasInWorld)
+					w.Remove(this);
+
 				Owner = newOwner;
 				Generation++;
-				w.Add(this);
+
+				if (wasInWorld)
+					w.Add(this);
 
 				foreach (var t in this.TraitsImplementing<INotifyOwnerChanged>())
 					t.OnOwnerChanged(this, oldOwner, newOwner);
@@ -256,6 +267,14 @@ namespace OpenRA
 			health.Value.InflictDamage(this, attacker, health.Value.MaxHP, null, true);
 		}
 
+		public bool IsDisabled()
+		{
+			foreach (var disable in disables)
+				if (disable.Disabled)
+					return true;
+			return false;
+		}
+
 		#region Scripting interface
 
 		Lazy<ScriptActorInterface> luaInterface;

OpenRA.Game/CPos.cs

@@ -37,7 +37,7 @@ namespace OpenRA
 
 		public override int GetHashCode() { return X.GetHashCode() ^ Y.GetHashCode(); }
 
-		public bool Equals(CPos other) { return other == this; }
+		public bool Equals(CPos other) { return X == other.X && Y == other.Y; }
 		public override bool Equals(object obj) { return obj is CPos && Equals((CPos)obj); }
 
 		public override string ToString() { return X + "," + Y; }

OpenRA.Game/CacheStorage.cs

@@ -0,0 +1,19 @@
+#region Copyright & License Information
+/*
+ * Copyright 2007-2015 The OpenRA Developers (see AUTHORS)
+ * This file is part of OpenRA, which is free software. It is made
+ * available to you under the terms of the GNU General Public License
+ * as published by the Free Software Foundation. For more information,
+ * see COPYING.
+ */
+#endregion
+
+namespace OpenRA
+{
+	public interface ICacheStorage<T>
+	{
+		void Remove(string key);
+		void Store(string key, T data);
+		T Retrieve(string key);
+	}
+}

OpenRA.Game/Effects/AsyncAction.cs

@@ -0,0 +1,38 @@
+#region Copyright & License Information
+/*
+ * Copyright 2007-2015 The OpenRA Developers (see AUTHORS)
+ * This file is part of OpenRA, which is free software. It is made
+ * available to you under the terms of the GNU General Public License
+ * as published by the Free Software Foundation. For more information,
+ * see COPYING.
+ */
+#endregion
+
+using System;
+using System.Collections.Generic;
+using OpenRA.Graphics;
+
+namespace OpenRA.Effects
+{
+	public class AsyncAction : IEffect
+	{
+		Action a;
+		IAsyncResult ar;
+
+		public AsyncAction(IAsyncResult ar, Action a)
+		{
+			this.a = a;
+			this.ar = ar;
+		}
+
+		public void Tick(World world)
+		{
+			if (ar.IsCompleted)
+			{
+				world.AddFrameEndTask(w => { w.Remove(this); a(); });
+			}
+		}
+
+		public IEnumerable<IRenderable> Render(WorldRenderer r) { yield break; }
+	}
+}

OpenRA.Game/Effects/FlashTarget.cs

@@ -25,8 +25,11 @@ namespace OpenRA.Effects
 			this.target = target;
 			player = asPlayer;
 			remainingTicks = ticks;
-			foreach (var e in target.World.Effects.OfType<FlashTarget>().Where(a => a.target == target).ToArray())
-				target.World.Remove(e);
+			target.World.RemoveAll(effect =>
+			{
+				var flashTarget = effect as FlashTarget;
+				return flashTarget != null && flashTarget.target == target;
+			});
 		}
 
 		public void Tick(World world)

OpenRA.Game/Effects/SpriteEffect.cs

@@ -15,15 +15,15 @@ namespace OpenRA.Effects
 {
 	public class SpriteEffect : IEffect
 	{
-		string palette;
-		Animation anim;
-		WPos pos;
+		readonly string palette;
+		readonly Animation anim;
+		readonly WPos pos;
 
-		public SpriteEffect(WPos pos, World world, string sprite, string palette)
+		public SpriteEffect(WPos pos, World world, string image, string palette)
 		{
 			this.pos = pos;
 			this.palette = palette;
-			anim = new Animation(world, sprite);
+			anim = new Animation(world, image);
 			anim.PlayThen("idle", () => world.AddFrameEndTask(w => w.Remove(this)));
 		}
 

OpenRA.Game/Exts.cs

@@ -11,6 +11,7 @@
 using System;
 using System.Collections.Generic;
 using System.Drawing;
+using System.Drawing.Imaging;
 using System.Globalization;
 using System.Linq;
 using System.Reflection;
@@ -87,6 +88,29 @@ namespace OpenRA
 			return r.Contains(p.ToPointF());
 		}
 
+		static int WindingDirectionTest(int2 v0, int2 v1, int2 p)
+		{
+			return (v1.X - v0.X) * (p.Y - v0.Y) - (p.X - v0.X) * (v1.Y - v0.Y);
+		}
+
+		public static bool PolygonContains(this int2[] polygon, int2 p)
+		{
+			var windingNumber = 0;
+
+			for (var i = 0; i < polygon.Length; i++)
+			{
+				var tv = polygon[i];
+				var nv = polygon[(i + 1) % polygon.Length];
+
+				if (tv.Y <= p.Y && nv.Y > p.Y && WindingDirectionTest(tv, nv, p) > 0)
+					windingNumber++;
+				else if (tv.Y > p.Y && nv.Y <= p.Y && WindingDirectionTest(tv, nv, p) < 0)
+					windingNumber--;
+			}
+
+			return windingNumber != 0;
+		}
+
 		public static bool HasModifier(this Modifiers k, Modifiers mod)
 		{
 			return (k & mod) == mod;
@@ -106,21 +130,34 @@ namespace OpenRA
 			return ret;
 		}
 
+		public static int IndexOf<T>(this T[] array, T value)
+		{
+			return Array.IndexOf(array, value);
+		}
+
 		public static T Random<T>(this IEnumerable<T> ts, MersenneTwister r)
 		{
-			var xs = ts as ICollection<T>;
-			if (xs != null)
-				return xs.ElementAt(r.Next(xs.Count));
-			var ys = ts.ToList();
-			return ys[r.Next(ys.Count)];
+			return Random(ts, r, true);
 		}
 
 		public static T RandomOrDefault<T>(this IEnumerable<T> ts, MersenneTwister r)
 		{
-			if (!ts.Any())
-				return default(T);
+			return Random(ts, r, false);
+		}
 
-			return ts.Random(r);
+		static T Random<T>(IEnumerable<T> ts, MersenneTwister r, bool throws)
+		{
+			var xs = ts as ICollection<T>;
+			xs = xs ?? ts.ToList();
+			if (xs.Count == 0)
+			{
+				if (throws)
+					throw new ArgumentException("Collection must not be empty.", "ts");
+				else
+					return default(T);
+			}
+			else
+				return xs.ElementAt(r.Next(xs.Count));
 		}
 
 		public static float Product(this IEnumerable<float> xs)
@@ -299,12 +336,21 @@ namespace OpenRA
 			return ts.Concat(moreTs);
 		}
 
-		public static Dictionary<TKey, TSource> ToDictionaryWithConflictLog<TSource, TKey>(this IEnumerable<TSource> source, Func<TSource, TKey> keySelector, string debugName, Func<TKey, string> logKey, Func<TSource, string> logValue)
+		public static HashSet<T> ToHashSet<T>(this IEnumerable<T> source)
+		{
+			return new HashSet<T>(source);
+		}
+
+		public static Dictionary<TKey, TSource> ToDictionaryWithConflictLog<TSource, TKey>(
+			this IEnumerable<TSource> source, Func<TSource, TKey> keySelector,
+			string debugName, Func<TKey, string> logKey, Func<TSource, string> logValue)
 		{
 			return ToDictionaryWithConflictLog(source, keySelector, x => x, debugName, logKey, logValue);
 		}
 
-		public static Dictionary<TKey, TElement> ToDictionaryWithConflictLog<TSource, TKey, TElement>(this IEnumerable<TSource> source, Func<TSource, TKey> keySelector, Func<TSource, TElement> elementSelector, string debugName, Func<TKey, string> logKey, Func<TElement, string> logValue)
+		public static Dictionary<TKey, TElement> ToDictionaryWithConflictLog<TSource, TKey, TElement>(
+			this IEnumerable<TSource> source, Func<TSource, TKey> keySelector, Func<TSource, TElement> elementSelector,
+			string debugName, Func<TKey, string> logKey, Func<TElement, string> logValue)
 		{
 			// Fall back on ToString() if null functions are provided:
 			logKey = logKey ?? (s => s.ToString());
@@ -341,7 +387,7 @@ namespace OpenRA
 			// If any duplicates were found, throw a descriptive error
 			if (dupKeys.Count > 0)
 			{
-				var badKeysFormatted = string.Join(", ", dupKeys.Select(p => "{0}: [{1}]".F(logKey(p.Key), string.Join(",", p.Value.ToArray()))).ToArray());
+				var badKeysFormatted = string.Join(", ", dupKeys.Select(p => "{0}: [{1}]".F(logKey(p.Key), string.Join(",", p.Value))));
 				var msg = "{0}, duplicate values found for the following keys: {1}".F(debugName, badKeysFormatted);
 				throw new ArgumentException(msg);
 			}
@@ -375,7 +421,8 @@ namespace OpenRA
 			{
 				for (var j = 0; j < height; j++)
 				{
-					// Workaround for broken ternary operators in certain versions of mono (3.10 and certain versions of the 3.8 series): https://bugzilla.xamarin.com/show_bug.cgi?id=23319
+					// Workaround for broken ternary operators in certain versions of mono
+					// (3.10 and certain versions of the 3.8 series): https://bugzilla.xamarin.com/show_bug.cgi?id=23319
 					if (i <= ts.GetUpperBound(0) && j <= ts.GetUpperBound(1))
 						result[i, j] = ts[i, j];
 					else
@@ -388,6 +435,25 @@ namespace OpenRA
 
 		public static Rectangle Bounds(this Bitmap b) { return new Rectangle(0, 0, b.Width, b.Height); }
 
+		public static Bitmap CloneWith32bbpArgbPixelFormat(this Bitmap original)
+		{
+			// Note: We would use original.Clone(original.Bounds(), PixelFormat.Format32bppArgb)
+			// but this doesn't work on mono.
+			var clone = new Bitmap(original.Width, original.Height, PixelFormat.Format32bppArgb);
+			try
+			{
+				using (var g = System.Drawing.Graphics.FromImage(clone))
+					g.DrawImage(original, original.Bounds());
+			}
+			catch (Exception)
+			{
+				clone.Dispose();
+				throw;
+			}
+
+			return clone;
+		}
+
 		public static int ToBits(this IEnumerable<bool> bits)
 		{
 			var i = 0;

OpenRA.Game/FieldLoader.cs

@@ -33,9 +33,17 @@ namespace OpenRA
 			throw new NotImplementedException("FieldLoader: Missing field `{0}` on `{1}`".F(s, f.Name));
 		};
 
+		static readonly ConcurrentCache<Type, FieldLoadInfo[]> TypeLoadInfo =
+			new ConcurrentCache<Type, FieldLoadInfo[]>(BuildTypeLoadInfo);
+		static readonly ConcurrentCache<MemberInfo, bool> MemberHasTranslateAttribute =
+			new ConcurrentCache<MemberInfo, bool>(member => member.HasAttribute<TranslateAttribute>());
+
+		static readonly object TranslationsLock = new object();
+		static Dictionary<string, string> translations;
+
 		public static void Load(object self, MiniYaml my)
 		{
-			var loadInfo = typeLoadInfo[self.GetType()];
+			var loadInfo = TypeLoadInfo[self.GetType()];
 
 			Dictionary<string, MiniYaml> md = null;
 
@@ -82,7 +90,6 @@ namespace OpenRA
 			return t;
 		}
 
-		static readonly object[] NoIndexes = { };
 		public static void LoadField(object target, string key, string value)
 		{
 			const BindingFlags Flags = BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.Instance;
@@ -103,7 +110,7 @@ namespace OpenRA
 			{
 				var sa = prop.GetCustomAttributes<SerializeAttribute>(false).DefaultIfEmpty(SerializeAttribute.Default).First();
 				if (!sa.FromYamlKey)
-					prop.SetValue(target, GetValue(prop.Name, prop.PropertyType, value, prop), NoIndexes);
+					prop.SetValue(target, GetValue(prop.Name, prop.PropertyType, value, prop), null);
 				return;
 			}
 
@@ -162,7 +169,7 @@ namespace OpenRA
 			}
 			else if (fieldType == typeof(string))
 			{
-				if (field != null && field.HasAttribute<TranslateAttribute>())
+				if (field != null && MemberHasTranslateAttribute[field])
 					return Regex.Replace(value, "@[^@]+@", m => Translate(m.Value.Substring(1, m.Value.Length - 2)), RegexOptions.Compiled);
 				return value;
 			}
@@ -438,12 +445,10 @@ namespace OpenRA
 
 		public static IEnumerable<FieldLoadInfo> GetTypeLoadInfo(Type type, bool includePrivateByDefault = false)
 		{
-			return typeLoadInfo[type].Where(fli => includePrivateByDefault || fli.Field.IsPublic || (fli.Attribute.Serialize && !fli.Attribute.IsDefault));
+			return TypeLoadInfo[type].Where(fli => includePrivateByDefault || fli.Field.IsPublic || (fli.Attribute.Serialize && !fli.Attribute.IsDefault));
 		}
 
-		static Cache<Type, List<FieldLoadInfo>> typeLoadInfo = new Cache<Type, List<FieldLoadInfo>>(BuildTypeLoadInfo);
-
-		static List<FieldLoadInfo> BuildTypeLoadInfo(Type type)
+		static FieldLoadInfo[] BuildTypeLoadInfo(Type type)
 		{
 			var ret = new List<FieldLoadInfo>();
 
@@ -465,7 +470,7 @@ namespace OpenRA
 				ret.Add(fli);
 			}
 
-			return ret;
+			return ret.ToArray();
 		}
 
 		[AttributeUsage(AttributeTargets.Field)]
@@ -520,17 +525,27 @@ namespace OpenRA
 
 		public static string Translate(string key)
 		{
-			if (Translations == null || string.IsNullOrEmpty(key))
+			if (string.IsNullOrEmpty(key))
 				return key;
 
-			string value;
-			if (!Translations.TryGetValue(key, out value))
-				return key;
+			lock (TranslationsLock)
+			{
+				if (translations == null)
+					return key;
 
-			return value;
+				string value;
+				if (!translations.TryGetValue(key, out value))
+					return key;
+
+				return value;
+			}
 		}
 
-		public static Dictionary<string, string> Translations = new Dictionary<string, string>();
+		public static void SetTranslations(IDictionary<string, string> translations)
+		{
+			lock (TranslationsLock)
+				FieldLoader.translations = new Dictionary<string, string>(translations);
+		}
 	}
 
 	[AttributeUsage(AttributeTargets.Field | AttributeTargets.Property)]
@@ -546,6 +561,7 @@ namespace OpenRA
 	}
 
 	// mirrors DescriptionAttribute from System.ComponentModel but we dont want to have to use that everywhere.
+	[AttributeUsage(AttributeTargets.All)]
 	public sealed class DescAttribute : Attribute
 	{
 		public readonly string[] Lines;

OpenRA.Game/FileFormats/AudLoader.cs

@@ -45,8 +45,8 @@ namespace OpenRA.FileFormats
 	public static class AudLoader
 	{
 		static int[] indexAdjust = { -1, -1, -1, -1, 2, 4, 6, 8 };
-		static int[] stepTable = 
-		{	
+		static int[] stepTable =
+		{
 			7, 8, 9, 10, 11, 12, 13, 14, 16,
 			17, 19, 21, 23, 25, 28, 31, 34, 37,
 			41, 45, 50, 55, 60, 66, 73, 80, 88,
@@ -56,7 +56,7 @@ namespace OpenRA.FileFormats
 			1282, 1411, 1552, 1707, 1878, 2066, 2272, 2499, 2749,
 			3024, 3327, 3660, 4026, 4428, 4871, 5358, 5894, 6484,
 			7132, 7845, 8630, 9493, 10442, 11487, 12635, 13899, 15289,
-			16818, 18500, 20350, 22385, 24623, 27086, 29794, 32767 
+			16818, 18500, 20350, 22385, 24623, 27086, 29794, 32767
 		};
 
 		static short DecodeSample(byte b, ref int index, ref int current)

OpenRA.Game/FileFormats/Blast.cs

@@ -241,9 +241,8 @@ namespace OpenRA.FileFormats
 				var num = (code >> 4) + 1; // Number of codes (top four bits plus 1)
 				var len = (byte)(code & 15); // Code length (low four bits)
 				do
-				{
 					length[s++] = len;
-				} while (--num > 0);
+				while (--num > 0);
 			}
 
 			n = s;

OpenRA.Game/FileFormats/Format80.cs

@@ -187,9 +187,7 @@ namespace OpenRA.FileFormats
 						blockStart = offset;
 					}
 					else
-					{
 						offset++;
-					}
 				}
 
 				// Write what we haven't written up to now

OpenRA.Game/FileFormats/IdxReader.cs

@@ -0,0 +1,44 @@
+#region Copyright & License Information
+/*
+ * Copyright 2007-2015 The OpenRA Developers (see AUTHORS)
+ * This file is part of OpenRA, which is free software. It is made
+ * available to you under the terms of the GNU General Public License
+ * as published by the Free Software Foundation. For more information,
+ * see COPYING.
+ */
+#endregion
+
+using System.Collections.Generic;
+using System.IO;
+using OpenRA.FileSystem;
+
+namespace OpenRA.FileFormats
+{
+	public class IdxReader
+	{
+		public readonly int SoundCount;
+		public List<IdxEntry> Entries;
+
+		public IdxReader(Stream s)
+		{
+			s.Seek(0, SeekOrigin.Begin);
+
+			var id = s.ReadASCII(4);
+
+			if (id != "GABA")
+				throw new InvalidDataException("Unable to load Idx file, did not find magic id, found {0} instead".F(id));
+
+			var two = s.ReadInt32();
+
+			if (two != 2)
+				throw new InvalidDataException("Unable to load Idx file, did not find magic number 2, found {0} instead".F(two));
+
+			SoundCount = s.ReadInt32();
+
+			Entries = new List<IdxEntry>();
+
+			for (var i = 0; i < SoundCount; i++)
+				Entries.Add(new IdxEntry(s));
+		}
+	}
+}

OpenRA.Game/FileFormats/ImaAdpcmLoader.cs

@@ -43,7 +43,7 @@ namespace OpenRA.FileFormats
 			1282, 1411, 1552, 1707, 1878, 2066, 2272, 2499, 2749,
 			3024, 3327, 3660, 4026, 4428, 4871, 5358, 5894, 6484,
 			7132, 7845, 8630, 9493, 10442, 11487, 12635, 13899, 15289,
-			16818, 18500, 20350, 22385, 24623, 27086, 29794, 32767 
+			16818, 18500, 20350, 22385, 24623, 27086, 29794, 32767
 		};
 
 		static short DecodeImaAdpcmSample(byte b, ref int index, ref int current)

OpenRA.Game/FileFormats/ReplayMetadata.cs

@@ -71,7 +71,7 @@ namespace OpenRA.FileFormats
 
 		public void RenameFile(string newFilenameWithoutExtension)
 		{
-			var newPath = Path.Combine(Path.GetDirectoryName(FilePath), newFilenameWithoutExtension) + ".rep";
+			var newPath = Path.Combine(Path.GetDirectoryName(FilePath), newFilenameWithoutExtension) + ".orarep";
 			File.Move(FilePath, newPath);
 			FilePath = newPath;
 		}

OpenRA.Game/FileFormats/VqaReader.cs

@@ -38,8 +38,12 @@ namespace OpenRA.FileFormats
 		byte[] cbf;
 		byte[] cbp;
 		byte[] cbfBuffer;
-		byte[] fileBuffer = new byte[256000]; // Buffer for loading file subchunks, the maximum chunk size of a file is not defined
-		int maxCbfzSize = 256000;             // and the header definition for the size of the biggest chunks (color data) isn't accurate. But 256k is large enough for all TS videos(< 200k).
+
+		// Buffer for loading file subchunks, the maximum chunk size of a file is not defined
+		// and the header definition for the size of the biggest chunks (color data) isn't accurate.
+		// But 256k is large enough for all TS videos(< 200k).
+		byte[] fileBuffer = new byte[256000];
+		int maxCbfzSize = 256000;
 		int vtprSize = 0;
 		int currentChunkBuffer = 0;
 		int chunkBufferOffset = 0;
@@ -73,7 +77,7 @@ namespace OpenRA.FileFormats
 			/*var length2 = */stream.ReadUInt32();
 
 			/*var version = */stream.ReadUInt16();
-			videoFlags = stream.ReadUInt16(); 
+			videoFlags = stream.ReadUInt16();
 			Frames = stream.ReadUInt16();
 			Width = stream.ReadUInt16();
 			Height = stream.ReadUInt16();
@@ -129,7 +133,7 @@ namespace OpenRA.FileFormats
 					type = stream.ReadASCII(4);
 				}
 				else
-					throw new NotSupportedException("Vqa uses unknown Subtype : {0}".F(type));
+					throw new NotSupportedException("Vqa uses unknown Subtype: {0}".F(type));
 			}
 
 			/*var length = */stream.ReadUInt16();
@@ -183,7 +187,9 @@ namespace OpenRA.FileFormats
 					{
 						case "SND0":
 						case "SND2":
-							if (audioChannels == 1)
+							if (audioChannels == 0)
+								throw new NotSupportedException();
+							else if (audioChannels == 1)
 							{
 								var rawAudio = stream.ReadBytes((int)length);
 								audio1.Write(rawAudio);
@@ -194,11 +200,15 @@ namespace OpenRA.FileFormats
 								audio1.Write(rawAudio);
 								rawAudio = stream.ReadBytes((int)length / 2);
 								audio2.Write(rawAudio);
+								if (length % 2 != 0)
+									stream.ReadBytes(2);
 							}
 
 							compressed = type == "SND2";
 							break;
 						default:
+							if (length + stream.Position > stream.Length)
+								throw new NotSupportedException("Vqa uses unknown Subtype: {0}".F(type));
 							stream.ReadBytes((int)length);
 							break;
 					}
@@ -209,9 +219,7 @@ namespace OpenRA.FileFormats
 			}
 
 			if (audioChannels == 1)
-			{
 				audioData = compressed ? AudLoader.LoadSound(audio1.ToArray(), ref adpcmIndex) : audio1.ToArray();
-			}
 			else
 			{
 				byte[] leftData, rightData;
@@ -317,7 +325,7 @@ namespace OpenRA.FileFormats
 					// Full frame-modifier
 					case "CBFZ":
 						var decodeMode = s.Peek() == 0;
-						s.Read(fileBuffer, 0, subchunkLength);
+						s.ReadBytes(fileBuffer, 0, subchunkLength);
 						Array.Clear(cbf, 0, cbf.Length);
 						Array.Clear(cbfBuffer, 0, cbfBuffer.Length);
 						var decodeCount = 0;
@@ -388,7 +396,7 @@ namespace OpenRA.FileFormats
 						return;
 					case "VPRZ":
 						Array.Clear(origData, 0, origData.Length);
-						s.Read(fileBuffer, 0, subchunkLength);
+						s.ReadBytes(fileBuffer, 0, subchunkLength);
 						if (fileBuffer[0] != 0)
 							vtprSize = Format80.DecodeInto(fileBuffer, origData);
 						else
@@ -396,7 +404,7 @@ namespace OpenRA.FileFormats
 						return;
 					case "VPTR":
 						Array.Clear(origData, 0, origData.Length);
-						s.Read(origData, 0, subchunkLength);
+						s.ReadBytes(origData, 0, subchunkLength);
 						vtprSize = subchunkLength;
 						return;
 					default:
@@ -413,7 +421,7 @@ namespace OpenRA.FileFormats
 			if (IsHqVqa)
 			{
 				/* The VP?? chunks of the video file contains an array of instructions for
-				 * how the blocks of the finished frame will be filled with color data blocks 
+				 * how the blocks of the finished frame will be filled with color data blocks
 				 * contained in the CBF? chunks.
 				 */
 				var p = 0;
@@ -424,7 +432,7 @@ namespace OpenRA.FileFormats
 						if (y >= blocks.Y)
 							break;
 
-						// The first 3 bits of the short determine the type of instruction with the rest being one or two parameters.						
+						// The first 3 bits of the short determine the type of instruction with the rest being one or two parameters.
 						var val = (int)origData[p++];
 						val |= origData[p++] << 8;
 						var para_A = val & 0x1fff;

OpenRA.Game/FileFormats/WavLoader.cs

@@ -129,7 +129,7 @@ namespace OpenRA.FileFormats
 			// Decode each block of IMA ADPCM data in RawOutput
 			for (var block = 0; block < numBlocks; block++)
 			{
-				// Each block starts with a initial state per-channel 
+				// Each block starts with a initial state per-channel
 				for (var c = 0; c < Channels; c++)
 				{
 					predictor[c] = s.ReadInt16();

OpenRA.Game/FileSystem/BagFile.cs

@@ -0,0 +1,192 @@
+#region Copyright & License Information
+/*
+ * Copyright 2007-2015 The OpenRA Developers (see AUTHORS)
+ * This file is part of OpenRA, which is free software. It is made
+ * available to you under the terms of the GNU General Public License
+ * as published by the Free Software Foundation. For more information,
+ * see COPYING.
+ */
+#endregion
+
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using System.IO;
+using System.Linq;
+using System.Text;
+using OpenRA.FileFormats;
+using OpenRA.Primitives;
+
+namespace OpenRA.FileSystem
+{
+	public sealed class BagFile : IFolder, IDisposable
+	{
+		static readonly uint[] Nothing = { };
+
+		readonly string bagFilename;
+		readonly Stream s;
+		readonly int bagFilePriority;
+		readonly Dictionary<uint, IdxEntry> index;
+
+		public BagFile(string filename, int priority)
+		{
+			bagFilename = filename;
+			bagFilePriority = priority;
+
+			// A bag file is always accompanied with an .idx counterpart
+			// For example: audio.bag requires the audio.idx file
+			var indexFilename = Path.ChangeExtension(filename, ".idx");
+
+			s = GlobalFileSystem.Open(filename);
+
+			// Build the index and dispose the stream, it is no longer needed after this
+			List<IdxEntry> entries;
+			using (var indexStream = GlobalFileSystem.Open(indexFilename))
+			{
+				var reader = new IdxReader(indexStream);
+
+				entries = reader.Entries;
+			}
+
+			index = entries.ToDictionaryWithConflictLog(x => x.Hash,
+				"{0} (bag format)".F(filename),
+				null, x => "(offs={0}, len={1})".F(x.Offset, x.Length));
+		}
+
+		public int Priority { get { return 1000 + bagFilePriority; } }
+		public string Name { get { return bagFilename; } }
+
+		public Stream GetContent(uint hash)
+		{
+			IdxEntry entry;
+			if (!index.TryGetValue(hash, out entry))
+				return null;
+
+			s.Seek(entry.Offset, SeekOrigin.Begin);
+
+			var waveHeaderMemoryStream = new MemoryStream();
+
+			var channels = (entry.Flags & 1) > 0 ? 2 : 1;
+
+			if ((entry.Flags & 2) > 0)
+			{
+				// PCM
+				waveHeaderMemoryStream.Write(Encoding.ASCII.GetBytes("RIFF"));
+				waveHeaderMemoryStream.Write(BitConverter.GetBytes(entry.Length + 36));
+				waveHeaderMemoryStream.Write(Encoding.ASCII.GetBytes("WAVE"));
+				waveHeaderMemoryStream.Write(Encoding.ASCII.GetBytes("fmt "));
+				waveHeaderMemoryStream.Write(BitConverter.GetBytes(16));
+				waveHeaderMemoryStream.Write(BitConverter.GetBytes((short)WavLoader.WaveType.Pcm));
+				waveHeaderMemoryStream.Write(BitConverter.GetBytes((short)channels));
+				waveHeaderMemoryStream.Write(BitConverter.GetBytes(entry.SampleRate));
+				waveHeaderMemoryStream.Write(BitConverter.GetBytes(2 * channels * entry.SampleRate));
+				waveHeaderMemoryStream.Write(BitConverter.GetBytes((short)(2 * channels)));
+				waveHeaderMemoryStream.Write(BitConverter.GetBytes((short)16));
+				waveHeaderMemoryStream.Write(Encoding.ASCII.GetBytes("data"));
+				waveHeaderMemoryStream.Write(BitConverter.GetBytes(entry.Length));
+			}
+
+			if ((entry.Flags & 8) > 0)
+			{
+				// IMA ADPCM
+				var samplesPerChunk = (2 * (entry.ChunkSize - 4)) + 1;
+				var bytesPerSec = (int)Math.Floor(((double)(2 * entry.ChunkSize) / samplesPerChunk) * ((double)entry.SampleRate / 2));
+				var chunkSize = entry.ChunkSize > entry.Length ? entry.Length : entry.ChunkSize;
+
+				waveHeaderMemoryStream.Write(Encoding.ASCII.GetBytes("RIFF"));
+				waveHeaderMemoryStream.Write(BitConverter.GetBytes(entry.Length + 52));
+				waveHeaderMemoryStream.Write(Encoding.ASCII.GetBytes("WAVE"));
+				waveHeaderMemoryStream.Write(Encoding.ASCII.GetBytes("fmt "));
+				waveHeaderMemoryStream.Write(BitConverter.GetBytes(20));
+				waveHeaderMemoryStream.Write(BitConverter.GetBytes((short)WavLoader.WaveType.ImaAdpcm));
+				waveHeaderMemoryStream.Write(BitConverter.GetBytes((short)channels));
+				waveHeaderMemoryStream.Write(BitConverter.GetBytes(entry.SampleRate));
+				waveHeaderMemoryStream.Write(BitConverter.GetBytes(bytesPerSec));
+				waveHeaderMemoryStream.Write(BitConverter.GetBytes((short)chunkSize));
+				waveHeaderMemoryStream.Write(BitConverter.GetBytes((short)4));
+				waveHeaderMemoryStream.Write(BitConverter.GetBytes((short)2));
+				waveHeaderMemoryStream.Write(BitConverter.GetBytes((short)samplesPerChunk));
+				waveHeaderMemoryStream.Write(Encoding.ASCII.GetBytes("fact"));
+				waveHeaderMemoryStream.Write(BitConverter.GetBytes(4));
+				waveHeaderMemoryStream.Write(BitConverter.GetBytes(4 * entry.Length));
+				waveHeaderMemoryStream.Write(Encoding.ASCII.GetBytes("data"));
+				waveHeaderMemoryStream.Write(BitConverter.GetBytes(entry.Length));
+			}
+
+			waveHeaderMemoryStream.Seek(0, SeekOrigin.Begin);
+
+			// Construct a merged stream
+			var mergedStream = new MergedStream(waveHeaderMemoryStream, s);
+			mergedStream.SetLength(waveHeaderMemoryStream.Length + entry.Length);
+
+			return mergedStream;
+		}
+
+		uint? FindMatchingHash(string filename)
+		{
+			var hash = IdxEntry.HashFilename(filename, PackageHashType.CRC32);
+			if (index.ContainsKey(hash))
+				return hash;
+
+			// Maybe we were given a raw hash?
+			uint raw;
+			if (!uint.TryParse(filename, NumberStyles.AllowHexSpecifier, CultureInfo.InvariantCulture, out raw))
+				return null;
+
+			if ("{0:X}".F(raw) == filename && index.ContainsKey(raw))
+				return raw;
+
+			return null;
+		}
+
+		public Stream GetContent(string filename)
+		{
+			var hash = FindMatchingHash(filename);
+			return hash.HasValue ? GetContent(hash.Value) : null;
+		}
+
+		public bool Exists(string filename)
+		{
+			return FindMatchingHash(filename).HasValue;
+		}
+
+		public IEnumerable<uint> ClassicHashes()
+		{
+			return Nothing;
+		}
+
+		public IEnumerable<uint> CrcHashes()
+		{
+			return index.Keys;
+		}
+
+		public IEnumerable<string> AllFileNames()
+		{
+			var lookup = new Dictionary<uint, string>();
+			if (GlobalFileSystem.Exists("global mix database.dat"))
+			{
+				var db = new XccGlobalDatabase(GlobalFileSystem.Open("global mix database.dat"));
+				foreach (var e in db.Entries)
+				{
+					var hash = IdxEntry.HashFilename(e, PackageHashType.CRC32);
+					if (!lookup.ContainsKey(hash))
+						lookup.Add(hash, e);
+				}
+			}
+
+			return index.Keys.Select(k => lookup.ContainsKey(k) ? lookup[k] : "{0:X}".F(k));
+		}
+
+		public void Write(Dictionary<string, byte[]> contents)
+		{
+			GlobalFileSystem.Unmount(this);
+			throw new NotImplementedException("Updating bag files unsupported");
+		}
+
+		public void Dispose()
+		{
+			if (s != null)
+				s.Dispose();
+		}
+	}
+}

OpenRA.Game/FileSystem/GlobalFileSystem.cs

@@ -101,6 +101,8 @@ namespace OpenRA.FileSystem
 				return new PakFile(filename, order);
 			if (filename.EndsWith(".big", StringComparison.InvariantCultureIgnoreCase))
 				return new BigFile(filename, order);
+			if (filename.EndsWith(".bag", StringComparison.InvariantCultureIgnoreCase))
+				return new BagFile(filename, order);
 
 			return new Folder(filename, order);
 		}
@@ -164,45 +166,38 @@ namespace OpenRA.FileSystem
 			return null;
 		}
 
-		public static Stream Open(string filename) { return OpenWithExts(filename, ""); }
-
-		public static Stream OpenWithExts(string filename, params string[] exts)
+		public static Stream Open(string filename)
 		{
 			Stream s;
-			if (!TryOpenWithExts(filename, exts, out s))
+			if (!TryOpen(filename, out s))
 				throw new FileNotFoundException("File not found: {0}".F(filename), filename);
 
 			return s;
 		}
 
-		public static bool TryOpenWithExts(string filename, string[] exts, out Stream s)
+		public static bool TryOpen(string filename, out Stream s)
 		{
+			// Check the cache for a quick lookup
 			if (filename.IndexOfAny(new char[] { '/', '\\' }) == -1)
 			{
-				foreach (var ext in exts)
-				{
-					s = GetFromCache(PackageHashType.Classic, filename + ext);
-					if (s != null)
-						return true;
+				s = GetFromCache(PackageHashType.Classic, filename);
+				if (s != null)
+					return true;
 
-					s = GetFromCache(PackageHashType.CRC32, filename + ext);
-					if (s != null)
-						return true;
-				}
+				s = GetFromCache(PackageHashType.CRC32, filename);
+				if (s != null)
+					return true;
 			}
 
-			foreach (var ext in exts)
-			{
-				var possibleName = filename + ext;
-				var folder = MountedFolders
-					.Where(x => x.Exists(possibleName))
-					.MaxByOrDefault(x => x.Priority);
+			// Ask each package individually
+			var folder = MountedFolders
+				.Where(x => x.Exists(filename))
+				.MaxByOrDefault(x => x.Priority);
 
-				if (folder != null)
-				{
-					s = folder.GetContent(possibleName);
-					return true;
-				}
+			if (folder != null)
+			{
+				s = folder.GetContent(filename);
+				return true;
 			}
 
 			s = null;

OpenRA.Game/FileSystem/IdxEntry.cs

@@ -0,0 +1,94 @@
+#region Copyright & License Information
+/*
+ * Copyright 2007-2015 The OpenRA Developers (see AUTHORS)
+ * This file is part of OpenRA, which is free software. It is made
+ * available to you under the terms of the GNU General Public License
+ * as published by the Free Software Foundation. For more information,
+ * see COPYING.
+ */
+#endregion
+
+using System.Collections.Generic;
+using System.IO;
+
+namespace OpenRA.FileSystem
+{
+	public class IdxEntry
+	{
+		public const string DefaultExtension = "wav";
+
+		public readonly uint Hash;
+		public readonly string Name;
+		public readonly string Extension;
+		public readonly uint Offset;
+		public readonly uint Length;
+		public readonly uint SampleRate;
+		public readonly uint Flags;
+		public readonly uint ChunkSize;
+
+		public IdxEntry(uint hash, uint offset, uint length, uint sampleRate, uint flags, uint chuckSize)
+		{
+			Hash = hash;
+			Offset = offset;
+			Length = length;
+			SampleRate = sampleRate;
+			Flags = flags;
+			ChunkSize = chuckSize;
+		}
+
+		public IdxEntry(Stream s)
+		{
+			var asciiname = s.ReadASCII(16);
+
+			var pos = asciiname.IndexOf('\0');
+			if (pos != 0)
+				asciiname = asciiname.Substring(0, pos);
+
+			Name = asciiname;
+			Extension = DefaultExtension;
+			Offset = s.ReadUInt32();
+			Length = s.ReadUInt32();
+			SampleRate = s.ReadUInt32();
+			Flags = s.ReadUInt32();
+			ChunkSize = s.ReadUInt32();
+			Hash = HashFilename(string.Concat(Name, ".", Extension), PackageHashType.CRC32);
+		}
+
+		public void Write(BinaryWriter w)
+		{
+			w.Write(Name.PadRight(16, '\0'));
+			w.Write(Offset);
+			w.Write(Length);
+			w.Write(SampleRate);
+			w.Write(Flags);
+			w.Write(ChunkSize);
+		}
+
+		public override string ToString()
+		{
+			string filename;
+			if (names.TryGetValue(Hash, out filename))
+				return "{0} - offset 0x{1:x8} - length 0x{2:x8}".F(filename, Offset, Length);
+			else
+				return "0x{0:x8} - offset 0x{1:x8} - length 0x{2:x8}".F(Hash, Offset, Length);
+		}
+
+		public static uint HashFilename(string name, PackageHashType type)
+		{
+			return PackageEntry.HashFilename(name, type);
+		}
+
+		static Dictionary<uint, string> names = new Dictionary<uint, string>();
+
+		public static void AddStandardName(string s)
+		{
+			// RA1 and TD
+			var hash = HashFilename(s, PackageHashType.Classic);
+			names.Add(hash, s);
+
+			// TS
+			var crcHash = HashFilename(s, PackageHashType.CRC32);
+			names.Add(crcHash, s);
+		}
+	}
+}

OpenRA.Game/Game.cs

@@ -15,7 +15,6 @@ using System.IO;
 using System.Linq;
 using System.Net;
 using System.Threading;
-using MaxMind.GeoIP2;
 using OpenRA.FileSystem;
 using OpenRA.Graphics;
 using OpenRA.Network;
@@ -44,8 +43,6 @@ namespace OpenRA
 		public static Renderer Renderer;
 		public static bool HasInputFocus = false;
 
-		public static DatabaseReader GeoIpDatabase;
-
 		public static OrderManager JoinServer(string host, int port, string password, bool recordReplay = true)
 		{
 			IConnection connection = new NetworkConnection(host, port);
@@ -216,14 +213,7 @@ namespace OpenRA
 				Settings.Server.AllowPortForward = false;
 			}
 
-			try
-			{
-				GeoIpDatabase = new DatabaseReader("GeoLite2-Country.mmdb");
-			}
-			catch (Exception e)
-			{
-				Log.Write("geoip", "DatabaseReader failed: {0}", e);
-			}
+			GeoIP.Initialize();
 
 			GlobalFileSystem.Mount(Platform.GameDir); // Needed to access shaders
 			var renderers = new[] { Settings.Graphics.Renderer, "Sdl2", null };
@@ -309,6 +299,9 @@ namespace OpenRA
 			using (new PerfTimer("LoadMaps"))
 				ModData.MapCache.LoadMaps();
 
+			if (Cursor != null)
+				Cursor.Dispose();
+
 			if (Settings.Graphics.HardwareCursors)
 			{
 				try
@@ -372,6 +365,11 @@ namespace OpenRA
 				ModData.LoadScreen.StartGame(args);
 		}
 
+		public static void LoadEditor(string mapUid)
+		{
+			StartGame(mapUid, WorldType.Editor);
+		}
+
 		public static void LoadShellMap()
 		{
 			var shellmap = ChooseShellmap();
@@ -494,7 +492,7 @@ namespace OpenRA
 				if (worldRenderer != null)
 				{
 					Renderer.BeginFrame(worldRenderer.Viewport.TopLeft, worldRenderer.Viewport.Zoom);
-					Sound.SetListenerPosition(worldRenderer.Position(worldRenderer.Viewport.CenterLocation));
+					Sound.SetListenerPosition(worldRenderer.Viewport.CenterPosition);
 					worldRenderer.Draw();
 				}
 				else
@@ -502,6 +500,10 @@ namespace OpenRA
 
 				using (new PerfSample("render_widgets"))
 				{
+					Game.Renderer.WorldVoxelRenderer.BeginFrame();
+					Ui.PrepareRenderables();
+					Game.Renderer.WorldVoxelRenderer.EndFrame();
+
 					Ui.Draw();
 
 					if (ModData != null && ModData.CursorProvider != null)
@@ -617,9 +619,7 @@ namespace OpenRA
 					}
 				}
 				else
-				{
 					Thread.Sleep(nextUpdate - now);
-				}
 			}
 		}
 

OpenRA.Game/GameInformation.cs

@@ -18,8 +18,12 @@ namespace OpenRA
 {
 	public class GameInformation
 	{
+		public string Mod;
+		public string Version;
+
 		public string MapUid;
 		public string MapTitle;
+
 		public DateTime StartTimeUtc;
 
 		// Game end timestamp (when the recoding stopped).
@@ -114,7 +118,7 @@ namespace OpenRA
 				Color = runtimePlayer.Color,
 				Team = client.Team,
 				SpawnPoint = runtimePlayer.SpawnPoint,
-				IsRandomFaction = runtimePlayer.Country.Race != client.Country,
+				IsRandomFaction = runtimePlayer.Country.Race != client.Race,
 				IsRandomSpawnPoint = runtimePlayer.SpawnPoint != client.SpawnPoint
 			};
 
@@ -134,7 +138,7 @@ namespace OpenRA
 
 		public class Player
 		{
-			// Start-up information 
+			// Start-up information
 			public int ClientIndex;
 
 			// The player name, not guaranteed to be unique.

OpenRA.Game/GameRules/ActorInfo.cs

@@ -16,15 +16,18 @@ using OpenRA.Traits;
 
 namespace OpenRA
 {
-	// TODO: This is not exported into the documentation yet.
-	[Desc("A unit/building inside the game. Every rules starts with one and adds trait to it.",
-		"Special actors like world or player are usually defined in system.yaml and affect everything.")]
+	/// <summary>
+	/// A unit/building inside the game. Every rules starts with one and adds trait to it.
+	/// Special actors like world or player are usually defined in system.yaml and affect everything.
+	/// </summary>
 	public class ActorInfo
 	{
-		[Desc("The actor name can be anything, but the sprites used in the Render*: traits default to this one.",
-			"If you add an ^ in front of the name, the engine will recognize this as a collection of traits",
-			"that can be inherited by others (using Inherits:) and not a real unit.",
-			"You can remove inherited traits by adding a - infront of them as in -TraitName: to inherit everything, but this trait.")]
+		/// <summary>
+		/// The actor name can be anything, but the sprites used in the Render*: traits default to this one.
+		/// If you add an ^ in front of the name, the engine will recognize this as a collection of traits
+		/// that can be inherited by others (using Inherits:) and not a real unit.
+		/// You can remove inherited traits by adding a - infront of them as in -TraitName: to inherit everything, but this trait.
+		/// </summary>
 		public readonly string Name;
 		public readonly TypeDictionary Traits = new TypeDictionary();
 		List<ITraitInfo> constructOrderCache = null;
@@ -33,12 +36,22 @@ namespace OpenRA
 		{
 			try
 			{
-				var mergedNode = MergeWithParent(node, allUnits).ToDictionary();
+				var allParents = new HashSet<string>();
+
+				// Guard against circular inheritance
+				allParents.Add(name);
+				var mergedNode = MergeWithParents(node, allUnits, allParents).ToDictionary();
 
 				Name = name;
+
 				foreach (var t in mergedNode)
-					if (t.Key != "Inherits" && !t.Key.StartsWith("-"))
+				{
+					if (t.Key[0] == '-')
+						throw new YamlException("Bogus trait removal: " + t.Key);
+
+					if (t.Key != "Inherits" && !t.Key.StartsWith("Inherits@"))
 						Traits.Add(LoadTraitInfo(t.Key.Split('@')[0], t.Value));
+				}
 			}
 			catch (YamlException e)
 			{
@@ -46,32 +59,31 @@ namespace OpenRA
 			}
 		}
 
-		static MiniYaml GetParent(MiniYaml node, Dictionary<string, MiniYaml> allUnits)
+		static Dictionary<string, MiniYaml> GetParents(MiniYaml node, Dictionary<string, MiniYaml> allUnits)
 		{
-			MiniYaml inherits;
-			node.ToDictionary().TryGetValue("Inherits", out inherits);
-			if (inherits == null || string.IsNullOrEmpty(inherits.Value))
-				return null;
+			return node.Nodes.Where(n => n.Key == "Inherits" || n.Key.StartsWith("Inherits@"))
+				.ToDictionary(n => n.Value.Value, n =>
+			{
+				MiniYaml i;
+					if (!allUnits.TryGetValue(n.Value.Value, out i))
+						throw new YamlException(
+							"Bogus inheritance -- parent type {0} does not exist".F(n.Value.Value));
 
-			MiniYaml parent;
-			allUnits.TryGetValue(inherits.Value, out parent);
-			if (parent == null)
-				throw new InvalidOperationException(
-					"Bogus inheritance -- actor type {0} does not exist".F(inherits.Value));
-
-			return parent;
+				return i;
+			});
 		}
 
-		static MiniYaml MergeWithParent(MiniYaml node, Dictionary<string, MiniYaml> allUnits)
+		static MiniYaml MergeWithParents(MiniYaml node, Dictionary<string, MiniYaml> allUnits, HashSet<string> allParents)
 		{
-			var parent = GetParent(node, allUnits);
-			if (parent != null)
-			{
-				var result = MiniYaml.MergeStrict(node, MergeWithParent(parent, allUnits));
+			var parents = GetParents(node, allUnits);
 
-				// strip the '-'
-				result.Nodes.RemoveAll(a => a.Key.StartsWith("-"));
-				return result;
+			foreach (var kv in parents)
+			{
+				if (!allParents.Add(kv.Key))
+					throw new YamlException(
+						"Bogus inheritance -- duplicate inheritance of {0}.".F(kv.Key));
+
+				node = MiniYaml.MergeStrict(node, MergeWithParents(kv.Value, allUnits, allParents));
 			}
 
 			return node;

OpenRA.Game/GameRules/DamageWarhead.cs

@@ -8,27 +8,18 @@
  */
 #endregion
 
-using System;
 using System.Collections.Generic;
-using System.Linq;
-using OpenRA.Effects;
 using OpenRA.Traits;
 
 namespace OpenRA.GameRules
 {
 	public abstract class DamageWarhead : Warhead
 	{
-		[Desc("How much (raw) damage to deal")]
+		[Desc("How much (raw) damage to deal.")]
 		public readonly int Damage = 0;
 
-		[Desc("Infantry death animation to use")]
-		public readonly string DeathType = "1";
-
-		[Desc("Whether we should prevent prone response for infantry.")]
-		public readonly bool PreventProne = false;
-
-		[Desc("By what percentage should damage be modified against prone infantry.")]
-		public readonly int ProneModifier = 50;
+		[Desc("Types of damage that this warhead causes. Leave empty for no damage.")]
+		public readonly string[] DamageTypes = new string[0];
 
 		[FieldLoader.LoadUsing("LoadVersus")]
 		[Desc("Damage percentage versus each armortype. 0% = can't target.")]

OpenRA.Game/GameRules/Ruleset.cs

@@ -22,7 +22,6 @@ namespace OpenRA
 		public readonly IReadOnlyDictionary<string, SoundInfo> Voices;
 		public readonly IReadOnlyDictionary<string, SoundInfo> Notifications;
 		public readonly IReadOnlyDictionary<string, MusicInfo> Music;
-		public readonly IReadOnlyDictionary<string, string> Movies;
 		public readonly IReadOnlyDictionary<string, TileSet> TileSets;
 		public readonly IReadOnlyDictionary<string, SequenceProvider> Sequences;
 
@@ -32,7 +31,6 @@ namespace OpenRA
 			IDictionary<string, SoundInfo> voices,
 			IDictionary<string, SoundInfo> notifications,
 			IDictionary<string, MusicInfo> music,
-			IDictionary<string, string> movies,
 			IDictionary<string, TileSet> tileSets,
 			IDictionary<string, SequenceProvider> sequences)
 		{
@@ -41,7 +39,6 @@ namespace OpenRA
 			Voices = new ReadOnlyDictionary<string, SoundInfo>(voices);
 			Notifications = new ReadOnlyDictionary<string, SoundInfo>(notifications);
 			Music = new ReadOnlyDictionary<string, MusicInfo>(music);
-			Movies = new ReadOnlyDictionary<string, string>(movies);
 			TileSets = new ReadOnlyDictionary<string, TileSet>(tileSets);
 			Sequences = new ReadOnlyDictionary<string, SequenceProvider>(sequences);
 		}

OpenRA.Game/GameRules/RulesetCache.cs

@@ -26,7 +26,6 @@ namespace OpenRA
 		readonly Dictionary<string, SoundInfo> voiceCache = new Dictionary<string, SoundInfo>();
 		readonly Dictionary<string, SoundInfo> notificationCache = new Dictionary<string, SoundInfo>();
 		readonly Dictionary<string, MusicInfo> musicCache = new Dictionary<string, MusicInfo>();
-		readonly Dictionary<string, string> movieCache = new Dictionary<string, string>();
 		readonly Dictionary<string, TileSet> tileSetCache = new Dictionary<string, TileSet>();
 		readonly Dictionary<string, SequenceCache> sequenceCaches = new Dictionary<string, SequenceCache>();
 
@@ -56,7 +55,6 @@ namespace OpenRA
 			Dictionary<string, SoundInfo> voices;
 			Dictionary<string, SoundInfo> notifications;
 			Dictionary<string, MusicInfo> music;
-			Dictionary<string, string> movies;
 			Dictionary<string, TileSet> tileSets;
 
 			using (new PerfTimer("Actors"))
@@ -69,14 +67,12 @@ namespace OpenRA
 				notifications = LoadYamlRules(notificationCache, m.Notifications, map.NotificationDefinitions, (k, _) => new SoundInfo(k.Value));
 			using (new PerfTimer("Music"))
 				music = LoadYamlRules(musicCache, m.Music, new List<MiniYamlNode>(), (k, _) => new MusicInfo(k.Key, k.Value));
-			using (new PerfTimer("Movies"))
-				movies = LoadYamlRules(movieCache, m.Movies, new List<MiniYamlNode>(), (k, v) => k.Value.Value);
 			using (new PerfTimer("TileSets"))
 				tileSets = LoadTileSets(tileSetCache, sequenceCaches, m.TileSets);
 
 			var sequences = sequenceCaches.ToDictionary(kvp => kvp.Key, kvp => new SequenceProvider(kvp.Value, map));
 
-			return new Ruleset(actors, weapons, voices, notifications, music, movies, tileSets, sequences);
+			return new Ruleset(actors, weapons, voices, notifications, music, tileSets, sequences);
 		}
 
 		Dictionary<string, T> LoadYamlRules<T>(

OpenRA.Game/GameRules/Warhead.cs

@@ -33,6 +33,18 @@ namespace OpenRA.GameRules
 		[Desc("Delay in ticks before applying the warhead effect.", "0 = instant (old model).")]
 		public readonly int Delay = 0;
 
+		HashSet<string> validTargetSet;
+		HashSet<string> invalidTargetSet;
+
+		public bool IsValidTarget(IEnumerable<string> targetTypes)
+		{
+			if (validTargetSet == null)
+				validTargetSet = new HashSet<string>(ValidTargets);
+			if (invalidTargetSet == null)
+				invalidTargetSet = new HashSet<string>(InvalidTargets);
+			return validTargetSet.Overlaps(targetTypes) && !invalidTargetSet.Overlaps(targetTypes);
+		}
+
 		/// <summary>Applies the warhead's effect against the target.</summary>
 		public abstract void DoImpact(Target target, Actor firedBy, IEnumerable<int> damageModifiers);
 
@@ -52,8 +64,7 @@ namespace OpenRA.GameRules
 					return false;
 
 				var cellInfo = world.Map.GetTerrainInfo(cell);
-				if (!ValidTargets.Intersect(cellInfo.TargetTypes).Any()
-					|| InvalidTargets.Intersect(cellInfo.TargetTypes).Any())
+				if (!IsValidTarget(cellInfo.TargetTypes))
 					return false;
 
 				return true;
@@ -81,8 +92,7 @@ namespace OpenRA.GameRules
 
 			// A target type is valid if it is in the valid targets list, and not in the invalid targets list.
 			var targetable = victim.TraitOrDefault<ITargetable>();
-			if (targetable == null || !ValidTargets.Intersect(targetable.TargetTypes).Any()
-				|| InvalidTargets.Intersect(targetable.TargetTypes).Any())
+			if (targetable == null || !IsValidTarget(targetable.TargetTypes))
 				return false;
 
 			return true;
@@ -101,8 +111,7 @@ namespace OpenRA.GameRules
 
 			// A target type is valid if it is in the valid targets list, and not in the invalid targets list.
 			var targetable = victim.Info.Traits.GetOrDefault<ITargetableInfo>();
-			if (targetable == null || !ValidTargets.Intersect(targetable.GetTargetTypes()).Any()
-				|| InvalidTargets.Intersect(targetable.GetTargetTypes()).Any())
+			if (targetable == null || !IsValidTarget(targetable.GetTargetTypes()))
 				return false;
 
 			return true;

OpenRA.Game/GameRules/WeaponInfo.cs

@@ -19,8 +19,8 @@ namespace OpenRA.GameRules
 	public class ProjectileArgs
 	{
 		public WeaponInfo Weapon;
-		public IEnumerable<int> DamageModifiers;
-		public IEnumerable<int> InaccuracyModifiers;
+		public int[] DamageModifiers;
+		public int[] InaccuracyModifiers;
 		public int Facing;
 		public WPos Source;
 		public Actor SourceActor;
@@ -30,7 +30,7 @@ namespace OpenRA.GameRules
 
 	public interface IProjectileInfo { IEffect Create(ProjectileArgs args); }
 
-	public class WeaponInfo
+	public sealed class WeaponInfo
 	{
 		[Desc("The maximum range the weapon can fire.")]
 		public readonly WRange Range = WRange.Zero;
@@ -46,8 +46,6 @@ namespace OpenRA.GameRules
 
 		public readonly bool Charges = false;
 
-		public readonly string Palette = "effect";
-
 		[Desc("What types of targets are affected.")]
 		public readonly string[] ValidTargets = { "Ground", "Water" };
 
@@ -66,9 +64,14 @@ namespace OpenRA.GameRules
 		[FieldLoader.LoadUsing("LoadWarheads")]
 		public readonly List<Warhead> Warheads = new List<Warhead>();
 
+		readonly HashSet<string> validTargetSet;
+		readonly HashSet<string> invalidTargetSet;
+
 		public WeaponInfo(string name, MiniYaml content)
 		{
 			FieldLoader.Load(this, content);
+			validTargetSet = new HashSet<string>(ValidTargets);
+			invalidTargetSet = new HashSet<string>(InvalidTargets);
 		}
 
 		static object LoadProjectile(MiniYaml yaml)
@@ -94,6 +97,11 @@ namespace OpenRA.GameRules
 			return retList;
 		}
 
+		public bool IsValidTarget(IEnumerable<string> targetTypes)
+		{
+			return validTargetSet.Overlaps(targetTypes) && !invalidTargetSet.Overlaps(targetTypes);
+		}
+
 		/// <summary>Checks if the weapon is valid against (can target) the target.</summary>
 		public bool IsValidAgainst(Target target, World world, Actor firedBy)
 		{
@@ -110,8 +118,7 @@ namespace OpenRA.GameRules
 					return false;
 
 				var cellInfo = world.Map.GetTerrainInfo(cell);
-				if (!ValidTargets.Intersect(cellInfo.TargetTypes).Any()
-					|| InvalidTargets.Intersect(cellInfo.TargetTypes).Any())
+				if (!IsValidTarget(cellInfo.TargetTypes))
 					return false;
 
 				return true;
@@ -124,8 +131,7 @@ namespace OpenRA.GameRules
 		public bool IsValidAgainst(Actor victim, Actor firedBy)
 		{
 			var targetable = victim.TraitOrDefault<ITargetable>();
-			if (targetable == null || !ValidTargets.Intersect(targetable.TargetTypes).Any()
-				|| InvalidTargets.Intersect(targetable.TargetTypes).Any())
+			if (targetable == null || !IsValidTarget(targetable.TargetTypes))
 				return false;
 
 			if (!Warheads.Any(w => w.IsValidAgainst(victim, firedBy)))
@@ -138,8 +144,7 @@ namespace OpenRA.GameRules
 		public bool IsValidAgainst(FrozenActor victim, Actor firedBy)
 		{
 			var targetable = victim.Info.Traits.GetOrDefault<ITargetableInfo>();
-			if (targetable == null || !ValidTargets.Intersect(targetable.GetTargetTypes()).Any()
-				|| InvalidTargets.Intersect(targetable.GetTargetTypes()).Any())
+			if (targetable == null || !IsValidTarget(targetable.GetTargetTypes()))
 				return false;
 
 			if (!Warheads.Any(w => w.IsValidAgainst(victim, firedBy)))

OpenRA.Game/Graphics/Animation.cs

@@ -16,7 +16,7 @@ namespace OpenRA.Graphics
 	public class Animation
 	{
 		readonly int defaultTick = 40; // 25 fps == 40 ms
-		public Sequence CurrentSequence { get; private set; }
+		public ISpriteSequence CurrentSequence { get; private set; }
 		public bool IsDecoration = false;
 		public Func<bool> Paused;
 
@@ -47,7 +47,7 @@ namespace OpenRA.Graphics
 			this.facingFunc = facingFunc;
 		}
 
-		int CurrentFrame { get { return backwards ? CurrentSequence.Start + CurrentSequence.Length - frame - 1 : frame; } }
+		public int CurrentFrame { get { return backwards ? CurrentSequence.Start + CurrentSequence.Length - frame - 1 : frame; } }
 		public Sprite Image { get { return CurrentSequence.GetSprite(CurrentFrame, facingFunc()); } }
 
 		public IEnumerable<IRenderable> Render(WPos pos, WVec offset, int zOffset, PaletteReference palette, float scale)
@@ -79,6 +79,8 @@ namespace OpenRA.Graphics
 			backwards = false;
 			tickAlways = false;
 			CurrentSequence = sequenceProvider.GetSequence(name, sequenceName);
+			timeUntilNextFrame = CurrentSequence != null ? CurrentSequence.Tick : defaultTick;
+
 			frame = 0;
 			tickFunc = () =>
 			{
@@ -94,6 +96,8 @@ namespace OpenRA.Graphics
 				return false;
 
 			CurrentSequence = sequenceProvider.GetSequence(name, sequenceName);
+			var tick = CurrentSequence != null ? CurrentSequence.Tick : defaultTick;
+			timeUntilNextFrame = Math.Min(tick, timeUntilNextFrame);
 			frame %= CurrentSequence.Length;
 			return true;
 		}
@@ -103,6 +107,8 @@ namespace OpenRA.Graphics
 			backwards = false;
 			tickAlways = false;
 			CurrentSequence = sequenceProvider.GetSequence(name, sequenceName);
+			timeUntilNextFrame = CurrentSequence != null ? CurrentSequence.Tick : defaultTick;
+
 			frame = 0;
 			tickFunc = () =>
 			{
@@ -127,10 +133,30 @@ namespace OpenRA.Graphics
 			backwards = false;
 			tickAlways = true;
 			CurrentSequence = sequenceProvider.GetSequence(name, sequenceName);
+			timeUntilNextFrame = CurrentSequence != null ? CurrentSequence.Tick : defaultTick;
+
 			frame = func();
 			tickFunc = () => frame = func();
 		}
 
+		public void PlayFetchDirection(string sequenceName, Func<int> direction)
+		{
+			tickAlways = false;
+			CurrentSequence = sequenceProvider.GetSequence(name, sequenceName);
+			timeUntilNextFrame = CurrentSequence != null ? CurrentSequence.Tick : defaultTick;
+
+			frame = 0;
+			tickFunc = () =>
+			{
+				var d = direction();
+				if (d > 0 && ++frame >= CurrentSequence.Length)
+					frame = 0;
+
+				if (d < 0 && --frame < 0)
+					frame = CurrentSequence.Length - 1;
+			};
+		}
+
 		int timeUntilNextFrame;
 		Action tickFunc;
 
@@ -169,7 +195,7 @@ namespace OpenRA.Graphics
 			}
 		}
 
-		public Sequence GetSequence(string sequenceName)
+		public ISpriteSequence GetSequence(string sequenceName)
 		{
 			return sequenceProvider.GetSequence(name, sequenceName);
 		}

OpenRA.Game/Graphics/CursorProvider.cs

@@ -42,7 +42,7 @@ namespace OpenRA.Graphics
 
 			Palettes = palettes.AsReadOnly();
 
-			var frameCache = new FrameCache(modData.SpriteLoaders, new string[0]);
+			var frameCache = new FrameCache(modData.SpriteLoaders);
 			var cursors = new Dictionary<string, CursorSequence>();
 			foreach (var s in nodesDict["Cursors"].Nodes)
 				foreach (var sequence in s.Value.Nodes)

OpenRA.Game/Graphics/CursorSequence.cs

@@ -45,9 +45,18 @@ namespace OpenRA.Graphics
 				.ToArray();
 
 			if (d.ContainsKey("X"))
-				Exts.TryParseIntegerInvariant(d["X"].Value, out Hotspot.X);
+			{
+				int x;
+				Exts.TryParseIntegerInvariant(d["X"].Value, out x);
+				Hotspot = Hotspot.WithX(x);
+			}
+
 			if (d.ContainsKey("Y"))
-				Exts.TryParseIntegerInvariant(d["Y"].Value, out Hotspot.Y);
+			{
+				int y;
+				Exts.TryParseIntegerInvariant(d["Y"].Value, out y);
+				Hotspot = Hotspot.WithY(y);
+			}
 		}
 	}
 }

OpenRA.Game/Graphics/HSLColor.cs

@@ -52,10 +52,14 @@ namespace OpenRA.Graphics
 
 			for (var k = 0; k < 3; k++)
 			{
-				if (trgb[k] < 1 / 6.0f) { rgb[k] = p + ((q - p) * 6 * trgb[k]); }
-				else if (trgb[k] >= 1 / 6.0f && trgb[k] < 0.5) { rgb[k] = q; }
-				else if (trgb[k] >= 0.5f && trgb[k] < 2.0f / 3) { rgb[k] = p + ((q - p) * 6 * (2.0f / 3 - trgb[k])); }
-				else { rgb[k] = p; }
+				if (trgb[k] < 1 / 6.0f)
+					rgb[k] = p + ((q - p) * 6 * trgb[k]);
+				else if (trgb[k] >= 1 / 6.0f && trgb[k] < 0.5)
+					rgb[k] = q;
+				else if (trgb[k] >= 0.5f && trgb[k] < 2.0f / 3)
+					rgb[k] = p + ((q - p) * 6 * (2.0f / 3 - trgb[k]));
+				else
+					rgb[k] = p;
 			}
 
 			return Color.FromArgb((int)(rgb[0] * 255), (int)(rgb[1] * 255), (int)(rgb[2] * 255));

OpenRA.Game/Graphics/HardwareCursor.cs

@@ -52,7 +52,7 @@ namespace OpenRA.Graphics
 			{
 				dataX = -hotspot.X;
 				dataWidth += dataX;
-				hotspot.X = 0;
+				hotspot = hotspot.WithX(0);
 			}
 			else if (hotspot.X >= frameWidth)
 				dataWidth = hotspot.X + 1;
@@ -64,7 +64,7 @@ namespace OpenRA.Graphics
 			{
 				dataY = -hotspot.Y;
 				dataHeight += dataY;
-				hotspot.Y = 0;
+				hotspot = hotspot.WithY(0);
 			}
 			else if (hotspot.Y >= frameHeight)
 				dataHeight = hotspot.Y + 1;

OpenRA.Game/Graphics/HardwarePalette.cs

@@ -30,6 +30,11 @@ namespace OpenRA.Graphics
 			readOnlyModifiablePalettes = modifiablePalettes.AsReadOnly();
 		}
 
+		public bool Contains(string name)
+		{
+			return modifiablePalettes.ContainsKey(name) || palettes.ContainsKey(name);
+		}
+
 		public IPalette GetPalette(string name)
 		{
 			MutablePalette mutable;

OpenRA.Game/Graphics/IGraphicsDevice.cs

@@ -34,7 +34,16 @@ namespace OpenRA
 
 	public interface IHardwareCursor : IDisposable { }
 
-	public enum BlendMode : byte { None, Alpha, Additive, Subtractive, Multiply }
+	public enum BlendMode : byte
+	{
+		None,
+		Alpha,
+		Additive,
+		Subtractive,
+		Multiply,
+		Multiplicative,
+		DoubleMultiplicative
+	}
 
 	public interface IGraphicsDevice : IDisposable
 	{
@@ -72,6 +81,7 @@ namespace OpenRA
 	{
 		void Bind();
 		void SetData(T[] vertices, int length);
+		void SetData(T[] vertices, int start, int length);
 	}
 
 	public interface IShader

OpenRA.Game/Graphics/LineRenderer.cs

@@ -9,6 +9,7 @@
 #endregion
 
 using System;
+using System.Collections.Generic;
 using System.Drawing;
 
 namespace OpenRA.Graphics
@@ -69,10 +70,26 @@ namespace OpenRA.Graphics
 		{
 			var tr = new float2(br.X, tl.Y);
 			var bl = new float2(tl.X, br.Y);
-			DrawLine(tl, tr, c, c);
-			DrawLine(tl, bl, c, c);
-			DrawLine(tr, br, c, c);
-			DrawLine(bl, br, c, c);
+			DrawLine(tl, tr, c);
+			DrawLine(tl, bl, c);
+			DrawLine(tr, br, c);
+			DrawLine(bl, br, c);
+		}
+
+		public void DrawLine(float2 start, float2 end, Color color)
+		{
+			renderer.CurrentBatchRenderer = this;
+
+			if (nv + 2 > renderer.TempBufferSize)
+				Flush();
+
+			color = Util.PremultiplyAlpha(color);
+			var r = color.R / 255.0f;
+			var g = color.G / 255.0f;
+			var b = color.B / 255.0f;
+			var a = color.A / 255.0f;
+			vertices[nv++] = new Vertex(start + Offset, r, g, b, a);
+			vertices[nv++] = new Vertex(end + Offset, r, g, b, a);
 		}
 
 		public void DrawLine(float2 start, float2 end, Color startColor, Color endColor)
@@ -82,19 +99,55 @@ namespace OpenRA.Graphics
 			if (nv + 2 > renderer.TempBufferSize)
 				Flush();
 
-			vertices[nv++] = new Vertex(start + Offset,
-				startColor.R / 255.0f, startColor.G / 255.0f,
-				startColor.B / 255.0f, startColor.A / 255.0f);
+			startColor = Util.PremultiplyAlpha(startColor);
+			var r = startColor.R / 255.0f;
+			var g = startColor.G / 255.0f;
+			var b = startColor.B / 255.0f;
+			var a = startColor.A / 255.0f;
+			vertices[nv++] = new Vertex(start + Offset, r, g, b, a);
 
-			vertices[nv++] = new Vertex(end + Offset,
-				endColor.R / 255.0f, endColor.G / 255.0f,
-				endColor.B / 255.0f, endColor.A / 255.0f);
+			endColor = Util.PremultiplyAlpha(endColor);
+			r = endColor.R / 255.0f;
+			g = endColor.G / 255.0f;
+			b = endColor.B / 255.0f;
+			a = endColor.A / 255.0f;
+			vertices[nv++] = new Vertex(end + Offset, r, g, b, a);
+		}
+
+		public void DrawLineStrip(IEnumerable<float2> points, Color color)
+		{
+			renderer.CurrentBatchRenderer = this;
+
+			color = Util.PremultiplyAlpha(color);
+			var r = color.R / 255.0f;
+			var g = color.G / 255.0f;
+			var b = color.B / 255.0f;
+			var a = color.A / 255.0f;
+
+			var first = true;
+			var prev = new Vertex();
+			foreach (var point in points)
+			{
+				if (first)
+				{
+					first = false;
+					prev = new Vertex(point + Offset, r, g, b, a);
+					continue;
+				}
+
+				if (nv + 2 > renderer.TempBufferSize)
+					Flush();
+
+				vertices[nv++] = prev;
+				prev = new Vertex(point + Offset, r, g, b, a);
+				vertices[nv++] = prev;
+			}
 		}
 
 		public void FillRect(RectangleF r, Color color)
 		{
 			for (var y = r.Top; y < r.Bottom; y++)
-				DrawLine(new float2(r.Left, y), new float2(r.Right, y), color, color);
+				DrawLine(new float2(r.Left, y), new float2(r.Right, y), color);
 		}
 
 		public void FillEllipse(RectangleF r, Color color)
@@ -106,7 +159,7 @@ namespace OpenRA.Graphics
 			for (var y = r.Top; y <= r.Bottom; y++)
 			{
 				var dx = a * (float)Math.Sqrt(1 - (y - yc) * (y - yc) / b / b);
-				DrawLine(new float2(xc - dx, y), new float2(xc + dx, y), color, color);
+				DrawLine(new float2(xc - dx, y), new float2(xc + dx, y), color);
 			}
 		}
 

OpenRA.Game/Graphics/Minimap.cs

@@ -44,8 +44,10 @@ namespace OpenRA.Graphics
 					{
 						var mapX = x + b.Left;
 						var mapY = y + b.Top;
-						var type = tileset[tileset.GetTerrainIndex(mapTiles[new MPos(mapX, mapY)])];
-						colors[y * stride + x] = type.Color.ToArgb();
+						var type = tileset.GetTileInfo(mapTiles[new MPos(mapX, mapY)]);
+						var color = type != null ? type.LeftColor : Color.Black;
+
+						colors[y * stride + x] = color.ToArgb();
 					}
 				}
 			}
@@ -145,12 +147,11 @@ namespace OpenRA.Graphics
 					if (!t.Actor.IsInWorld || world.FogObscures(t.Actor))
 						continue;
 
-					var color = t.Trait.RadarSignatureColor(t.Actor);
 					foreach (var cell in t.Trait.RadarSignatureCells(t.Actor))
 					{
-						var uv = cell.ToMPos(map);
+						var uv = cell.First.ToMPos(map);
 						if (b.Contains(uv.U, uv.V))
-							colors[(uv.V - b.Top) * stride + uv.U - b.Left] = color.ToArgb();
+							colors[(uv.V - b.Top) * stride + uv.U - b.Left] = cell.Second.ToArgb();
 					}
 				}
 			}

OpenRA.Game/Graphics/PaletteReference.cs

@@ -0,0 +1,37 @@
+#region Copyright & License Information
+/*
+ * Copyright 2007-2015 The OpenRA Developers (see AUTHORS)
+ * This file is part of OpenRA, which is free software. It is made
+ * available to you under the terms of the GNU General Public License
+ * as published by the Free Software Foundation. For more information,
+ * see COPYING.
+ */
+#endregion
+
+using System;
+using System.Collections.Generic;
+using System.Drawing;
+using System.Linq;
+using OpenRA.Traits;
+
+namespace OpenRA.Graphics
+{
+	public sealed class PaletteReference
+	{
+		readonly float index;
+		readonly HardwarePalette hardwarePalette;
+
+		public readonly string Name;
+		public IPalette Palette { get; internal set; }
+		public float TextureIndex { get { return index / hardwarePalette.Height; } }
+		public float TextureMidIndex { get { return (index + 0.5f) / hardwarePalette.Height; } }
+
+		public PaletteReference(string name, int index, IPalette palette, HardwarePalette hardwarePalette)
+		{
+			Name = name;
+			Palette = palette;
+			this.index = index;
+			this.hardwarePalette = hardwarePalette;
+		}
+	}
+}

OpenRA.Game/Graphics/PlayerColorRemap.cs

@@ -32,14 +32,14 @@ namespace OpenRA.Graphics
 			var c1 = new HSLColor(c.H, c.S, (byte)Math.Max(rampRange, c.L)).RGB;
 			var c2 = new HSLColor(c.H, c.S, (byte)Math.Max(0, c.L - rampRange)).RGB;
 			var baseIndex = ramp[0];
-			var remapRamp = ramp.Select(r => r - ramp[0]).ToArray();
+			var remapRamp = ramp.Select(r => r - ramp[0]);
 
 			// reversed remapping
 			if (ramp[0] > ramp[15])
 			{
 				baseIndex = ramp[15];
 				for (var i = 15; i > 0; i--)
-					remapRamp = ramp.Select(r => r - ramp[15]).ToArray();
+					remapRamp = ramp.Select(r => r - ramp[15]);
 			}
 
 			remapColors = remapRamp.Select((x, i) => Pair.New(baseIndex + i, Exts.ColorLerp(x / 16f, c1, c2)))

OpenRA.Game/Graphics/QuadRenderer.cs

@@ -51,6 +51,7 @@ namespace OpenRA.Graphics
 			if (nv + 4 > renderer.TempBufferSize)
 				Flush();
 
+			color = Util.PremultiplyAlpha(color);
 			var r = color.R / 255.0f;
 			var g = color.G / 255.0f;
 			var b = color.B / 255.0f;

OpenRA.Game/Graphics/Renderable.cs

@@ -17,73 +17,22 @@ namespace OpenRA.Graphics
 	public interface IRenderable
 	{
 		WPos Pos { get; }
-		float Scale { get; }
 		PaletteReference Palette { get; }
 		int ZOffset { get; }
 		bool IsDecoration { get; }
 
-		IRenderable WithScale(float newScale);
 		IRenderable WithPalette(PaletteReference newPalette);
 		IRenderable WithZOffset(int newOffset);
 		IRenderable OffsetBy(WVec offset);
 		IRenderable AsDecoration();
 
-		void BeforeRender(WorldRenderer wr);
+		IFinalizedRenderable PrepareRender(WorldRenderer wr);
+	}
+
+	public interface IFinalizedRenderable
+	{
 		void Render(WorldRenderer wr);
 		void RenderDebugGeometry(WorldRenderer wr);
-	}
-
-	public struct SpriteRenderable : IRenderable
-	{
-		public static readonly IEnumerable<IRenderable> None = new IRenderable[0].AsEnumerable();
-
-		readonly Sprite sprite;
-		readonly WPos pos;
-		readonly WVec offset;
-		readonly int zOffset;
-		readonly PaletteReference palette;
-		readonly float scale;
-		readonly bool isDecoration;
-
-		public SpriteRenderable(Sprite sprite, WPos pos, WVec offset, int zOffset, PaletteReference palette, float scale, bool isDecoration)
-		{
-			this.sprite = sprite;
-			this.pos = pos;
-			this.offset = offset;
-			this.zOffset = zOffset;
-			this.palette = palette;
-			this.scale = scale;
-			this.isDecoration = isDecoration;
-		}
-
-		public WPos Pos { get { return pos + offset; } }
-		public WVec Offset { get { return offset; } }
-		public float Scale { get { return scale; } }
-		public PaletteReference Palette { get { return palette; } }
-		public int ZOffset { get { return zOffset; } }
-		public bool IsDecoration { get { return isDecoration; } }
-
-		public IRenderable WithScale(float newScale) { return new SpriteRenderable(sprite, pos, offset, zOffset, palette, newScale, isDecoration); }
-		public IRenderable WithPalette(PaletteReference newPalette) { return new SpriteRenderable(sprite, pos, offset, zOffset, newPalette, scale, isDecoration); }
-		public IRenderable WithZOffset(int newOffset) { return new SpriteRenderable(sprite, pos, offset, newOffset, palette, scale, isDecoration); }
-		public IRenderable OffsetBy(WVec vec) { return new SpriteRenderable(sprite, pos + vec, offset, zOffset, palette, scale, isDecoration); }
-		public IRenderable AsDecoration() { return new SpriteRenderable(sprite, pos, offset, zOffset, palette, scale, true); }
-
-		float2 ScreenPosition(WorldRenderer wr)
-		{
-			return wr.ScreenPxPosition(pos) + wr.ScreenPxOffset(offset) - (0.5f * scale * sprite.Size).ToInt2();
-		}
-
-		public void BeforeRender(WorldRenderer wr) { }
-		public void Render(WorldRenderer wr)
-		{
-			Game.Renderer.WorldSpriteRenderer.DrawSprite(sprite, ScreenPosition(wr), palette, sprite.Size * scale);
-		}
-
-		public void RenderDebugGeometry(WorldRenderer wr)
-		{
-			var offset = ScreenPosition(wr) + sprite.Offset;
-			Game.Renderer.WorldLineRenderer.DrawRect(offset, offset + sprite.Size, Color.Red);
-		}
+		Rectangle ScreenBounds(WorldRenderer wr);
 	}
 }

OpenRA.Game/Graphics/Renderer.cs

@@ -37,6 +37,8 @@ namespace OpenRA.Graphics
 		readonly Queue<IVertexBuffer<Vertex>> tempBuffers = new Queue<IVertexBuffer<Vertex>>();
 		readonly Stack<Rectangle> scissorState = new Stack<Rectangle>();
 
+		SheetBuilder fontSheetBuilder;
+
 		Size? lastResolution;
 		int2? lastScroll;
 		float? lastZoom;
@@ -94,14 +96,23 @@ namespace OpenRA.Graphics
 		public void InitializeFonts(Manifest m)
 		{
 			using (new Support.PerfTimer("SpriteFonts"))
+			{
+				if (fontSheetBuilder != null)
+					fontSheetBuilder.Dispose();
+				fontSheetBuilder = new SheetBuilder(SheetType.BGRA);
 				Fonts = m.Fonts.ToDictionary(x => x.Key,
-					x => new SpriteFont(Platform.ResolvePath(x.Value.First), x.Value.Second)).AsReadOnly();
+					x => new SpriteFont(Platform.ResolvePath(x.Value.First), x.Value.Second, fontSheetBuilder)).AsReadOnly();
+			}
 		}
 
 		public void BeginFrame(int2 scroll, float zoom)
 		{
 			Device.Clear();
+			SetViewportParams(scroll, zoom);
+		}
 
+		public void SetViewportParams(int2 scroll, float zoom)
+		{
 			var resolutionChanged = lastResolution != Resolution;
 			if (resolutionChanged)
 			{
@@ -246,6 +257,13 @@ namespace OpenRA.Graphics
 			foreach (var buffer in tempBuffers)
 				buffer.Dispose();
 			tempBuffers.Clear();
+			if (fontSheetBuilder != null)
+				fontSheetBuilder.Dispose();
+		}
+
+		public string GetClipboardText()
+		{
+			return Device.GetClipboardText();
 		}
 	}
 }

OpenRA.Game/Graphics/SelectionBarsRenderable.cs

@@ -14,7 +14,7 @@ using OpenRA.Traits;
 
 namespace OpenRA.Graphics
 {
-	public struct SelectionBarsRenderable : IRenderable
+	public struct SelectionBarsRenderable : IRenderable, IFinalizedRenderable
 	{
 		readonly WPos pos;
 		readonly Actor actor;
@@ -30,12 +30,10 @@ namespace OpenRA.Graphics
 
 		public WPos Pos { get { return pos; } }
 
-		public float Scale { get { return 1f; } }
 		public PaletteReference Palette { get { return null; } }
 		public int ZOffset { get { return 0; } }
 		public bool IsDecoration { get { return true; } }
 
-		public IRenderable WithScale(float newScale) { return this; }
 		public IRenderable WithPalette(PaletteReference newPalette) { return this; }
 		public IRenderable WithZOffset(int newOffset) { return this; }
 		public IRenderable OffsetBy(WVec vec) { return new SelectionBarsRenderable(pos + vec, actor); }
@@ -67,23 +65,39 @@ namespace OpenRA.Graphics
 
 			var z = float2.Lerp(start, end, value);
 			var wlr = Game.Renderer.WorldLineRenderer;
-			wlr.DrawLine(start + p, end + p, c, c);
-			wlr.DrawLine(start + q, end + q, c2, c2);
-			wlr.DrawLine(start + r, end + r, c, c);
+			wlr.DrawLine(start + p, end + p, c);
+			wlr.DrawLine(start + q, end + q, c2);
+			wlr.DrawLine(start + r, end + r, c);
 
-			wlr.DrawLine(start + p, z + p, barColor2, barColor2);
-			wlr.DrawLine(start + q, z + q, barColor, barColor);
-			wlr.DrawLine(start + r, z + r, barColor2, barColor2);
+			wlr.DrawLine(start + p, z + p, barColor2);
+			wlr.DrawLine(start + q, z + q, barColor);
+			wlr.DrawLine(start + r, z + r, barColor2);
 		}
 
 		Color GetHealthColor(Health health)
 		{
-			if (Game.Settings.Game.TeamHealthColors)
+			var player = actor.World.RenderPlayer ?? actor.World.LocalPlayer;
+
+			if (Game.Settings.Game.TeamHealthColors && player != null && !player.Spectating)
 			{
-				var isAlly = actor.Owner.IsAlliedWith(actor.World.LocalPlayer)
-					|| (actor.EffectiveOwner != null && actor.EffectiveOwner.Disguised
-					&& actor.World.LocalPlayer.IsAlliedWith(actor.EffectiveOwner.Owner));
-				return isAlly ? Color.LimeGreen : actor.Owner.NonCombatant ? Color.Tan : Color.Red;
+				var apparentOwner = actor.EffectiveOwner != null && actor.EffectiveOwner.Disguised
+					? actor.EffectiveOwner.Owner
+					: actor.Owner;
+
+				// For friendly spies, treat the unit's owner as the actual owner
+				if (actor.Owner.IsAlliedWith(actor.World.RenderPlayer))
+					apparentOwner = actor.Owner;
+
+				if (apparentOwner == player)
+					return Color.LimeGreen;
+
+				if (apparentOwner.IsAlliedWith(player))
+					return Color.Yellow;
+
+				if (apparentOwner.NonCombatant)
+					return Color.Tan;
+
+				return Color.Red;
 			}
 			else
 				return health.DamageState == DamageState.Critical ? Color.Red :
@@ -111,13 +125,13 @@ namespace OpenRA.Graphics
 			var z = float2.Lerp(start, end, (float)health.HP / health.MaxHP);
 
 			var wlr = Game.Renderer.WorldLineRenderer;
-			wlr.DrawLine(start + p, end + p, c, c);
-			wlr.DrawLine(start + q, end + q, c2, c2);
-			wlr.DrawLine(start + r, end + r, c, c);
+			wlr.DrawLine(start + p, end + p, c);
+			wlr.DrawLine(start + q, end + q, c2);
+			wlr.DrawLine(start + r, end + r, c);
 
-			wlr.DrawLine(start + p, z + p, healthColor2, healthColor2);
-			wlr.DrawLine(start + q, z + q, healthColor, healthColor);
-			wlr.DrawLine(start + r, z + r, healthColor2, healthColor2);
+			wlr.DrawLine(start + p, z + p, healthColor2);
+			wlr.DrawLine(start + q, z + q, healthColor);
+			wlr.DrawLine(start + r, z + r, healthColor2);
 
 			if (health.DisplayHp != health.HP)
 			{
@@ -129,13 +143,13 @@ namespace OpenRA.Graphics
 					deltaColor.B / 2);
 				var zz = float2.Lerp(start, end, (float)health.DisplayHp / health.MaxHP);
 
-				wlr.DrawLine(z + p, zz + p, deltaColor2, deltaColor2);
-				wlr.DrawLine(z + q, zz + q, deltaColor, deltaColor);
-				wlr.DrawLine(z + r, zz + r, deltaColor2, deltaColor2);
+				wlr.DrawLine(z + p, zz + p, deltaColor2);
+				wlr.DrawLine(z + q, zz + q, deltaColor);
+				wlr.DrawLine(z + r, zz + r, deltaColor2);
 			}
 		}
 
-		public void BeforeRender(WorldRenderer wr) { }
+		public IFinalizedRenderable PrepareRender(WorldRenderer wr) { return this; }
 		public void Render(WorldRenderer wr)
 		{
 			if (!actor.IsInWorld || actor.IsDead)
@@ -155,5 +169,6 @@ namespace OpenRA.Graphics
 		}
 
 		public void RenderDebugGeometry(WorldRenderer wr) { }
+		public Rectangle ScreenBounds(WorldRenderer wr) { return Rectangle.Empty; }
 	}
 }

OpenRA.Game/Graphics/SelectionBoxRenderable.cs

@@ -14,7 +14,7 @@ using OpenRA.Traits;
 
 namespace OpenRA.Graphics
 {
-	public struct SelectionBoxRenderable : IRenderable
+	public struct SelectionBoxRenderable : IRenderable, IFinalizedRenderable
 	{
 		readonly WPos pos;
 		readonly float scale;
@@ -34,18 +34,16 @@ namespace OpenRA.Graphics
 
 		public WPos Pos { get { return pos; } }
 
-		public float Scale { get { return scale; } }
 		public PaletteReference Palette { get { return null; } }
 		public int ZOffset { get { return 0; } }
 		public bool IsDecoration { get { return true; } }
 
-		public IRenderable WithScale(float newScale) { return new SelectionBoxRenderable(pos, bounds, newScale, color); }
 		public IRenderable WithPalette(PaletteReference newPalette) { return this; }
 		public IRenderable WithZOffset(int newOffset) { return this; }
 		public IRenderable OffsetBy(WVec vec) { return new SelectionBoxRenderable(pos + vec, bounds, scale, color); }
 		public IRenderable AsDecoration() { return this; }
 
-		public void BeforeRender(WorldRenderer wr) { }
+		public IFinalizedRenderable PrepareRender(WorldRenderer wr) { return this; }
 		public void Render(WorldRenderer wr)
 		{
 			var screenPos = wr.ScreenPxPosition(pos);
@@ -57,17 +55,18 @@ namespace OpenRA.Graphics
 			var v = new float2(0, 4f / wr.Viewport.Zoom);
 
 			var wlr = Game.Renderer.WorldLineRenderer;
-			wlr.DrawLine(tl + u, tl, color, color);
-			wlr.DrawLine(tl, tl + v, color, color);
-			wlr.DrawLine(tr, tr - u, color, color);
-			wlr.DrawLine(tr, tr + v, color, color);
+			wlr.DrawLine(tl + u, tl, color);
+			wlr.DrawLine(tl, tl + v, color);
+			wlr.DrawLine(tr, tr - u, color);
+			wlr.DrawLine(tr, tr + v, color);
 
-			wlr.DrawLine(bl, bl + u, color, color);
-			wlr.DrawLine(bl, bl - v, color, color);
-			wlr.DrawLine(br, br - u, color, color);
-			wlr.DrawLine(br, br - v, color, color);
+			wlr.DrawLine(bl, bl + u, color);
+			wlr.DrawLine(bl, bl - v, color);
+			wlr.DrawLine(br, br - u, color);
+			wlr.DrawLine(br, br - v, color);
 		}
 
 		public void RenderDebugGeometry(WorldRenderer wr) { }
+		public Rectangle ScreenBounds(WorldRenderer wr) { return Rectangle.Empty; }
 	}
 }

OpenRA.Game/Graphics/Sequence.cs

@@ -1,157 +0,0 @@
-#region Copyright & License Information
-/*
- * Copyright 2007-2015 The OpenRA Developers (see AUTHORS)
- * This file is part of OpenRA, which is free software. It is made
- * available to you under the terms of the GNU General Public License
- * as published by the Free Software Foundation. For more information,
- * see COPYING.
- */
-#endregion
-
-using System;
-using System.Linq;
-
-namespace OpenRA.Graphics
-{
-	public class Sequence
-	{
-		readonly Sprite[] sprites;
-		readonly bool reverseFacings, transpose;
-
-		public readonly string Name;
-		public readonly int Start;
-		public readonly int Length;
-		public readonly int Stride;
-		public readonly int Facings;
-		public readonly int Tick;
-		public readonly int ZOffset;
-		public readonly int ShadowStart;
-		public readonly int ShadowZOffset;
-		public readonly int[] Frames;
-
-		public Sequence(SpriteCache cache, string unit, string name, MiniYaml info)
-		{
-			var srcOverride = info.Value;
-			Name = name;
-			var d = info.ToDictionary();
-			var offset = float2.Zero;
-			var blendMode = BlendMode.Alpha;
-
-			try
-			{
-				if (d.ContainsKey("Start"))
-					Start = Exts.ParseIntegerInvariant(d["Start"].Value);
-
-				if (d.ContainsKey("Offset"))
-					offset = FieldLoader.GetValue<float2>("Offset", d["Offset"].Value);
-
-				if (d.ContainsKey("BlendMode"))
-					blendMode = FieldLoader.GetValue<BlendMode>("BlendMode", d["BlendMode"].Value);
-
-				// Apply offset to each sprite in the sequence
-				// Different sequences may apply different offsets to the same frame
-				sprites = cache[srcOverride ?? unit].Select(
-					s => new Sprite(s.Sheet, s.Bounds, s.Offset + offset, s.Channel, blendMode)).ToArray();
-
-				if (!d.ContainsKey("Length"))
-					Length = 1;
-				else if (d["Length"].Value == "*")
-					Length = sprites.Length - Start;
-				else
-					Length = Exts.ParseIntegerInvariant(d["Length"].Value);
-
-				if (d.ContainsKey("Stride"))
-					Stride = Exts.ParseIntegerInvariant(d["Stride"].Value);
-				else
-					Stride = Length;
-
-				if (d.ContainsKey("Facings"))
-				{
-					var f = Exts.ParseIntegerInvariant(d["Facings"].Value);
-					Facings = Math.Abs(f);
-					reverseFacings = f < 0;
-				}
-				else
-					Facings = 1;
-
-				if (d.ContainsKey("Tick"))
-					Tick = Exts.ParseIntegerInvariant(d["Tick"].Value);
-				else
-					Tick = 40;
-
-				if (d.ContainsKey("Transpose"))
-					transpose = bool.Parse(d["Transpose"].Value);
-
-				if (d.ContainsKey("Frames"))
-					Frames = Array.ConvertAll<string, int>(d["Frames"].Value.Split(','), Exts.ParseIntegerInvariant);
-
-				if (d.ContainsKey("ShadowStart"))
-					ShadowStart = Exts.ParseIntegerInvariant(d["ShadowStart"].Value);
-				else
-					ShadowStart = -1;
-
-				if (d.ContainsKey("ShadowZOffset"))
-				{
-					WRange r;
-					if (WRange.TryParse(d["ShadowZOffset"].Value, out r))
-						ShadowZOffset = r.Range;
-				}
-				else
-					ShadowZOffset = -5;
-
-				if (d.ContainsKey("ZOffset"))
-				{
-					WRange r;
-					if (WRange.TryParse(d["ZOffset"].Value, out r))
-						ZOffset = r.Range;
-				}
-
-				if (Length > Stride)
-					throw new InvalidOperationException(
-						"{0}: Sequence {1}.{2}: Length must be <= stride"
-							.F(info.Nodes[0].Location, unit, name));
-
-				if (Start < 0 || Start + Facings * Stride > sprites.Length || ShadowStart + Facings * Stride > sprites.Length)
-					throw new InvalidOperationException(
-						"{6}: Sequence {0}.{1} uses frames [{2}..{3}] of SHP `{4}`, but only 0..{5} actually exist"
-						.F(unit, name, Start, Start + Facings * Stride - 1, srcOverride ?? unit, sprites.Length - 1,
-						info.Nodes[0].Location));
-			}
-			catch (FormatException f)
-			{
-				throw new FormatException("Failed to parse sequences for {0}.{1} at {2}:\n{3}".F(unit, name, info.Nodes[0].Location, f));
-			}
-		}
-
-		public Sprite GetSprite(int frame)
-		{
-			return GetSprite(Start, frame, 0);
-		}
-
-		public Sprite GetSprite(int frame, int facing)
-		{
-			return GetSprite(Start, frame, facing);
-		}
-
-		public Sprite GetShadow(int frame, int facing)
-		{
-			return ShadowStart >= 0 ? GetSprite(ShadowStart, frame, facing) : null;
-		}
-
-		Sprite GetSprite(int start, int frame, int facing)
-		{
-			var f = Traits.Util.QuantizeFacing(facing, Facings);
-
-			if (reverseFacings)
-				f = (Facings - f) % Facings;
-
-			var i = transpose ? (frame % Length) * Facings + f :
-				(f * Stride) + (frame % Length);
-
-			if (Frames != null)
-				return sprites[Frames[i]];
-
-			return sprites[start + i];
-		}
-	}
-}

OpenRA.Game/Graphics/SequenceProvider.cs

@@ -12,11 +12,36 @@ using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
+using System.Reflection;
 
 namespace OpenRA.Graphics
 {
-	using Sequences = IReadOnlyDictionary<string, Lazy<IReadOnlyDictionary<string, Sequence>>>;
-	using UnitSequences = Lazy<IReadOnlyDictionary<string, Sequence>>;
+	using Sequences = IReadOnlyDictionary<string, Lazy<IReadOnlyDictionary<string, ISpriteSequence>>>;
+	using UnitSequences = Lazy<IReadOnlyDictionary<string, ISpriteSequence>>;
+
+	public interface ISpriteSequence
+	{
+		string Name { get; }
+		int Start { get; }
+		int Length { get; }
+		int Stride { get; }
+		int Facings { get; }
+		int Tick { get; }
+		int ZOffset { get; }
+		int ShadowStart { get; }
+		int ShadowZOffset { get; }
+		int[] Frames { get; }
+
+		Sprite GetSprite(int frame);
+		Sprite GetSprite(int frame, int facing);
+		Sprite GetShadow(int frame, int facing);
+	}
+
+	public interface ISpriteSequenceLoader
+	{
+		Action<string> OnMissingSpriteError { get; set; }
+		IReadOnlyDictionary<string, ISpriteSequence> ParseSequences(ModData modData, TileSet tileSet, SpriteCache cache, MiniYamlNode node);
+	}
 
 	public class SequenceProvider
 	{
@@ -29,19 +54,24 @@ namespace OpenRA.Graphics
 			this.SpriteCache = cache.SpriteCache;
 		}
 
-		public Sequence GetSequence(string unitName, string sequenceName)
+		public ISpriteSequence GetSequence(string unitName, string sequenceName)
 		{
 			UnitSequences unitSeq;
 			if (!sequences.Value.TryGetValue(unitName, out unitSeq))
 				throw new InvalidOperationException("Unit `{0}` does not have any sequences defined.".F(unitName));
 
-			Sequence seq;
+			ISpriteSequence seq;
 			if (!unitSeq.Value.TryGetValue(sequenceName, out seq))
 				throw new InvalidOperationException("Unit `{0}` does not have a sequence named `{1}`".F(unitName, sequenceName));
 
 			return seq;
 		}
 
+		public bool HasSequence(string unitName)
+		{
+			return sequences.Value.ContainsKey(unitName);
+		}
+
 		public bool HasSequence(string unitName, string sequenceName)
 		{
 			UnitSequences unitSeq;
@@ -72,6 +102,7 @@ namespace OpenRA.Graphics
 	public sealed class SequenceCache : IDisposable
 	{
 		readonly ModData modData;
+		readonly TileSet tileSet;
 		readonly Lazy<SpriteCache> spriteCache;
 		public SpriteCache SpriteCache { get { return spriteCache.Value; } }
 
@@ -80,8 +111,10 @@ namespace OpenRA.Graphics
 		public SequenceCache(ModData modData, TileSet tileSet)
 		{
 			this.modData = modData;
+			this.tileSet = tileSet;
 
-			spriteCache = Exts.Lazy(() => new SpriteCache(modData.SpriteLoaders, tileSet.Extensions, new SheetBuilder(SheetType.Indexed)));
+			// Every time we load a tile set, we create a sequence cache for it
+			spriteCache = Exts.Lazy(() => new SpriteCache(modData.SpriteLoaders, new SheetBuilder(SheetType.Indexed)));
 		}
 
 		public Sequences LoadSequences(Map map)
@@ -111,7 +144,7 @@ namespace OpenRA.Graphics
 					items.Add(node.Key, t);
 				else
 				{
-					t = Exts.Lazy(() => CreateUnitSequences(node));
+					t = Exts.Lazy(() => modData.SpriteSequenceLoader.ParseSequences(modData, tileSet, SpriteCache, node));
 					sequenceCache.Add(key, t);
 					items.Add(node.Key, t);
 				}
@@ -120,28 +153,6 @@ namespace OpenRA.Graphics
 			return new ReadOnlyDictionary<string, UnitSequences>(items);
 		}
 
-		IReadOnlyDictionary<string, Sequence> CreateUnitSequences(MiniYamlNode node)
-		{
-			var unitSequences = new Dictionary<string, Sequence>();
-
-			foreach (var kvp in node.Value.ToDictionary())
-			{
-				using (new Support.PerfTimer("new Sequence(\"{0}\")".F(node.Key), 20))
-				{
-					try
-					{
-						unitSequences.Add(kvp.Key, new Sequence(spriteCache.Value, node.Key, kvp.Key, kvp.Value));
-					}
-					catch (FileNotFoundException ex)
-					{
-						Log.Write("debug", ex.Message);
-					}
-				}
-			}
-
-			return new ReadOnlyDictionary<string, Sequence>(unitSequences);
-		}
-
 		public void Dispose()
 		{
 			if (spriteCache.IsValueCreated)

OpenRA.Game/Graphics/Sheet.cs

@@ -18,7 +18,6 @@ namespace OpenRA.Graphics
 {
 	public sealed class Sheet : IDisposable
 	{
-		readonly object textureLock = new object();
 		bool dirty;
 		bool releaseBufferOnCommit;
 		ITexture texture;
@@ -50,15 +49,9 @@ namespace OpenRA.Graphics
 			using (var bitmap = (Bitmap)Image.FromStream(stream))
 			{
 				Size = bitmap.Size;
+				data = new byte[4 * Size.Width * Size.Height];
 
-				var dataStride = 4 * Size.Width;
-				data = new byte[dataStride * Size.Height];
-
-				var bd = bitmap.LockBits(bitmap.Bounds(),
-					ImageLockMode.ReadOnly, PixelFormat.Format32bppArgb);
-				for (var y = 0; y < Size.Height; y++)
-					Marshal.Copy(IntPtr.Add(bd.Scan0, y * bd.Stride), data, y * dataStride, dataStride);
-				bitmap.UnlockBits(bd);
+				Util.FastCopyIntoSprite(new Sprite(this, bitmap.Bounds(), TextureChannel.Red), bitmap);
 			}
 
 			ReleaseBuffer();
@@ -66,33 +59,21 @@ namespace OpenRA.Graphics
 
 		public ITexture GetTexture()
 		{
-			// This is only called from the main thread but 'dirty'
-			// is set from other threads too via CommitData().
-			GenerateTexture();
-			return texture;
-		}
-
-		void GenerateTexture()
-		{
-			lock (textureLock)
+			if (texture == null)
 			{
-				if (texture == null)
-				{
-					texture = Game.Renderer.Device.CreateTexture();
-					dirty = true;
-				}
-
-				if (data != null)
-				{
-					if (dirty)
-					{
-						texture.SetData(data, Size.Width, Size.Height);
-						dirty = false;
-						if (releaseBufferOnCommit)
-							data = null;
-					}
-				}
+				texture = Game.Renderer.Device.CreateTexture();
+				dirty = true;
 			}
+
+			if (data != null && dirty)
+			{
+				texture.SetData(data, Size.Width, Size.Height);
+				dirty = false;
+				if (releaseBufferOnCommit)
+					data = null;
+			}
+
+			return texture;
 		}
 
 		public Bitmap AsBitmap()
@@ -141,42 +122,32 @@ namespace OpenRA.Graphics
 
 		public void CreateBuffer()
 		{
-			lock (textureLock)
-			{
-				if (data != null)
-					return;
-				if (texture == null)
-					data = new byte[4 * Size.Width * Size.Height];
-				else
-					data = texture.GetData();
-				releaseBufferOnCommit = false;
-			}
+			if (data != null)
+				return;
+			if (texture == null)
+				data = new byte[4 * Size.Width * Size.Height];
+			else
+				data = texture.GetData();
+			releaseBufferOnCommit = false;
 		}
 
-		public void CommitData()
+		public void CommitBufferedData()
 		{
-			CommitData(false);
+			if (!Buffered)
+				throw new InvalidOperationException(
+					"This sheet is unbuffered. You cannot call CommitBufferedData on an unbuffered sheet. " +
+					"If you need to completely replace the texture data you should set data into the texture directly. " +
+					"If you need to make only small changes to the texture data consider creating a buffered sheet instead.");
+
+			dirty = true;
 		}
 
 		public void ReleaseBuffer()
 		{
-			CommitData(true);
-		}
-
-		void CommitData(bool releaseBuffer)
-		{
-			lock (textureLock)
-			{
-				if (!Buffered)
-					throw new InvalidOperationException(
-						"This sheet is unbuffered. You cannot call CommitData on an unbuffered sheet. " +
-						"If you need to completely replace the texture data you should set data into the texture directly. " +
-						"If you need to make only small changes to the texture data consider creating a buffered sheet instead.");
-
-				dirty = true;
-				if (releaseBuffer)
-					releaseBufferOnCommit = true;
-			}
+			if (!Buffered)
+				return;
+			dirty = true;
+			releaseBufferOnCommit = true;
 		}
 
 		public void Dispose()

OpenRA.Game/Graphics/SheetBuilder.cs

@@ -31,8 +31,8 @@ namespace OpenRA.Graphics
 
 	public sealed class SheetBuilder : IDisposable
 	{
+		public readonly SheetType Type;
 		readonly List<Sheet> sheets = new List<Sheet>();
-		readonly SheetType type;
 		readonly Func<Sheet> allocateSheet;
 
 		Sheet current;
@@ -54,7 +54,7 @@ namespace OpenRA.Graphics
 		public SheetBuilder(SheetType t, Func<Sheet> allocateSheet)
 		{
 			channel = TextureChannel.Red;
-			type = t;
+			Type = t;
 			current = allocateSheet();
 			sheets.Add(current);
 			this.allocateSheet = allocateSheet;
@@ -70,7 +70,7 @@ namespace OpenRA.Graphics
 
 			var rect = Allocate(size, spriteOffset);
 			Util.FastCopyIntoChannel(rect, src);
-			current.CommitData();
+			current.CommitBufferedData();
 			return rect;
 		}
 
@@ -78,7 +78,7 @@ namespace OpenRA.Graphics
 		{
 			var rect = Allocate(src.Size);
 			Util.FastCopyIntoSprite(rect, src);
-			current.CommitData();
+			current.CommitBufferedData();
 			return rect;
 		}
 
@@ -93,7 +93,7 @@ namespace OpenRA.Graphics
 
 		TextureChannel? NextChannel(TextureChannel t)
 		{
-			var nextChannel = (int)t + (int)type;
+			var nextChannel = (int)t + (int)Type;
 			if (nextChannel > (int)TextureChannel.Alpha)
 				return null;
 

OpenRA.Game/Graphics/Sprite.cs

@@ -24,12 +24,9 @@ namespace OpenRA.Graphics
 		public readonly float Top, Left, Bottom, Right;
 
 		public Sprite(Sheet sheet, Rectangle bounds, TextureChannel channel)
-			: this(sheet, bounds, float2.Zero, channel, BlendMode.Alpha) { }
+			: this(sheet, bounds, float2.Zero, channel) { }
 
-		public Sprite(Sheet sheet, Rectangle bounds, TextureChannel channel, BlendMode blendMode)
-			: this(sheet, bounds, float2.Zero, channel, blendMode) { }
-
-		public Sprite(Sheet sheet, Rectangle bounds, float2 offset, TextureChannel channel, BlendMode blendMode)
+		public Sprite(Sheet sheet, Rectangle bounds, float2 offset, TextureChannel channel, BlendMode blendMode = BlendMode.Alpha)
 		{
 			Sheet = sheet;
 			Bounds = bounds;

OpenRA.Game/Graphics/SpriteFont.cs

@@ -19,32 +19,35 @@ namespace OpenRA.Graphics
 {
 	public class SpriteFont
 	{
-		static Library library = new Library();
-		static SheetBuilder builder;
+		static readonly Library Library = new Library();
 
 		readonly int size;
-		string name;
+		readonly SheetBuilder builder;
+		readonly Func<string, float> lineWidth;
+		readonly Face face;
+		readonly Cache<Pair<char, Color>, GlyphInfo> glyphs;
 
-		public SpriteFont(string name, int size)
+		public SpriteFont(string name, int size, SheetBuilder builder)
 		{
-			this.size = size;
-			this.name = name;
+			if (builder.Type != SheetType.BGRA)
+				throw new ArgumentException("The sheet builder must create BGRA sheets.", "builder");
 
-			face = new Face(library, name);
+			this.size = size;
+			this.builder = builder;
+
+			face = new Face(Library, name);
 			face.SetPixelSizes((uint)size, (uint)size);
 
 			glyphs = new Cache<Pair<char, Color>, GlyphInfo>(CreateGlyph, Pair<char, Color>.EqualityComparer);
 
-			// setup a SheetBuilder for our private use
-			// TODO: SheetBuilder state is leaked between mod switches
-			if (builder == null)
-				builder = new SheetBuilder(SheetType.BGRA);
+			Func<char, float> characterWidth = character => glyphs[Pair.New(character, Color.White)].Advance;
+			lineWidth = line => line.Sum(characterWidth);
 
-			PrecacheColor(Color.White);
-			PrecacheColor(Color.Red);
+			PrecacheColor(Color.White, name);
+			PrecacheColor(Color.Red, name);
 		}
 
-		void PrecacheColor(Color c)
+		void PrecacheColor(Color c, string name)
 		{
 			using (new PerfTimer("PrecacheColor {0} {1}px {2}".F(name, size, c.Name)))
 				for (var n = (char)0x20; n < (char)0x7f; n++)
@@ -91,29 +94,27 @@ namespace OpenRA.Graphics
 		public int2 Measure(string text)
 		{
 			var lines = text.Split('\n');
-			return new int2((int)Math.Ceiling(lines.Max(s => s.Sum(a => glyphs[Pair.New(a, Color.White)].Advance))), lines.Length * size);
+			return new int2((int)Math.Ceiling(lines.Max(lineWidth)), lines.Length * size);
 		}
 
-		Cache<Pair<char, Color>, GlyphInfo> glyphs;
-		Face face;
-
 		GlyphInfo CreateGlyph(Pair<char, Color> c)
 		{
 			face.LoadChar(c.First, LoadFlags.Default, LoadTarget.Normal);
 			face.Glyph.RenderGlyph(RenderMode.Normal);
 
-			var size = new Size((int)face.Glyph.Metrics.Width >> 6, (int)face.Glyph.Metrics.Height >> 6);
+			var size = new Size((int)face.Glyph.Metrics.Width, (int)face.Glyph.Metrics.Height);
 			var s = builder.Allocate(size);
 
 			var g = new GlyphInfo
 			{
 				Sprite = s,
-				Advance = (int)face.Glyph.Metrics.HorizontalAdvance / 64f,
-				Offset = { X = face.Glyph.BitmapLeft, Y = -face.Glyph.BitmapTop }
+				Advance = (float)face.Glyph.Metrics.HorizontalAdvance,
+				Offset = new int2(face.Glyph.BitmapLeft, -face.Glyph.BitmapTop)
 			};
 
 			// A new bitmap is generated each time this property is accessed, so we do need to dispose it.
 			using (var bitmap = face.Glyph.Bitmap)
+			{
 				unsafe
 				{
 					var p = (byte*)bitmap.Buffer;
@@ -123,20 +124,25 @@ namespace OpenRA.Graphics
 					for (var j = 0; j < s.Size.Y; j++)
 					{
 						for (var i = 0; i < s.Size.X; i++)
+						{
 							if (p[i] != 0)
 							{
 								var q = destStride * (j + s.Bounds.Top) + 4 * (i + s.Bounds.Left);
-								dest[q] = c.Second.B;
-								dest[q + 1] = c.Second.G;
-								dest[q + 2] = c.Second.R;
-								dest[q + 3] = p[i];
+								var pmc = Util.PremultiplyAlpha(Color.FromArgb(p[i], c.Second));
+
+								dest[q] = pmc.B;
+								dest[q + 1] = pmc.G;
+								dest[q + 2] = pmc.R;
+								dest[q + 3] = pmc.A;
 							}
+						}
 
 						p += bitmap.Pitch;
 					}
 				}
+			}
 
-			s.Sheet.CommitData();
+			s.Sheet.CommitBufferedData();
 
 			return g;
 		}

OpenRA.Game/Graphics/SpriteLoader.cs

@@ -35,13 +35,11 @@ namespace OpenRA.Graphics
 		public readonly SheetBuilder SheetBuilder;
 		readonly Cache<string, Sprite[]> sprites;
 
-		public SpriteCache(ISpriteLoader[] loaders, string[] exts, SheetBuilder sheetBuilder)
+		public SpriteCache(ISpriteLoader[] loaders, SheetBuilder sheetBuilder)
 		{
 			SheetBuilder = sheetBuilder;
 
-			// Include extension-less version
-			exts = exts.Append("").ToArray();
-			sprites = new Cache<string, Sprite[]>(filename => SpriteLoader.GetSprites(filename, exts, loaders, sheetBuilder));
+			sprites = new Cache<string, Sprite[]>(filename => SpriteLoader.GetSprites(filename, loaders, sheetBuilder));
 		}
 
 		public Sprite[] this[string filename] { get { return sprites[filename]; } }
@@ -51,11 +49,9 @@ namespace OpenRA.Graphics
 	{
 		readonly Cache<string, ISpriteFrame[]> frames;
 
-		public FrameCache(ISpriteLoader[] loaders, string[] exts)
+		public FrameCache(ISpriteLoader[] loaders)
 		{
-			// Include extension-less version
-			exts = exts.Append("").ToArray();
-			frames = new Cache<string, ISpriteFrame[]>(filename => SpriteLoader.GetFrames(filename, exts, loaders));
+			frames = new Cache<string, ISpriteFrame[]>(filename => SpriteLoader.GetFrames(filename, loaders));
 		}
 
 		public ISpriteFrame[] this[string filename] { get { return frames[filename]; } }
@@ -63,14 +59,14 @@ namespace OpenRA.Graphics
 
 	public static class SpriteLoader
 	{
-		public static Sprite[] GetSprites(string filename, string[] exts, ISpriteLoader[] loaders, SheetBuilder sheetBuilder)
+		public static Sprite[] GetSprites(string filename, ISpriteLoader[] loaders, SheetBuilder sheetBuilder)
 		{
-			return GetFrames(filename, exts, loaders).Select(a => sheetBuilder.Add(a)).ToArray();
+			return GetFrames(filename, loaders).Select(a => sheetBuilder.Add(a)).ToArray();
 		}
 
-		public static ISpriteFrame[] GetFrames(string filename, string[] exts, ISpriteLoader[] loaders)
+		public static ISpriteFrame[] GetFrames(string filename, ISpriteLoader[] loaders)
 		{
-			using (var stream = GlobalFileSystem.OpenWithExts(filename, exts))
+			using (var stream = GlobalFileSystem.Open(filename))
 			{
 				ISpriteFrame[] frames;
 				foreach (var loader in loaders)

OpenRA.Game/Graphics/SpriteRenderable.cs

@@ -0,0 +1,74 @@
+#region Copyright & License Information
+/*
+ * Copyright 2007-2015 The OpenRA Developers (see AUTHORS)
+ * This file is part of OpenRA, which is free software. It is made
+ * available to you under the terms of the GNU General Public License
+ * as published by the Free Software Foundation. For more information,
+ * see COPYING.
+ */
+#endregion
+
+using System.Collections.Generic;
+using System.Drawing;
+using System.Linq;
+
+namespace OpenRA.Graphics
+{
+	public struct SpriteRenderable : IRenderable, IFinalizedRenderable
+	{
+		public static readonly IEnumerable<IRenderable> None = new IRenderable[0].AsEnumerable();
+
+		readonly Sprite sprite;
+		readonly WPos pos;
+		readonly WVec offset;
+		readonly int zOffset;
+		readonly PaletteReference palette;
+		readonly float scale;
+		readonly bool isDecoration;
+
+		public SpriteRenderable(Sprite sprite, WPos pos, WVec offset, int zOffset, PaletteReference palette, float scale, bool isDecoration)
+		{
+			this.sprite = sprite;
+			this.pos = pos;
+			this.offset = offset;
+			this.zOffset = zOffset;
+			this.palette = palette;
+			this.scale = scale;
+			this.isDecoration = isDecoration;
+		}
+
+		public WPos Pos { get { return pos + offset; } }
+		public WVec Offset { get { return offset; } }
+		public PaletteReference Palette { get { return palette; } }
+		public int ZOffset { get { return zOffset; } }
+		public bool IsDecoration { get { return isDecoration; } }
+
+		public IRenderable WithPalette(PaletteReference newPalette) { return new SpriteRenderable(sprite, pos, offset, zOffset, newPalette, scale, isDecoration); }
+		public IRenderable WithZOffset(int newOffset) { return new SpriteRenderable(sprite, pos, offset, newOffset, palette, scale, isDecoration); }
+		public IRenderable OffsetBy(WVec vec) { return new SpriteRenderable(sprite, pos + vec, offset, zOffset, palette, scale, isDecoration); }
+		public IRenderable AsDecoration() { return new SpriteRenderable(sprite, pos, offset, zOffset, palette, scale, true); }
+
+		float2 ScreenPosition(WorldRenderer wr)
+		{
+			return wr.ScreenPxPosition(pos) + wr.ScreenPxOffset(offset) - (0.5f * scale * sprite.Size).ToInt2();
+		}
+
+		public IFinalizedRenderable PrepareRender(WorldRenderer wr) { return this; }
+		public void Render(WorldRenderer wr)
+		{
+			Game.Renderer.WorldSpriteRenderer.DrawSprite(sprite, ScreenPosition(wr), palette, sprite.Size * scale);
+		}
+
+		public void RenderDebugGeometry(WorldRenderer wr)
+		{
+			var offset = ScreenPosition(wr) + sprite.Offset;
+			Game.Renderer.WorldLineRenderer.DrawRect(offset, offset + sprite.Size, Color.Red);
+		}
+
+		public Rectangle ScreenBounds(WorldRenderer wr)
+		{
+			var offset = ScreenPosition(wr) + sprite.Offset;
+			return new Rectangle((int)offset.X, (int)offset.Y, (int)sprite.Size.X, (int)sprite.Size.Y);
+		}
+	}
+}

OpenRA.Game/Graphics/SpriteRenderer.cs

@@ -8,6 +8,7 @@
  */
 #endregion
 
+using System;
 using System.Drawing;
 
 namespace OpenRA.Graphics
@@ -49,6 +50,17 @@ namespace OpenRA.Graphics
 			}
 		}
 
+		void SetRenderStateForSprite(Sprite s)
+		{
+			renderer.CurrentBatchRenderer = this;
+
+			if (s.BlendMode != currentBlend || s.Sheet != currentSheet || nv + 4 > renderer.TempBufferSize)
+				Flush();
+
+			currentBlend = s.BlendMode;
+			currentSheet = s.Sheet;
+		}
+
 		public void DrawSprite(Sprite s, float2 location, PaletteReference pal)
 		{
 			DrawSprite(s, location, pal.TextureIndex, s.Size);
@@ -61,19 +73,7 @@ namespace OpenRA.Graphics
 
 		void DrawSprite(Sprite s, float2 location, float paletteTextureIndex, float2 size)
 		{
-			renderer.CurrentBatchRenderer = this;
-
-			if (s.Sheet != currentSheet)
-				Flush();
-
-			if (s.BlendMode != currentBlend)
-				Flush();
-
-			if (nv + 4 > renderer.TempBufferSize)
-				Flush();
-
-			currentBlend = s.BlendMode;
-			currentSheet = s.Sheet;
+			SetRenderStateForSprite(s);
 			Util.FastCreateQuad(vertices, location + s.FractionalOffset * size, s, paletteTextureIndex, nv, size);
 			nv += 4;
 		}
@@ -91,23 +91,18 @@ namespace OpenRA.Graphics
 
 		public void DrawSprite(Sprite s, float2 a, float2 b, float2 c, float2 d)
 		{
-			renderer.CurrentBatchRenderer = this;
-
-			if (s.Sheet != currentSheet)
-				Flush();
-
-			if (s.BlendMode != currentBlend)
-				Flush();
-
-			if (nv + 4 > renderer.TempBufferSize)
-				Flush();
-
-			currentSheet = s.Sheet;
-			currentBlend = s.BlendMode;
+			SetRenderStateForSprite(s);
 			Util.FastCreateQuad(vertices, a, b, c, d, s, 0, nv);
 			nv += 4;
 		}
 
+		public void DrawSprite(Sprite s, Vertex[] sourceVertices, int offset)
+		{
+			SetRenderStateForSprite(s);
+			Array.Copy(sourceVertices, offset, vertices, nv, 4);
+			nv += 4;
+		}
+
 		public void DrawVertexBuffer(IVertexBuffer<Vertex> buffer, int start, int length, PrimitiveType type, Sheet sheet)
 		{
 			shader.SetTexture("DiffuseTexture", sheet.GetTexture());

OpenRA.Game/Graphics/TargetLineRenderable.cs

@@ -16,7 +16,7 @@ using OpenRA.Traits;
 
 namespace OpenRA.Graphics
 {
-	public struct TargetLineRenderable : IRenderable
+	public struct TargetLineRenderable : IRenderable, IFinalizedRenderable
 	{
 		readonly IEnumerable<WPos> waypoints;
 		readonly Color color;
@@ -28,18 +28,16 @@ namespace OpenRA.Graphics
 		}
 
 		public WPos Pos { get { return waypoints.First(); } }
-		public float Scale { get { return 1f; } }
 		public PaletteReference Palette { get { return null; } }
 		public int ZOffset { get { return 0; } }
 		public bool IsDecoration { get { return true; } }
 
-		public IRenderable WithScale(float newScale) { return new TargetLineRenderable(waypoints, color); }
 		public IRenderable WithPalette(PaletteReference newPalette) { return new TargetLineRenderable(waypoints, color); }
 		public IRenderable WithZOffset(int newOffset) { return new TargetLineRenderable(waypoints, color); }
 		public IRenderable OffsetBy(WVec vec) { return new TargetLineRenderable(waypoints.Select(w => w + vec), color); }
 		public IRenderable AsDecoration() { return this; }
 
-		public void BeforeRender(WorldRenderer wr) { }
+		public IFinalizedRenderable PrepareRender(WorldRenderer wr) { return this; }
 		public void Render(WorldRenderer wr)
 		{
 			if (!waypoints.Any())
@@ -49,7 +47,7 @@ namespace OpenRA.Graphics
 			var a = first;
 			foreach (var b in waypoints.Skip(1).Select(pos => wr.ScreenPxPosition(pos)))
 			{
-				Game.Renderer.WorldLineRenderer.DrawLine(a, b, color, color);
+				Game.Renderer.WorldLineRenderer.DrawLine(a, b, color);
 				wr.DrawTargetMarker(color, b);
 				a = b;
 			}
@@ -58,5 +56,6 @@ namespace OpenRA.Graphics
 		}
 
 		public void RenderDebugGeometry(WorldRenderer wr) { }
+		public Rectangle ScreenBounds(WorldRenderer wr) { return Rectangle.Empty; }
 	}
 }

OpenRA.Game/Graphics/TerrainRenderer.cs

@@ -16,33 +16,70 @@ namespace OpenRA.Graphics
 	sealed class TerrainRenderer : IDisposable
 	{
 		readonly IVertexBuffer<Vertex> vertexBuffer;
-		readonly World world;
+		readonly Vertex[] updateCellVertices = new Vertex[4];
+		readonly int rowStride;
+
+		readonly WorldRenderer worldRenderer;
+		readonly Theater theater;
+		readonly CellLayer<TerrainTile> mapTiles;
 		readonly Map map;
 
+		float terrainPaletteIndex;
+
 		public TerrainRenderer(World world, WorldRenderer wr)
 		{
-			this.world = world;
-			this.map = world.Map;
+			worldRenderer = wr;
+			theater = wr.Theater;
+			map = world.Map;
+			mapTiles = map.MapTiles.Value;
 
-			var terrainPalette = wr.Palette("terrain").TextureIndex;
-			var vertices = new Vertex[4 * map.Bounds.Height * map.Bounds.Width];
+			terrainPaletteIndex = wr.Palette("terrain").TextureIndex;
+			rowStride = 4 * map.Bounds.Width;
+			vertexBuffer = Game.Renderer.Device.CreateVertexBuffer(rowStride * map.Bounds.Height);
+
+			UpdateMap();
+
+			map.MapTiles.Value.CellEntryChanged += UpdateCell;
+			map.MapHeight.Value.CellEntryChanged += UpdateCell;
+
+			wr.PaletteInvalidated += () =>
+			{
+				terrainPaletteIndex = wr.Palette("terrain").TextureIndex;
+				UpdateMap();
+			};
+		}
+
+		void GenerateTileVertices(Vertex[] vertices, int offset, CPos cell)
+		{
+			var tile = theater.TileSprite(mapTiles[cell]);
+			var pos = worldRenderer.ScreenPosition(map.CenterOfCell(cell)) + tile.Offset - 0.5f * tile.Size;
+			Util.FastCreateQuad(vertices, pos, tile, terrainPaletteIndex, offset, tile.Size);
+		}
+
+		void UpdateMap()
+		{
 			var nv = 0;
-
+			var vertices = new Vertex[rowStride * map.Bounds.Height];
 			foreach (var cell in map.Cells)
 			{
-				var tile = wr.Theater.TileSprite(map.MapTiles.Value[cell]);
-				var pos = wr.ScreenPosition(map.CenterOfCell(cell)) + tile.Offset - 0.5f * tile.Size;
-				Util.FastCreateQuad(vertices, pos, tile, terrainPalette, nv, tile.Size);
+				GenerateTileVertices(vertices, nv, cell);
 				nv += 4;
 			}
 
-			vertexBuffer = Game.Renderer.Device.CreateVertexBuffer(vertices.Length);
 			vertexBuffer.SetData(vertices, nv);
 		}
 
+		public void UpdateCell(CPos cell)
+		{
+			var uv = cell.ToMPos(map.TileShape);
+			var offset = rowStride * (uv.V - map.Bounds.Top) + 4 * (uv.U - map.Bounds.Left);
+
+			GenerateTileVertices(updateCellVertices, 0, cell);
+			vertexBuffer.SetData(updateCellVertices, offset, 4);
+		}
+
 		public void Draw(WorldRenderer wr, Viewport viewport)
 		{
-			var verticesPerRow = 4 * map.Bounds.Width;
 			var cells = viewport.VisibleCells;
 
 			// Only draw the rows that are visible.
@@ -51,10 +88,10 @@ namespace OpenRA.Graphics
 			var lastRow = cells.BottomRight.ToMPos(map).V - map.Bounds.Top + 1;
 
 			Game.Renderer.WorldSpriteRenderer.DrawVertexBuffer(
-				vertexBuffer, verticesPerRow * firstRow, verticesPerRow * (lastRow - firstRow),
+				vertexBuffer, rowStride * firstRow, rowStride * (lastRow - firstRow),
 				PrimitiveType.QuadList, wr.Theater.Sheet);
 
-			foreach (var r in world.WorldActor.TraitsImplementing<IRenderOverlay>())
+			foreach (var r in wr.World.WorldActor.TraitsImplementing<IRenderOverlay>())
 				r.Render(wr);
 		}
 

OpenRA.Game/Graphics/Theater.cs

@@ -13,14 +13,30 @@ using System.Collections.Generic;
 using System.Drawing;
 using System.Linq;
 using OpenRA.FileSystem;
+using OpenRA.Support;
 
 namespace OpenRA.Graphics
 {
+	class TheaterTemplate
+	{
+		public readonly Sprite[] Sprites;
+		public readonly int Stride;
+		public readonly int Variants;
+
+		public TheaterTemplate(Sprite[] sprites, int stride, int variants)
+		{
+			Sprites = sprites;
+			Stride = stride;
+			Variants = variants;
+		}
+	}
+
 	public sealed class Theater : IDisposable
 	{
-		readonly Dictionary<ushort, Sprite[]> templates = new Dictionary<ushort, Sprite[]>();
+		readonly Dictionary<ushort, TheaterTemplate> templates = new Dictionary<ushort, TheaterTemplate>();
 		readonly SheetBuilder sheetBuilder;
 		readonly Sprite missingTile;
+		readonly MersenneTwister random;
 		TileSet tileset;
 
 		public Theater(TileSet tileset)
@@ -37,20 +53,27 @@ namespace OpenRA.Graphics
 			};
 
 			sheetBuilder = new SheetBuilder(SheetType.Indexed, allocate);
-			templates = new Dictionary<ushort, Sprite[]>();
+			random = new MersenneTwister();
 
-			var frameCache = new FrameCache(Game.ModData.SpriteLoaders, tileset.Extensions);
+			var frameCache = new FrameCache(Game.ModData.SpriteLoaders);
 			foreach (var t in tileset.Templates)
 			{
-				var allFrames = frameCache[t.Value.Image];
-				var frames = t.Value.Frames != null ? t.Value.Frames.Select(f => allFrames[f]).ToArray() : allFrames;
-				var sprites = frames.Select(f => sheetBuilder.Add(f));
+				var variants = new List<Sprite[]>();
+
+				foreach (var i in t.Value.Images)
+				{
+					var allFrames = frameCache[i];
+					var frames = t.Value.Frames != null ? t.Value.Frames.Select(f => allFrames[f]).ToArray() : allFrames;
+					variants.Add(frames.Select(f => sheetBuilder.Add(f)).ToArray());
+				}
+
+				var allSprites = variants.SelectMany(s => s);
 
 				// Ignore the offsets baked into R8 sprites
 				if (tileset.IgnoreTileSpriteOffsets)
-					sprites = sprites.Select(s => new Sprite(s.Sheet, s.Bounds, float2.Zero, s.Channel, s.BlendMode));
+					allSprites = allSprites.Select(s => new Sprite(s.Sheet, s.Bounds, float2.Zero, s.Channel, s.BlendMode));
 
-				templates.Add(t.Value.Id, sprites.ToArray());
+				templates.Add(t.Value.Id, new TheaterTemplate(allSprites.ToArray(), variants.First().Count(), t.Value.Images.Length));
 			}
 
 			// 1x1px transparent tile
@@ -59,16 +82,17 @@ namespace OpenRA.Graphics
 			Sheet.ReleaseBuffer();
 		}
 
-		public Sprite TileSprite(TerrainTile r)
+		public Sprite TileSprite(TerrainTile r, int? variant = null)
 		{
-			Sprite[] template;
+			TheaterTemplate template;
 			if (!templates.TryGetValue(r.Type, out template))
 				return missingTile;
 
-			if (r.Index >= template.Length)
+			if (r.Index >= template.Stride)
 				return missingTile;
 
-			return template[r.Index];
+			var start = template.Variants > 1 ? variant.HasValue ? variant.Value : random.Next(template.Variants) : 0;
+			return template.Sprites[start * template.Stride + r.Index];
 		}
 
 		public Rectangle TemplateBounds(TerrainTemplateInfo template, Size tileSize, TileShape tileShape)

OpenRA.Game/Graphics/UISpriteRenderable.cs

@@ -14,7 +14,7 @@ using System.Linq;
 
 namespace OpenRA.Graphics
 {
-	public struct UISpriteRenderable : IRenderable
+	public struct UISpriteRenderable : IRenderable, IFinalizedRenderable
 	{
 		readonly Sprite sprite;
 		readonly int2 screenPos;
@@ -36,17 +36,15 @@ namespace OpenRA.Graphics
 		public WVec Offset { get { return WVec.Zero; } }
 		public bool IsDecoration { get { return true; } }
 
-		public float Scale { get { return scale; } }
 		public PaletteReference Palette { get { return palette; } }
 		public int ZOffset { get { return zOffset; } }
 
-		public IRenderable WithScale(float newScale) { return new UISpriteRenderable(sprite, screenPos, zOffset, palette, newScale); }
 		public IRenderable WithPalette(PaletteReference newPalette) { return new UISpriteRenderable(sprite, screenPos, zOffset, newPalette, scale); }
 		public IRenderable WithZOffset(int newOffset) { return this; }
 		public IRenderable OffsetBy(WVec vec) { return this; }
 		public IRenderable AsDecoration() { return this; }
 
-		public void BeforeRender(WorldRenderer wr) { }
+		public IFinalizedRenderable PrepareRender(WorldRenderer wr) { return this; }
 		public void Render(WorldRenderer wr)
 		{
 			Game.Renderer.SpriteRenderer.DrawSprite(sprite, screenPos, palette, sprite.Size * scale);
@@ -57,5 +55,11 @@ namespace OpenRA.Graphics
 			var offset = screenPos + sprite.Offset;
 			Game.Renderer.LineRenderer.DrawRect(offset, offset + sprite.Size, Color.Red);
 		}
+
+		public Rectangle ScreenBounds(WorldRenderer wr)
+		{
+			var offset = screenPos + sprite.Offset;
+			return new Rectangle((int)offset.X, (int)offset.Y, (int)sprite.Size.X, (int)sprite.Size.Y);
+		}
 	}
 }

OpenRA.Game/Graphics/Util.cs

@@ -64,18 +64,70 @@ namespace OpenRA.Graphics
 
 		public static void FastCopyIntoSprite(Sprite dest, Bitmap src)
 		{
-			var data = dest.Sheet.GetData();
-			var dataStride = dest.Sheet.Size.Width * 4;
-			var x = dest.Bounds.Left * 4;
-			var width = dest.Bounds.Width * 4;
-			var y = dest.Bounds.Top;
-			var height = dest.Bounds.Height;
+			var createdTempBitmap = false;
+			if (src.PixelFormat != PixelFormat.Format32bppArgb)
+			{
+				src = src.CloneWith32bbpArgbPixelFormat();
+				createdTempBitmap = true;
+			}
 
-			var bd = src.LockBits(src.Bounds(),
-				ImageLockMode.ReadWrite, PixelFormat.Format32bppArgb);
-			for (var row = 0; row < height; row++)
-				Marshal.Copy(IntPtr.Add(bd.Scan0, row * bd.Stride), data, (y + row) * dataStride + x, width);
-			src.UnlockBits(bd);
+			try
+			{
+				var destData = dest.Sheet.GetData();
+				var destStride = dest.Sheet.Size.Width;
+				var width = dest.Bounds.Width;
+				var height = dest.Bounds.Height;
+
+				var srcData = src.LockBits(src.Bounds(),
+					ImageLockMode.ReadWrite, PixelFormat.Format32bppArgb);
+
+				unsafe
+				{
+					var c = (int*)srcData.Scan0;
+
+					// Cast the data to an int array so we can copy the src data directly
+					fixed (byte* bd = &destData[0])
+					{
+						var data = (int*)bd;
+						var x = dest.Bounds.Left;
+						var y = dest.Bounds.Top;
+
+						for (var j = 0; j < height; j++)
+						{
+							for (var i = 0; i < width; i++)
+							{
+								var cc = Color.FromArgb(*(c + (j * srcData.Stride >> 2) + i));
+								data[(y + j) * destStride + x + i] = PremultiplyAlpha(cc).ToArgb();
+							}
+						}
+					}
+				}
+
+				src.UnlockBits(srcData);
+			}
+			finally
+			{
+				if (createdTempBitmap)
+					src.Dispose();
+			}
+		}
+
+		public static Color PremultiplyAlpha(Color c)
+		{
+			var a = c.A / 255f;
+			return Color.FromArgb(c.A, (byte)(c.R * a + 0.5f), (byte)(c.G * a + 0.5f), (byte)(c.B * a + 0.5f));
+		}
+
+		public static Color PremultipliedColorLerp(float t, Color c1, Color c2)
+		{
+			// Colors must be lerped in a non-multiplied color space
+			var a1 = 255f / c1.A;
+			var a2 = 255f / c2.A;
+			return PremultiplyAlpha(Color.FromArgb(
+				(int)(t * c2.A + (1 - t) * c1.A),
+				(int)((byte)(t * a2 * c2.R + 0.5f) + (1 - t) * (byte)(a1 * c1.R + 0.5f)),
+				(int)((byte)(t * a2 * c2.G + 0.5f) + (1 - t) * (byte)(a1 * c1.G + 0.5f)),
+				(int)((byte)(t * a2 * c2.B + 0.5f) + (1 - t) * (byte)(a1 * c1.B + 0.5f))));
 		}
 
 		public static float[] IdentityMatrix()

OpenRA.Game/Graphics/Vertex.cs

@@ -15,8 +15,11 @@ namespace OpenRA.Graphics
 	[StructLayout(LayoutKind.Sequential)]
 	public struct Vertex
 	{
+		// TODO Workaround for unused field warnings in mono 2.10
+		#pragma warning disable 414
 		float x, y, z, u, v;
 		float p, c;
+		#pragma warning restore
 
 		public Vertex(float2 xy, float u, float v, float p, float c)
 		{

OpenRA.Game/Graphics/Viewport.cs

@@ -105,9 +105,71 @@ namespace OpenRA.Graphics
 
 		public CPos ViewToWorld(int2 view)
 		{
+			var world = worldRenderer.Viewport.ViewToWorldPx(view);
+			var map = worldRenderer.World.Map;
+			var ts = Game.ModData.Manifest.TileSize;
+			var candidates = CandidateMouseoverCells(world);
+			var tileSet = worldRenderer.World.TileSet;
+
+			foreach (var uv in candidates)
+			{
+				// Coarse filter to nearby cells
+				var p = map.CenterOfCell(uv.ToCPos(map.TileShape));
+				var s = worldRenderer.ScreenPxPosition(p);
+				if (Math.Abs(s.X - world.X) <= ts.Width && Math.Abs(s.Y - world.Y) <= ts.Height)
+				{
+					var ramp = 0;
+					if (map.Contains(uv))
+					{
+						var tile = map.MapTiles.Value[uv];
+						var ti = tileSet.GetTileInfo(tile);
+						if (ti != null)
+							ramp = ti.RampType;
+					}
+
+					var corners = map.CellCorners[ramp];
+					var pos = map.CenterOfCell(uv.ToCPos(map));
+					var screen = corners.Select(c => worldRenderer.ScreenPxPosition(pos + c)).ToArray();
+
+					if (screen.PolygonContains(world))
+						return uv.ToCPos(map);
+				}
+			}
+
+			// Mouse is not directly over a cell (perhaps on a cliff)
+			// Try and find the closest cell
+			if (candidates.Any())
+			{
+				return candidates.OrderBy(uv =>
+				{
+					var p = map.CenterOfCell(uv.ToCPos(map.TileShape));
+					var s = worldRenderer.ScreenPxPosition(p);
+					var dx = Math.Abs(s.X - world.X);
+					var dy = Math.Abs(s.Y - world.Y);
+
+					return dx * dx + dy * dy;
+				}).First().ToCPos(map);
+			}
+
+			// Something is very wrong, but lets return something that isn't completely bogus and hope the caller can recover
 			return worldRenderer.World.Map.CellContaining(worldRenderer.Position(ViewToWorldPx(view)));
 		}
 
+		/// <summary> Returns an unfiltered list of all cells that could potentially contain the mouse cursor</summary>
+		IEnumerable<MPos> CandidateMouseoverCells(int2 world)
+		{
+			var map = worldRenderer.World.Map;
+			var minPos = worldRenderer.Position(world);
+
+			// Find all the cells that could potentially have been clicked
+			var a = map.CellContaining(minPos - new WVec(1024, 0, 0)).ToMPos(map.TileShape);
+			var b = map.CellContaining(minPos + new WVec(512, 512 * maxGroundHeight, 0)).ToMPos(map.TileShape);
+
+			for (var v = b.V; v >= a.V; v--)
+				for (var u = b.U; u >= a.U; u--)
+					yield return new MPos(u, v);
+		}
+
 		public int2 ViewToWorldPx(int2 view) { return (1f / Zoom * view.ToFloat2()).ToInt2() + TopLeft; }
 		public int2 WorldToViewPx(int2 world) { return (Zoom * (world - TopLeft).ToFloat2()).ToInt2(); }
 
@@ -163,16 +225,20 @@ namespace OpenRA.Graphics
 					var wtl = worldRenderer.Position(TopLeft);
 					var wbr = worldRenderer.Position(BottomRight);
 
-					// Visible rectangle in map coordinates
-					var ctl = new MPos(wtl.X / 1024, wtl.Y / 1024);
+					// Due to diamond tile staggering, we need to adjust the top-left bounds outwards by half a cell.
+					if (map.TileShape == TileShape.Diamond)
+						wtl -= new WVec(512, 512, 0);
+
+					// Visible rectangle in map coordinates.
 					var dy = map.TileShape == TileShape.Diamond ? 512 : 1024;
-					var cbr = new MPos((wbr.X + 1023) / 1024, (wbr.Y + dy - 1) / dy);
+					var ctl = new MPos(wtl.X / 1024, wtl.Y / dy);
+					var cbr = new MPos(wbr.X / 1024, wbr.Y / dy);
 
-					// Add a 1 cell cordon to prevent holes, then convert back to cell coordinates
-					var tl = map.Clamp(new MPos(ctl.U - 1, ctl.V - 1).ToCPos(map));
+					var tl = map.Clamp(ctl.ToCPos(map));
 
-					// Also need to account for height of cells in rows below the bottom
-					var br = map.Clamp(new MPos(cbr.U + 1, cbr.V + 2 + maxGroundHeight / 2).ToCPos(map));
+					// Also need to account for height of cells in rows below the bottom.
+					var heightPadding = map.TileShape == TileShape.Diamond ? 2 : 0;
+					var br = map.Clamp(new MPos(cbr.U, cbr.V + heightPadding + maxGroundHeight / 2).ToCPos(map));
 
 					cells = new CellRegion(map.TileShape, tl, br);
 					cellsDirty = false;

OpenRA.Game/Graphics/VoxelLoader.cs

@@ -86,7 +86,7 @@ namespace OpenRA.Graphics
 			var s = sheetBuilder.Allocate(new Size(su, sv));
 			Util.FastCopyIntoChannel(s, 0, colors);
 			Util.FastCopyIntoChannel(s, 1, normals);
-			s.Sheet.CommitData();
+			s.Sheet.CommitBufferedData();
 
 			var channelP = ChannelSelect[(int)s.Channel];
 			var channelC = ChannelSelect[(int)s.Channel + 1];
@@ -217,9 +217,9 @@ namespace OpenRA.Graphics
 		{
 			VxlReader vxl;
 			HvaReader hva;
-			using (var s = GlobalFileSystem.OpenWithExts(files.First, ".vxl"))
+			using (var s = GlobalFileSystem.Open(files.First + ".vxl"))
 				vxl = new VxlReader(s);
-			using (var s = GlobalFileSystem.OpenWithExts(files.Second, ".hva"))
+			using (var s = GlobalFileSystem.Open(files.Second + ".hva"))
 				hva = new HvaReader(s);
 			return new Voxel(this, vxl, hva);
 		}

OpenRA.Game/Graphics/WorldRenderer.cs

@@ -16,23 +16,6 @@ using OpenRA.Traits;
 
 namespace OpenRA.Graphics
 {
-	public class PaletteReference
-	{
-		public readonly string Name;
-		public IPalette Palette { get; internal set; }
-		readonly float index;
-		readonly HardwarePalette hardwarePalette;
-		public float TextureIndex { get { return index / hardwarePalette.Height; } }
-		public float TextureMidIndex { get { return (index + 0.5f) / hardwarePalette.Height; } }
-		public PaletteReference(string name, int index, IPalette palette, HardwarePalette hardwarePalette)
-		{
-			Name = name;
-			Palette = palette;
-			this.index = index;
-			this.hardwarePalette = hardwarePalette;
-		}
-	}
-
 	public sealed class WorldRenderer : IDisposable
 	{
 		public static readonly Func<IRenderable, int> RenderableScreenZPositionComparisonKey =
@@ -42,19 +25,27 @@ namespace OpenRA.Graphics
 		public readonly Theater Theater;
 		public Viewport Viewport { get; private set; }
 
+		public event Action PaletteInvalidated = null;
+
 		readonly HardwarePalette palette = new HardwarePalette();
 		readonly Dictionary<string, PaletteReference> palettes = new Dictionary<string, PaletteReference>();
 		readonly TerrainRenderer terrainRenderer;
 		readonly Lazy<DeveloperMode> devTrait;
+		readonly Func<string, PaletteReference> createPaletteReference;
 
 		internal WorldRenderer(World world)
 		{
 			World = world;
 			Viewport = new Viewport(this, world.Map);
 
+			createPaletteReference = CreatePaletteReference;
+
 			foreach (var pal in world.TraitDict.ActorsWithTrait<ILoadsPalettes>())
 				pal.Trait.LoadPalettes(this);
 
+			foreach (var p in world.Players)
+				UpdatePalettesForPlayer(p.InternalName, p.Color, false);
+
 			palette.Initialize();
 
 			Theater = new Theater(world.TileSet);
@@ -63,26 +54,50 @@ namespace OpenRA.Graphics
 			devTrait = Exts.Lazy(() => world.LocalPlayer != null ? world.LocalPlayer.PlayerActor.Trait<DeveloperMode>() : null);
 		}
 
+		public void UpdatePalettesForPlayer(string internalName, HSLColor color, bool replaceExisting)
+		{
+			foreach (var pal in World.WorldActor.TraitsImplementing<ILoadsPlayerPalettes>())
+				pal.LoadPlayerPalettes(this, internalName, color, replaceExisting);
+		}
+
 		PaletteReference CreatePaletteReference(string name)
 		{
 			var pal = palette.GetPalette(name);
 			return new PaletteReference(name, palette.GetPaletteIndex(name), pal, palette);
 		}
 
-		public PaletteReference Palette(string name) { return palettes.GetOrAdd(name, CreatePaletteReference); }
-		public void AddPalette(string name, ImmutablePalette pal) { palette.AddPalette(name, pal, false); }
-		public void AddPalette(string name, ImmutablePalette pal, bool allowModifiers) { palette.AddPalette(name, pal, allowModifiers); }
-		public void ReplacePalette(string name, IPalette pal) { palette.ReplacePalette(name, pal); palettes[name].Palette = pal; }
+		public PaletteReference Palette(string name) { return palettes.GetOrAdd(name, createPaletteReference); }
+		public void AddPalette(string name, ImmutablePalette pal, bool allowModifiers = false, bool allowOverwrite = false)
+		{
+			if (allowOverwrite && palette.Contains(name))
+				ReplacePalette(name, pal);
+			else
+			{
+				var oldHeight = palette.Height;
+				palette.AddPalette(name, pal, allowModifiers);
 
-		List<IRenderable> GenerateRenderables()
+				if (oldHeight != palette.Height && PaletteInvalidated != null)
+					PaletteInvalidated();
+			}
+		}
+
+		public void ReplacePalette(string name, IPalette pal)
+		{
+			palette.ReplacePalette(name, pal);
+
+			// Update cached PlayerReference if one exists
+			if (palettes.ContainsKey(name))
+				palettes[name].Palette = pal;
+		}
+
+		List<IFinalizedRenderable> GenerateRenderables()
 		{
 			var actors = World.ScreenMap.ActorsInBox(Viewport.TopLeft, Viewport.BottomRight)
-				.Append(World.WorldActor)
-				.ToList();
+				.Append(World.WorldActor);
 
 			// Include player actor for the rendered player
 			if (World.RenderPlayer != null)
-				actors.Add(World.RenderPlayer.PlayerActor);
+				actors = actors.Append(World.RenderPlayer.PlayerActor);
 
 			var worldRenderables = actors.SelectMany(a => a.Render(this));
 			if (World.OrderGenerator != null)
@@ -98,12 +113,9 @@ namespace OpenRA.Graphics
 			if (World.OrderGenerator != null)
 				effectRenderables = effectRenderables.Concat(World.OrderGenerator.RenderAfterWorld(this, World));
 
-			// Iterating via foreach copies the structs, so enumerate by index
-			var renderables = worldRenderables.Concat(effectRenderables).ToList();
-
 			Game.Renderer.WorldVoxelRenderer.BeginFrame();
-			for (var i = 0; i < renderables.Count; i++)
-				renderables[i].BeforeRender(this);
+			var renderables = worldRenderables.Concat(effectRenderables)
+				.Select(r => r.PrepareRender(this)).ToList();
 			Game.Renderer.WorldVoxelRenderer.EndFrame();
 
 			return renderables;
@@ -144,21 +156,19 @@ namespace OpenRA.Graphics
 
 			var overlayRenderables = World.Selection.Actors.Where(a => !a.Destroyed)
 				.SelectMany(a => a.TraitsImplementing<IPostRenderSelection>())
-				.SelectMany(t => t.RenderAfterWorld(this))
-				.ToList();
+				.SelectMany(t => t.RenderAfterWorld(this));
 
 			Game.Renderer.WorldVoxelRenderer.BeginFrame();
-			for (var i = 0; i < overlayRenderables.Count; i++)
-				overlayRenderables[i].BeforeRender(this);
+			var finalOverlayRenderables = overlayRenderables.Select(r => r.PrepareRender(this));
 			Game.Renderer.WorldVoxelRenderer.EndFrame();
 
 			// HACK: Keep old grouping behaviour
-			foreach (var g in overlayRenderables.GroupBy(prs => prs.GetType()))
+			foreach (var g in finalOverlayRenderables.GroupBy(prs => prs.GetType()))
 				foreach (var r in g)
 					r.Render(this);
 
 			if (devTrait.Value != null && devTrait.Value.ShowDebugGeometry)
-				foreach (var g in overlayRenderables.GroupBy(prs => prs.GetType()))
+				foreach (var g in finalOverlayRenderables.GroupBy(prs => prs.GetType()))
 					foreach (var r in g)
 						r.RenderDebugGeometry(this);
 
@@ -192,7 +202,7 @@ namespace OpenRA.Graphics
 			{
 				var pa = pos + offset.Rotate(WRot.FromFacing(8 * i));
 				var pb = pos + offset.Rotate(WRot.FromFacing(8 * i + 6));
-				Game.Renderer.WorldLineRenderer.DrawLine(ScreenPosition(pa), ScreenPosition(pb), c, c);
+				Game.Renderer.WorldLineRenderer.DrawLine(ScreenPosition(pa), ScreenPosition(pb), c);
 			}
 		}
 
@@ -204,10 +214,10 @@ namespace OpenRA.Graphics
 			var tr = new float2(br.X, tl.Y);
 
 			var wlr = Game.Renderer.WorldLineRenderer;
-			wlr.DrawLine(location + tl, location + tr, c, c);
-			wlr.DrawLine(location + tr, location + br, c, c);
-			wlr.DrawLine(location + br, location + bl, c, c);
-			wlr.DrawLine(location + bl, location + tl, c, c);
+			wlr.DrawLine(location + tl, location + tr, c);
+			wlr.DrawLine(location + tr, location + br, c);
+			wlr.DrawLine(location + br, location + bl, c);
+			wlr.DrawLine(location + bl, location + tl, c);
 		}
 
 		public void RefreshPalette()

OpenRA.Game/Group.cs

@@ -15,8 +15,8 @@ namespace OpenRA
 {
 	public class Group
 	{
-		List<Actor> actors;
-		int id;
+		readonly Actor[] actors;
+		readonly int id;
 
 		static int nextGroup;
 
@@ -24,7 +24,7 @@ namespace OpenRA
 
 		public Group(IEnumerable<Actor> actors)
 		{
-			this.actors = actors.ToList();
+			this.actors = actors.ToArray();
 
 			foreach (var a in actors)
 				a.Group = this;

OpenRA.Game/Input/Hotkey.cs

@@ -28,7 +28,12 @@ namespace OpenRA
 
 			Keycode key;
 			if (!Enum<Keycode>.TryParse(parts[0], true, out key))
-				return false;
+			{
+				int c;
+				if (!int.TryParse(parts[0], out c))
+					return false;
+				key = (Keycode)c;
+			}
 
 			var mods = Modifiers.None;
 			if (parts.Length >= 2)

OpenRA.Game/Input/InputHandler.cs

@@ -49,4 +49,23 @@ namespace OpenRA
 			Sync.CheckSyncUnchanged(world, () => Ui.HandleInput(input));
 		}
 	}
+
+	public class MouseButtonPreference
+	{
+		public MouseButton Action
+		{
+			get
+			{
+				return Game.Settings.Game.UseClassicMouseStyle ? MouseButton.Left : MouseButton.Right;
+			}
+		}
+
+		public MouseButton Cancel
+		{
+			get
+			{
+				return Game.Settings.Game.UseClassicMouseStyle ? MouseButton.Right : MouseButton.Left;
+			}
+		}
+	}
 }

OpenRA.Game/LogProxy.cs

@@ -0,0 +1,25 @@
+#region Copyright & License Information
+/*
+ * Copyright 2007-2015 The OpenRA Developers (see AUTHORS)
+ * This file is part of OpenRA, which is free software. It is made
+ * available to you under the terms of the GNU General Public License
+ * as published by the Free Software Foundation. For more information,
+ * see COPYING.
+ */
+#endregion
+
+namespace OpenRA
+{
+	public interface ILog
+	{
+		void Write(string channel, string format, params object[] args);
+	}
+
+	public class LogProxy : ILog
+	{
+		public void Write(string channel, string format, params object[] args)
+		{
+			Log.Write(channel, format, args);
+		}
+	}
+}

OpenRA.Game/Manifest.cs

@@ -18,6 +18,18 @@ using OpenRA.Primitives;
 namespace OpenRA
 {
 	public enum TileShape { Rectangle, Diamond }
+	public interface IGlobalModData { }
+
+	public sealed class SpriteSequenceFormat : IGlobalModData
+	{
+		public readonly string Type;
+		public readonly IReadOnlyDictionary<string, MiniYaml> Metadata;
+		public SpriteSequenceFormat(MiniYaml yaml)
+		{
+			Type = yaml.Value;
+			Metadata = new ReadOnlyDictionary<string, MiniYaml>(yaml.ToDictionary());
+		}
+	}
 
 	// Describes what is to be loaded in order to run a mod
 	public class Manifest
@@ -26,14 +38,14 @@ namespace OpenRA
 		public readonly string[]
 			Folders, Rules, ServerTraits,
 			Sequences, VoxelSequences, Cursors, Chrome, Assemblies, ChromeLayout,
-			Weapons, Voices, Notifications, Music, Movies, Translations, TileSets,
+			Weapons, Voices, Notifications, Music, Translations, TileSets,
 			ChromeMetrics, MapCompatibility, Missions;
 
 		public readonly IReadOnlyDictionary<string, string> Packages;
 		public readonly IReadOnlyDictionary<string, string> MapFolders;
 		public readonly MiniYaml LoadScreen;
 		public readonly MiniYaml LobbyDefaults;
-		public readonly InstallData ContentInstaller;
+
 		public readonly Dictionary<string, Pair<string, int>> Fonts;
 		public readonly Size TileSize = new Size(24, 24);
 		public readonly TileShape TileShape = TileShape.Rectangle;
@@ -54,10 +66,19 @@ namespace OpenRA
 		[Desc("Default subcell index used if SubCellInit is absent", "0 - full cell, 1 - first sub-cell")]
 		public readonly int SubCellDefaultIndex = 3;
 
+		readonly string[] reservedModuleNames = { "Metadata", "Folders", "MapFolders", "Packages", "Rules",
+			"Sequences", "VoxelSequences", "Cursors", "Chrome", "Assemblies", "ChromeLayout", "Weapons",
+			"Voices", "Notifications", "Music", "Translations", "TileSets", "ChromeMetrics", "Missions",
+			"ServerTraits", "LoadScreen", "LobbyDefaults", "Fonts", "TileSize",
+			"TileShape", "SubCells", "SupportsMapsFrom", "SpriteFormats" };
+
+		readonly TypeDictionary modules = new TypeDictionary();
+		readonly Dictionary<string, MiniYaml> yaml;
+
 		public Manifest(string mod)
 		{
 			var path = Platform.ResolvePath(".", "mods", mod, "mod.yaml");
-			var yaml = new MiniYaml(null, MiniYaml.FromFile(path)).ToDictionary();
+			yaml = new MiniYaml(null, MiniYaml.FromFile(path)).ToDictionary();
 
 			Mod = FieldLoader.Load<ModMetadata>(yaml["Metadata"]);
 			Mod.Id = mod;
@@ -77,18 +98,18 @@ namespace OpenRA
 			Voices = YamlList(yaml, "Voices", true);
 			Notifications = YamlList(yaml, "Notifications", true);
 			Music = YamlList(yaml, "Music", true);
-			Movies = YamlList(yaml, "Movies", true);
 			Translations = YamlList(yaml, "Translations", true);
 			TileSets = YamlList(yaml, "TileSets", true);
 			ChromeMetrics = YamlList(yaml, "ChromeMetrics", true);
 			Missions = YamlList(yaml, "Missions", true);
 
 			ServerTraits = YamlList(yaml, "ServerTraits");
-			LoadScreen = yaml["LoadScreen"];
-			LobbyDefaults = yaml["LobbyDefaults"];
 
-			if (yaml.ContainsKey("ContentInstaller"))
-				ContentInstaller = FieldLoader.Load<InstallData>(yaml["ContentInstaller"]);
+			if (!yaml.TryGetValue("LoadScreen", out LoadScreen))
+				throw new InvalidDataException("`LoadScreen` section is not defined.");
+
+			if (!yaml.TryGetValue("LobbyDefaults", out LobbyDefaults))
+				throw new InvalidDataException("`LobbyDefaults` section is not defined.");
 
 			Fonts = yaml["Fonts"].ToDictionary(my =>
 				{
@@ -134,6 +155,35 @@ namespace OpenRA
 				SpriteFormats = FieldLoader.GetValue<string[]>("SpriteFormats", yaml["SpriteFormats"].Value);
 		}
 
+		public void LoadCustomData(ObjectCreator oc)
+		{
+			foreach (var kv in yaml)
+			{
+				if (reservedModuleNames.Contains(kv.Key))
+					continue;
+
+				var t = oc.FindType(kv.Key);
+				if (t == null || !typeof(IGlobalModData).IsAssignableFrom(t))
+					throw new InvalidDataException("`{0}` is not a valid mod manifest entry.".F(kv.Key));
+
+				IGlobalModData module;
+				var ctor = t.GetConstructor(new[] { typeof(MiniYaml) });
+				if (ctor != null)
+				{
+					// Class has opted-in to DIY initialization
+					module = (IGlobalModData)ctor.Invoke(new object[] { kv.Value });
+				}
+				else
+				{
+					// Automatically load the child nodes using FieldLoader
+					module = oc.CreateObject<IGlobalModData>(kv.Key);
+					FieldLoader.Load(module, kv.Value);
+				}
+
+				modules.Add(module);
+			}
+		}
+
 		static string[] YamlList(Dictionary<string, MiniYaml> yaml, string key, bool parsePaths = false)
 		{
 			if (!yaml.ContainsKey(key))
@@ -153,5 +203,19 @@ namespace OpenRA
 
 			return new ReadOnlyDictionary<string, string>(inner);
 		}
+
+		public T Get<T>() where T : IGlobalModData
+		{
+			var module = modules.GetOrDefault<T>();
+
+			// Lazily create the default values if not explicitly defined.
+			if (module == null)
+			{
+				module = (T)Game.ModData.ObjectCreator.CreateBasic(typeof(T));
+				modules.Add(module);
+			}
+
+			return module;
+		}
 	}
 }

OpenRA.Game/Map/ActorInitializer.cs

@@ -102,4 +102,14 @@ namespace OpenRA
 			return world.Players.First(x => x.InternalName == PlayerName);
 		}
 	}
+
+	// Allows maps / transformations to specify the race variant of an actor.
+	public class RaceInit : IActorInit<string>
+	{
+		[FieldFromYamlKey] public readonly string Race;
+
+		public RaceInit() { }
+		public RaceInit(string race) { Race = race; }
+		public string Value(World world) { return Race; }
+	}
 }

OpenRA.Game/Map/ActorReference.cs

@@ -15,6 +15,8 @@ using OpenRA.Primitives;
 
 namespace OpenRA
 {
+	public interface ISuppressInitExport { }
+
 	public class ActorReference : IEnumerable
 	{
 		public string Type;
@@ -46,11 +48,17 @@ namespace OpenRA
 			return info;
 		}
 
-		public MiniYaml Save()
+		public MiniYaml Save(Func<object, bool> initFilter = null)
 		{
 			var ret = new MiniYaml(Type);
 			foreach (var init in InitDict)
 			{
+				if (init is ISuppressInitExport)
+					continue;
+
+				if (initFilter != null && !initFilter(init))
+					continue;
+
 				var initName = init.GetType().Name;
 				ret.Nodes.Add(new MiniYamlNode(initName.Substring(0, initName.Length - 4), FieldSaver.Save(init)));
 			}

OpenRA.Game/Map/CellLayer.cs

@@ -45,6 +45,21 @@ namespace OpenRA
 			Array.Copy(anotherLayer.entries, entries, entries.Length);
 		}
 
+		public static CellLayer<T> CreateInstance(Func<MPos, T> initialCellValueFactory, Size size, TileShape tileShape)
+		{
+			var cellLayer = new CellLayer<T>(tileShape, size);
+			for (var v = 0; v < size.Height; v++)
+			{
+				for (var u = 0; u < size.Width; u++)
+				{
+					var mpos = new MPos(u, v);
+					cellLayer[mpos] = initialCellValueFactory(mpos);
+				}
+			}
+
+			return cellLayer;
+		}
+
 		// Resolve an array index from cell coordinates
 		int Index(CPos cell)
 		{
@@ -100,7 +115,7 @@ namespace OpenRA
 
 		public IEnumerator<T> GetEnumerator()
 		{
-			return (IEnumerator<T>)entries.GetEnumerator();
+			return ((IEnumerable<T>)entries).GetEnumerator();
 		}
 
 		IEnumerator IEnumerable.GetEnumerator()

OpenRA.Game/Map/Map.cs

@@ -9,9 +9,9 @@
 #endregion
 
 using System;
-using System.Collections;
 using System.Collections.Generic;
 using System.Drawing;
+using System.Drawing.Imaging;
 using System.IO;
 using System.Linq;
 using System.Security.Cryptography;
@@ -113,10 +113,46 @@ namespace OpenRA
 
 	public class Map
 	{
+		static readonly int[][] CellCornerHalfHeights = new int[][]
+		{
+			// Flat
+			new[] { 0, 0, 0, 0 },
+
+			// Slopes (two corners high)
+			new[] { 0, 0, 1, 1 },
+			new[] { 1, 0, 0, 1 },
+			new[] { 1, 1, 0, 0 },
+			new[] { 0, 1, 1, 0 },
+
+			// Slopes (one corner high)
+			new[] { 0, 0, 0, 1 },
+			new[] { 1, 0, 0, 0 },
+			new[] { 0, 1, 0, 0 },
+			new[] { 0, 0, 1, 0 },
+
+			// Slopes (three corners high)
+			new[] { 1, 0, 1, 1 },
+			new[] { 1, 1, 0, 1 },
+			new[] { 1, 1, 1, 0 },
+			new[] { 0, 1, 1, 1 },
+
+			// Slopes (two corners high, one corner double high)
+			new[] { 1, 0, 1, 2 },
+			new[] { 2, 1, 0, 1 },
+			new[] { 1, 2, 1, 0 },
+			new[] { 0, 1, 2, 1 },
+
+			// Slopes (two corners high, alternating)
+			new[] { 1, 0, 1, 0 },
+			new[] { 0, 1, 0, 1 },
+			new[] { 1, 0, 1, 0 },
+			new[] { 0, 1, 0, 1 }
+		};
+
 		public const int MaxTilesInCircleRange = 50;
 		public readonly TileShape TileShape;
-		[FieldLoader.Ignore]
-		public readonly WVec[] SubCellOffsets;
+
+		[FieldLoader.Ignore] public readonly WVec[] SubCellOffsets;
 		public readonly SubCell DefaultSubCell;
 		public readonly SubCell LastSubCell;
 		[FieldLoader.Ignore] public IFolder Container;
@@ -137,10 +173,15 @@ namespace OpenRA
 		public Bitmap CustomPreview;
 		public bool InvalidCustomRules { get; private set; }
 
-		public WVec OffsetOfSubCell(SubCell subCell) { return SubCellOffsets[(int)subCell]; }
+		public WVec OffsetOfSubCell(SubCell subCell)
+		{
+			if (subCell == SubCell.Invalid || subCell == SubCell.Any)
+				return WVec.Zero;
 
-		[FieldLoader.LoadUsing("LoadOptions")]
-		public MapOptions Options;
+			return SubCellOffsets[(int)subCell];
+		}
+
+		[FieldLoader.LoadUsing("LoadOptions")] public MapOptions Options;
 
 		static object LoadOptions(MiniYaml y)
 		{
@@ -152,8 +193,7 @@ namespace OpenRA
 			return options;
 		}
 
-		[FieldLoader.LoadUsing("LoadVideos")]
-		public MapVideos Videos;
+		[FieldLoader.LoadUsing("LoadVideos")] public MapVideos Videos;
 
 		static object LoadVideos(MiniYaml y)
 		{
@@ -165,16 +205,11 @@ namespace OpenRA
 			return videos;
 		}
 
-		[FieldLoader.Ignore] public Lazy<Dictionary<string, ActorReference>> Actors;
-
-		public int PlayerCount { get { return Players.Count(p => p.Value.Playable); } }
-
 		public Rectangle Bounds;
 
-		// Yaml map data
-		[FieldLoader.Ignore] public Dictionary<string, PlayerReference> Players = new Dictionary<string, PlayerReference>();
-		[FieldLoader.Ignore] public Lazy<List<SmudgeReference>> Smudges;
+		public Lazy<CPos[]> SpawnPoints;
 
+		// Yaml map data
 		[FieldLoader.Ignore] public List<MiniYamlNode> RuleDefinitions = new List<MiniYamlNode>();
 		[FieldLoader.Ignore] public List<MiniYamlNode> SequenceDefinitions = new List<MiniYamlNode>();
 		[FieldLoader.Ignore] public List<MiniYamlNode> VoxelSequenceDefinitions = new List<MiniYamlNode>();
@@ -182,6 +217,10 @@ namespace OpenRA
 		[FieldLoader.Ignore] public List<MiniYamlNode> VoiceDefinitions = new List<MiniYamlNode>();
 		[FieldLoader.Ignore] public List<MiniYamlNode> NotificationDefinitions = new List<MiniYamlNode>();
 		[FieldLoader.Ignore] public List<MiniYamlNode> TranslationDefinitions = new List<MiniYamlNode>();
+		[FieldLoader.Ignore] public List<MiniYamlNode> PlayerDefinitions = new List<MiniYamlNode>();
+
+		[FieldLoader.Ignore] public List<MiniYamlNode> ActorDefinitions = new List<MiniYamlNode>();
+		[FieldLoader.Ignore] public List<MiniYamlNode> SmudgeDefinitions = new List<MiniYamlNode>();
 
 		// Binary map data
 		[FieldLoader.Ignore] public byte TileFormat = 2;
@@ -199,6 +238,7 @@ namespace OpenRA
 		public Ruleset Rules { get { return rules != null ? rules.Value : null; } }
 		public SequenceProvider SequenceProvider { get { return Rules.Sequences[Tileset]; } }
 
+		public WVec[][] CellCorners { get; private set; }
 		[FieldLoader.Ignore] public CellRegion Cells;
 
 		public static Map FromTileset(TileSet tileset)
@@ -233,8 +273,8 @@ namespace OpenRA
 				MapResources = Exts.Lazy(() => new CellLayer<ResourceTile>(tileShape, size)),
 				MapTiles = makeMapTiles,
 				MapHeight = makeMapHeight,
-				Actors = Exts.Lazy(() => new Dictionary<string, ActorReference>()),
-				Smudges = Exts.Lazy(() => new List<SmudgeReference>())
+
+				SpawnPoints = Exts.Lazy(() => new CPos[0])
 			};
 
 			map.PostInit();
@@ -262,7 +302,7 @@ namespace OpenRA
 			AssertExists("map.yaml");
 			AssertExists("map.bin");
 
-			var yaml = new MiniYaml(null, MiniYaml.FromStream(Container.GetContent("map.yaml")));
+			var yaml = new MiniYaml(null, MiniYaml.FromStream(Container.GetContent("map.yaml"), path));
 			FieldLoader.Load(this, yaml);
 
 			// Support for formats 1-3 dropped 2011-02-11.
@@ -284,36 +324,17 @@ namespace OpenRA
 					Visibility = MapVisibility.MissionSelector;
 			}
 
-			// Load players
-			foreach (var my in nd["Players"].ToDictionary().Values)
+			SpawnPoints = Exts.Lazy(() =>
 			{
-				var player = new PlayerReference(my);
-				Players.Add(player.Name, player);
-			}
-
-			Actors = Exts.Lazy(() =>
-			{
-				var ret = new Dictionary<string, ActorReference>();
-				foreach (var kv in nd["Actors"].ToDictionary())
-					ret.Add(kv.Key, new ActorReference(kv.Value.Value, kv.Value.ToDictionary()));
-				return ret;
-			});
-
-			// Smudges
-			Smudges = Exts.Lazy(() =>
-			{
-				var ret = new List<SmudgeReference>();
-				foreach (var name in nd["Smudges"].ToDictionary().Keys)
+				var spawns = new List<CPos>();
+				foreach (var kv in ActorDefinitions.Where(d => d.Value.Value == "mpspawn"))
 				{
-					var vals = name.Split(' ');
-					var loc = vals[1].Split(',');
-					ret.Add(new SmudgeReference(vals[0], new int2(
-							Exts.ParseIntegerInvariant(loc[0]),
-							Exts.ParseIntegerInvariant(loc[1])),
-							Exts.ParseIntegerInvariant(vals[2])));
+					var s = new ActorReference(kv.Value.Value, kv.Value.ToDictionary());
+
+					spawns.Add(s.InitDict.Get<LocationInit>().Value(null));
 				}
 
-				return ret;
+				return spawns.ToArray();
 			});
 
 			RuleDefinitions = MiniYaml.NodesOrEmpty(yaml, "Rules");
@@ -323,10 +344,14 @@ namespace OpenRA
 			VoiceDefinitions = MiniYaml.NodesOrEmpty(yaml, "Voices");
 			NotificationDefinitions = MiniYaml.NodesOrEmpty(yaml, "Notifications");
 			TranslationDefinitions = MiniYaml.NodesOrEmpty(yaml, "Translations");
+			PlayerDefinitions = MiniYaml.NodesOrEmpty(yaml, "Players");
 
-			MapTiles = Exts.Lazy(() => LoadMapTiles());
-			MapResources = Exts.Lazy(() => LoadResourceTiles());
-			MapHeight = Exts.Lazy(() => LoadMapHeight());
+			ActorDefinitions = MiniYaml.NodesOrEmpty(yaml, "Actors");
+			SmudgeDefinitions = MiniYaml.NodesOrEmpty(yaml, "Smudges");
+
+			MapTiles = Exts.Lazy(LoadMapTiles);
+			MapResources = Exts.Lazy(LoadResourceTiles);
+			MapHeight = Exts.Lazy(LoadMapHeight);
 
 			TileShape = Game.ModData.Manifest.TileShape;
 			SubCellOffsets = Game.ModData.Manifest.SubCellOffsets;
@@ -374,6 +399,18 @@ namespace OpenRA
 			CustomTerrain = new CellLayer<byte>(this);
 			foreach (var uv in Cells.MapCoords)
 				CustomTerrain[uv] = byte.MaxValue;
+
+			var leftDelta = TileShape == TileShape.Diamond ? new WVec(-512, 0, 0) : new WVec(-512, -512, 0);
+			var topDelta = TileShape == TileShape.Diamond ? new WVec(0, -512, 0) : new WVec(512, -512, 0);
+			var rightDelta = TileShape == TileShape.Diamond ? new WVec(512, 0, 0) : new WVec(512, 512, 0);
+			var bottomDelta = TileShape == TileShape.Diamond ? new WVec(0, 512, 0) : new WVec(-512, 512, 0);
+			CellCorners = CellCornerHalfHeights.Select(ramp => new WVec[]
+			{
+				leftDelta + new WVec(0, 0, 512 * ramp[0]),
+				topDelta + new WVec(0, 0, 512 * ramp[1]),
+				rightDelta + new WVec(0, 0, 512 * ramp[2]),
+				bottomDelta + new WVec(0, 0, 512 * ramp[3])
+			}).ToArray();
 		}
 
 		public Ruleset PreloadRules()
@@ -381,14 +418,6 @@ namespace OpenRA
 			return rules.Value;
 		}
 
-		public CPos[] GetSpawnPoints()
-		{
-			return Actors.Value.Values
-				.Where(a => a.Type == "mpspawn")
-				.Select(a => (CPos)a.InitDict.Get<LocationInit>().Value(null))
-				.ToArray();
-		}
-
 		public void Save(string toPath)
 		{
 			MapFormat = 7;
@@ -420,13 +449,10 @@ namespace OpenRA
 
 			root.Add(new MiniYamlNode("Options", FieldSaver.SaveDifferences(Options, new MapOptions())));
 
-			root.Add(new MiniYamlNode("Players", null,
-				Players.Select(p => new MiniYamlNode("PlayerReference@{0}".F(p.Key), FieldSaver.SaveDifferences(p.Value, new PlayerReference()))).ToList()));
+			root.Add(new MiniYamlNode("Players", null, PlayerDefinitions));
 
-			root.Add(new MiniYamlNode("Actors", null,
-				Actors.Value.Select(x => new MiniYamlNode(x.Key, x.Value.Save())).ToList()));
-
-			root.Add(new MiniYamlNode("Smudges", MiniYaml.FromList<SmudgeReference>(Smudges.Value)));
+			root.Add(new MiniYamlNode("Actors", null, ActorDefinitions));
+			root.Add(new MiniYamlNode("Smudges", null, SmudgeDefinitions));
 			root.Add(new MiniYamlNode("Rules", null, RuleDefinitions));
 			root.Add(new MiniYamlNode("Sequences", null, SequenceDefinitions));
 			root.Add(new MiniYamlNode("VoxelSequences", null, VoxelSequenceDefinitions));
@@ -621,7 +647,7 @@ namespace OpenRA
 			//  - ax + by adds (a - b) * 512 + 512 to u
 			//  - ax + by adds (a + b) * 512 + 512 to v
 			var z = Contains(cell) ? 512 * MapHeight.Value[cell] : 0;
-			return new WPos(512 * (cell.X - cell.Y + 1), 512 * (cell.X + cell.Y + 1), z);
+			return new WPos(512 * (cell.X - cell.Y), 512 * (cell.X + cell.Y + 1), z);
 		}
 
 		public WPos CenterOfSubCell(CPos cell, SubCell subCell)
@@ -640,10 +666,10 @@ namespace OpenRA
 			// Convert from world position to diamond cell position:
 			// (a) Subtract (512, 512) to move the rotation center to the middle of the corner cell
 			// (b) Rotate axes by -pi/4
-			// (c) Add 512 to x (but not y) to realign the cell
+			// (c) Add (512, 512) to move back to the center of the cell
 			// (d) Divide by 1024 to find final cell coords
 			var u = (pos.Y + pos.X - 512) / 1024;
-			var v = (pos.Y - pos.X) / 1024;
+			var v = (pos.Y - pos.X - 512) / 1024;
 			return new CPos(u, v);
 		}
 
@@ -692,45 +718,6 @@ namespace OpenRA
 			}
 		}
 
-		public void MakeDefaultPlayers()
-		{
-			var firstRace = Rules.Actors["world"].Traits
-				.WithInterface<CountryInfo>().First(c => c.Selectable).Race;
-
-			if (!Players.ContainsKey("Neutral"))
-				Players.Add("Neutral", new PlayerReference
-				{
-					Name = "Neutral",
-					Race = firstRace,
-					OwnsWorld = true,
-					NonCombatant = true
-				});
-
-			var numSpawns = GetSpawnPoints().Length;
-			for (var index = 0; index < numSpawns; index++)
-			{
-				if (Players.ContainsKey("Multi{0}".F(index)))
-					continue;
-
-				var p = new PlayerReference
-				{
-					Name = "Multi{0}".F(index),
-					Race = "Random",
-					Playable = true,
-					Enemies = new[] { "Creeps" }
-				};
-				Players.Add(p.Name, p);
-			}
-
-			Players.Add("Creeps", new PlayerReference
-			{
-				Name = "Creeps",
-				Race = firstRace,
-				NonCombatant = true,
-				Enemies = Players.Where(p => p.Value.Playable).Select(p => p.Key).ToArray()
-			});
-		}
-
 		public void FixOpenAreas(Ruleset rules)
 		{
 			var r = new Random();
@@ -784,6 +771,19 @@ namespace OpenRA
 			return new MPos(x, y).ToCPos(this);
 		}
 
+		public CPos ChooseClosestEdgeCell(CPos pos)
+		{
+			var mpos = pos.ToMPos(this);
+
+			var horizontalBound = ((mpos.U - Bounds.Left) < Bounds.Width / 2) ? Bounds.Left : Bounds.Right;
+			var verticalBound = ((mpos.V - Bounds.Top) < Bounds.Height / 2) ? Bounds.Top : Bounds.Bottom;
+
+			var distX = Math.Abs(horizontalBound - mpos.U);
+			var distY = Math.Abs(verticalBound - mpos.V);
+
+			return distX < distY ? new MPos(horizontalBound, mpos.V).ToCPos(this) : new MPos(mpos.U, verticalBound).ToCPos(this);
+		}
+
 		public CPos ChooseRandomEdgeCell(MersenneTwister rand)
 		{
 			var isX = rand.Next(2) == 0;

OpenRA.Game/Map/MapCache.cs

@@ -60,6 +60,8 @@ namespace OpenRA
 				{
 					Console.WriteLine("Failed to load map: {0}", path);
 					Console.WriteLine("Details: {0}", e);
+					Log.Write("debug", "Failed to load map: {0}", path);
+					Log.Write("debug", "Details: {0}", e);
 				}
 			}
 		}
@@ -77,7 +79,7 @@ namespace OpenRA
 			foreach (var p in maps.Values)
 				p.UpdateRemoteSearch(MapStatus.Searching, null);
 
-			var url = Game.Settings.Game.MapRepository + "hash/" + string.Join(",", maps.Keys.ToArray()) + "/yaml";
+			var url = Game.Settings.Game.MapRepository + "hash/" + string.Join(",", maps.Keys) + "/yaml";
 
 			Action<DownloadDataCompletedEventArgs, bool> onInfoComplete = (i, cancelled) =>
 			{
@@ -173,34 +175,31 @@ namespace OpenRA
 						bitmap = Minimap.RenderMapPreview(modData.DefaultRules.TileSets[p.Map.Tileset], p.Map, modData.DefaultRules, true);
 					}
 
-					// Note: this is not generally thread-safe, but it works here because:
-					//   (a) This worker is the only thread writing to this sheet
-					//   (b) The main thread is the only thread reading this sheet
-					//   (c) The sheet is marked dirty after the write is completed,
-					//       which causes the main thread to copy this to the texture during
-					//       the next render cycle.
-					//   (d) Any partially written bytes from the next minimap is in an
-					//       unallocated area, and will be committed in the next cycle.
-					try
+					Game.RunAfterTick(() =>
 					{
-						p.SetMinimap(sheetBuilder.Add(bitmap));
-					}
-					finally
-					{
-						if (createdPreview)
-							bitmap.Dispose();
-					}
+						try
+						{
+							p.SetMinimap(sheetBuilder.Add(bitmap));
+						}
+						finally
+						{
+							if (createdPreview)
+								bitmap.Dispose();
+						}
+					});
 
 					// Yuck... But this helps the UI Jank when opening the map selector significantly.
 					Thread.Sleep(Environment.ProcessorCount == 1 ? 25 : 5);
 				}
 			}
 
-			sheetBuilder.Current.ReleaseBuffer();
-
 			// The buffer is not fully reclaimed until changes are written out to the texture.
 			// We will access the texture in order to force changes to be written out, allowing the buffer to be freed.
-			Game.RunAfterTick(() => sheetBuilder.Current.GetTexture());
+			Game.RunAfterTick(() =>
+			{
+				sheetBuilder.Current.ReleaseBuffer();
+				sheetBuilder.Current.GetTexture();
+			});
 			Log.Write("debug", "MapCache.LoadAsyncInternal ended");
 		}
 
@@ -221,7 +220,6 @@ namespace OpenRA
 					if (previewLoaderThread != null)
 						previewLoaderThread.Join();
 
-					sheetBuilder.Current.CreateBuffer();
 					previewLoaderThread = new Thread(LoadAsyncInternal)
 					{
 						Name = "Map Preview Loader",
@@ -248,7 +246,20 @@ namespace OpenRA
 
 		public void Dispose()
 		{
-			sheetBuilder.Dispose();
+			if (previewLoaderThread == null)
+			{
+				sheetBuilder.Dispose();
+				return;
+			}
+
+			// We need to let the loader thread exit before we can dispose our sheet builder.
+			// Ideally we should dispose our resources before returning, but we don't to block waiting on the loader thread to exit.
+			// Instead, we'll queue disposal to be run once it has exited.
+			ThreadPool.QueueUserWorkItem(_ =>
+			{
+				previewLoaderThread.Join();
+				Game.RunAfterTick(sheetBuilder.Dispose);
+			});
 		}
 	}
 }

OpenRA.Game/Map/MapPlayers.cs

@@ -0,0 +1,75 @@
+#region Copyright & License Information
+/*
+ * Copyright 2007-2015 The OpenRA Developers (see AUTHORS)
+ * This file is part of OpenRA, which is free software. It is made
+ * available to you under the terms of the GNU General Public License
+ * as published by the Free Software Foundation. For more information,
+ * see COPYING.
+ */
+#endregion
+
+using System.Collections.Generic;
+using System.Linq;
+using OpenRA.Traits;
+
+namespace OpenRA
+{
+	public class MapPlayers
+	{
+		public readonly Dictionary<string, PlayerReference> Players;
+
+		public MapPlayers() : this(new List<MiniYamlNode>()) { }
+
+		public MapPlayers(IEnumerable<MiniYamlNode> playerDefinitions)
+		{
+			Players = playerDefinitions.Select(pr => new PlayerReference(new MiniYaml(pr.Key, pr.Value.Nodes)))
+				.ToDictionary(player => player.Name);
+		}
+
+		public MapPlayers(Ruleset rules, int playerCount)
+		{
+			var firstRace = rules.Actors["world"].Traits
+				.WithInterface<CountryInfo>().First(c => c.Selectable).Race;
+
+			Players = new Dictionary<string, PlayerReference>
+			{
+				{
+					"Neutral", new PlayerReference
+					{
+						Name = "Neutral",
+						Race = firstRace,
+						OwnsWorld = true,
+						NonCombatant = true
+					}
+				},
+				{
+					"Creeps", new PlayerReference
+					{
+						Name = "Creeps",
+						Race = firstRace,
+						NonCombatant = true,
+						Enemies = Exts.MakeArray(playerCount, i => "Multi{0}".F(i))
+					}
+				}
+			};
+
+			for (var index = 0; index < playerCount; index++)
+			{
+				var p = new PlayerReference
+				{
+					Name = "Multi{0}".F(index),
+					Race = "Random",
+					Playable = true,
+					Enemies = new[] { "Creeps" }
+				};
+				Players.Add(p.Name, p);
+			}
+		}
+
+		public List<MiniYamlNode> ToMiniYaml()
+		{
+			return Players.Select(p => new MiniYamlNode("PlayerReference@{0}".F(p.Key),
+				FieldSaver.SaveDifferences(p.Value, new PlayerReference()))).ToList();
+		}
+	}
+}

OpenRA.Game/Map/MapPreview.cs

@@ -13,6 +13,7 @@ using System.Collections.Generic;
 using System.ComponentModel;
 using System.Diagnostics.CodeAnalysis;
 using System.Drawing;
+using System.Drawing.Imaging;
 using System.IO;
 using System.Linq;
 using System.Net;
@@ -29,9 +30,15 @@ namespace OpenRA
 	// Used for verifying map availability in the lobby
 	public enum MapRuleStatus { Unknown, Cached, Invalid }
 
-	[SuppressMessage("StyleCop.CSharp.NamingRules", "SA1307:AccessibleFieldsMustBeginWithUpperCaseLetter", Justification = "Fields names must match the with the remote API.")]
-	[SuppressMessage("StyleCop.CSharp.NamingRules", "SA1304:NonPrivateReadonlyFieldsMustBeginWithUpperCaseLetter", Justification = "Fields names must match the with the remote API.")]
-	[SuppressMessage("StyleCop.CSharp.NamingRules", "SA1310:FieldNamesMustNotContainUnderscore", Justification = "Fields names must match the with the remote API.")]
+	[SuppressMessage("StyleCop.CSharp.NamingRules",
+		"SA1307:AccessibleFieldsMustBeginWithUpperCaseLetter",
+		Justification = "Fields names must match the with the remote API.")]
+	[SuppressMessage("StyleCop.CSharp.NamingRules",
+		"SA1304:NonPrivateReadonlyFieldsMustBeginWithUpperCaseLetter",
+		Justification = "Fields names must match the with the remote API.")]
+	[SuppressMessage("StyleCop.CSharp.NamingRules",
+		"SA1310:FieldNamesMustNotContainUnderscore",
+		Justification = "Fields names must match the with the remote API.")]
 	public class RemoteMapData
 	{
 		public readonly string title;
@@ -46,7 +53,7 @@ namespace OpenRA
 
 	public class MapPreview
 	{
-		static readonly List<CPos> NoSpawns = new List<CPos>();
+		static readonly CPos[] NoSpawns = new CPos[] { };
 		MapCache cache;
 
 		public readonly string Uid;
@@ -54,12 +61,13 @@ namespace OpenRA
 		public string Type { get; private set; }
 		public string Author { get; private set; }
 		public int PlayerCount { get; private set; }
-		public List<CPos> SpawnPoints { get; private set; }
+		public CPos[] SpawnPoints { get; private set; }
 		public Rectangle Bounds { get; private set; }
 		public Bitmap CustomPreview { get; private set; }
 		public Map Map { get; private set; }
 		public MapStatus Status { get; private set; }
 		public MapClassification Class { get; private set; }
+		public bool SuitableForInitialMap { get; private set; }
 
 		public MapRuleStatus RuleStatus { get; private set; }
 
@@ -110,12 +118,36 @@ namespace OpenRA
 			Type = m.Type;
 			Type = m.Type;
 			Author = m.Author;
-			PlayerCount = m.Players.Count(x => x.Value.Playable);
 			Bounds = m.Bounds;
-			SpawnPoints = m.GetSpawnPoints().ToList();
+			SpawnPoints = m.SpawnPoints.Value;
 			CustomPreview = m.CustomPreview;
 			Status = MapStatus.Available;
 			Class = classification;
+
+			var players = new MapPlayers(m.PlayerDefinitions).Players;
+			PlayerCount = players.Count(x => x.Value.Playable);
+
+			SuitableForInitialMap = EvaluateUserFriendliness(players);
+		}
+
+		bool EvaluateUserFriendliness(Dictionary<string, PlayerReference> players)
+		{
+			if (Status != MapStatus.Available || !Map.Visibility.HasFlag(MapVisibility.Lobby))
+				return false;
+
+			// Other map types may have confusing settings or gameplay
+			if (Type != "Conquest")
+				return false;
+
+			// Maps with bots disabled confuse new players
+			if (players.Any(x => !x.Value.AllowBots))
+				return false;
+
+			// Large maps expose unfortunate performance problems
+			if (Bounds.Width > 128 || Bounds.Height > 128)
+				return false;
+
+			return true;
 		}
 
 		public void UpdateRemoteSearch(MapStatus status, MiniYaml yaml)
@@ -143,9 +175,9 @@ namespace OpenRA
 						PlayerCount = r.players;
 						Bounds = r.bounds;
 
-						var spawns = new List<CPos>();
+						var spawns = new CPos[r.spawnpoints.Length / 2];
 						for (var j = 0; j < r.spawnpoints.Length; j += 2)
-							spawns.Add(new CPos(r.spawnpoints[j], r.spawnpoints[j + 1]));
+							spawns[j / 2] = new CPos(r.spawnpoints[j], r.spawnpoints[j + 1]);
 						SpawnPoints = spawns;
 
 						CustomPreview = new Bitmap(new MemoryStream(Convert.FromBase64String(r.minimap)));
@@ -242,5 +274,11 @@ namespace OpenRA
 			Map.PreloadRules();
 			RuleStatus = Map.InvalidCustomRules ? MapRuleStatus.Invalid : MapRuleStatus.Cached;
 		}
+
+		public void Invalidate()
+		{
+			Status = MapStatus.Unavailable;
+			RuleStatus = MapRuleStatus.Unknown;
+		}
 	}
 }

OpenRA.Game/Map/SmudgeReference.cs

@@ -1,31 +0,0 @@
-#region Copyright & License Information
-/*
- * Copyright 2007-2015 The OpenRA Developers (see AUTHORS)
- * This file is part of OpenRA, which is free software. It is made
- * available to you under the terms of the GNU General Public License
- * as published by the Free Software Foundation. For more information,
- * see COPYING.
- */
-#endregion
-
-namespace OpenRA
-{
-	public struct SmudgeReference
-	{
-		public readonly string Type;
-		public readonly int2 Location;
-		public readonly int Depth;
-
-		public SmudgeReference(string type, int2 location, int depth)
-		{
-			Type = type;
-			Location = location;
-			Depth = depth;
-		}
-
-		public override string ToString()
-		{
-			return "{0} {1},{2} {3}".F(Type, Location.X, Location.Y, Depth);
-		}
-	}
-}

OpenRA.Game/Map/TileSet.cs

@@ -12,6 +12,7 @@ using System.Collections.Generic;
 using System.Drawing;
 using System.IO;
 using System.Linq;
+using OpenRA.Primitives;
 
 namespace OpenRA
 {
@@ -24,11 +25,29 @@ namespace OpenRA
 		public readonly Color LeftColor;
 		public readonly Color RightColor;
 
-		public MiniYaml Save() { return FieldSaver.Save(this); }
+		public MiniYaml Save(TileSet tileSet)
+		{
+			var root = new List<MiniYamlNode>();
+			if (Height != 0)
+				root.Add(FieldSaver.SaveField(this, "Height"));
+
+			if (RampType != 0)
+				root.Add(FieldSaver.SaveField(this, "RampType"));
+
+			if (LeftColor != tileSet.TerrainInfo[TerrainType].Color)
+				root.Add(FieldSaver.SaveField(this, "LeftColor"));
+
+			if (RightColor != tileSet.TerrainInfo[TerrainType].Color)
+				root.Add(FieldSaver.SaveField(this, "RightColor"));
+
+			return new MiniYaml(tileSet.TerrainInfo[TerrainType].Type, root);
+		}
 	}
 
 	public class TerrainTypeInfo
 	{
+		static readonly TerrainTypeInfo Default = new TerrainTypeInfo();
+
 		public readonly string Type;
 		public readonly string[] TargetTypes = { };
 		public readonly string[] AcceptsSmudgeType = { };
@@ -36,18 +55,20 @@ namespace OpenRA
 		public readonly Color Color;
 		public readonly string CustomCursor;
 
-		public TerrainTypeInfo() { }
+		// Private default ctor for serialization comparison
+		TerrainTypeInfo() { }
+
 		public TerrainTypeInfo(MiniYaml my) { FieldLoader.Load(this, my); }
 
-		public MiniYaml Save() { return FieldSaver.Save(this); }
+		public MiniYaml Save() { return FieldSaver.SaveDifferences(this, Default); }
 	}
 
 	public class TerrainTemplateInfo
 	{
-		static readonly string[] Fields = { "Id", "Image", "Frames", "Size", "PickAny", "Category" };
+		static readonly TerrainTemplateInfo Default = new TerrainTemplateInfo(0, new string[] { null }, int2.Zero, null);
 
 		public readonly ushort Id;
-		public readonly string Image;
+		public readonly string[] Images;
 		public readonly int[] Frames;
 		public readonly int2 Size;
 		public readonly bool PickAny;
@@ -55,10 +76,10 @@ namespace OpenRA
 
 		TerrainTileInfo[] tileInfo;
 
-		public TerrainTemplateInfo(ushort id, string image, int2 size, byte[] tiles)
+		public TerrainTemplateInfo(ushort id, string[] images, int2 size, byte[] tiles)
 		{
 			this.Id = id;
-			this.Image = image;
+			this.Images = images;
 			this.Size = size;
 		}
 
@@ -129,45 +150,44 @@ namespace OpenRA
 
 		public MiniYaml Save(TileSet tileSet)
 		{
-			var root = new List<MiniYamlNode>();
-			foreach (var field in Fields)
-			{
-				var f = this.GetType().GetField(field);
-				if (f.GetValue(this) == null)
-					continue;
+			var root = FieldSaver.SaveDifferences(this, Default);
 
-				root.Add(new MiniYamlNode(field, FieldSaver.FormatValue(this, f)));
-			}
+			var tileYaml = tileInfo
+				.Select((ti, i) => Pair.New(i.ToString(), ti))
+				.Where(t => t.Second != null)
+				.Select(t => new MiniYamlNode(t.First, t.Second.Save(tileSet)))
+				.ToList();
 
-			root.Add(new MiniYamlNode("Tiles", null,
-				tileInfo.Select((terrainTypeIndex, templateIndex) => new MiniYamlNode(templateIndex.ToString(), terrainTypeIndex.Save())).ToList()));
+			root.Nodes.Add(new MiniYamlNode("Tiles", null, tileYaml));
 
-			return new MiniYaml(null, root);
+			return root;
 		}
 	}
 
 	public class TileSet
 	{
-		static readonly string[] Fields = { "Name", "Id", "SheetSize", "Palette", "PlayerPalette", "Extensions", "WaterPaletteRotationBase", "EditorTemplateOrder", "IgnoreTileSpriteOffsets", "MaximumHeight" };
-
 		public readonly string Name;
 		public readonly string Id;
 		public readonly int SheetSize = 512;
 		public readonly string Palette;
 		public readonly string PlayerPalette;
-		public readonly string[] Extensions;
 		public readonly int WaterPaletteRotationBase = 0x60;
 		public readonly byte MaxGroundHeight = 0;
 		public readonly Color[] HeightDebugColors = new[] { Color.Red };
 		public readonly string[] EditorTemplateOrder;
 		public readonly bool IgnoreTileSpriteOffsets;
 
+		[FieldLoader.Ignore]
 		public readonly Dictionary<ushort, TerrainTemplateInfo> Templates = new Dictionary<ushort, TerrainTemplateInfo>();
 
+		[FieldLoader.Ignore]
 		public readonly TerrainTypeInfo[] TerrainInfo;
 		readonly Dictionary<string, byte> terrainIndexByType = new Dictionary<string, byte>();
 		readonly byte defaultWalkableTerrainIndex;
 
+		// Private default ctor for serialization comparison
+		TileSet() { }
+
 		public TileSet(ModData modData, string filepath)
 		{
 			var yaml = MiniYaml.DictFromFile(filepath);
@@ -201,12 +221,11 @@ namespace OpenRA
 				.Select(y => new TerrainTemplateInfo(this, y)).ToDictionary(t => t.Id);
 		}
 
-		public TileSet(string name, string id, string palette, string[] extensions, TerrainTypeInfo[] terrainInfo)
+		public TileSet(string name, string id, string palette, TerrainTypeInfo[] terrainInfo)
 		{
 			Name = name;
 			Id = id;
 			Palette = palette;
-			Extensions = extensions;
 			TerrainInfo = terrainInfo;
 
 			if (TerrainInfo.Length >= byte.MaxValue)
@@ -245,7 +264,9 @@ namespace OpenRA
 
 		public byte GetTerrainIndex(TerrainTile r)
 		{
-			var tpl = Templates[r.Type];
+			TerrainTemplateInfo tpl;
+			if (!Templates.TryGetValue(r.Type, out tpl))
+				return defaultWalkableTerrainIndex;
 
 			if (tpl.Contains(r.Index))
 			{
@@ -259,25 +280,17 @@ namespace OpenRA
 
 		public TerrainTileInfo GetTileInfo(TerrainTile r)
 		{
-			var tpl = Templates[r.Type];
+			TerrainTemplateInfo tpl;
+			if (!Templates.TryGetValue(r.Type, out tpl))
+				return null;
+
 			return tpl.Contains(r.Index) ? tpl[r.Index] : null;
 		}
 
 		public void Save(string filepath)
 		{
 			var root = new List<MiniYamlNode>();
-			var gen = new List<MiniYamlNode>();
-
-			foreach (var field in Fields)
-			{
-				var f = this.GetType().GetField(field);
-				if (f.GetValue(this) == null)
-					continue;
-
-				gen.Add(new MiniYamlNode(field, FieldSaver.FormatValue(this, f)));
-			}
-
-			root.Add(new MiniYamlNode("General", null, gen));
+			root.Add(new MiniYamlNode("General", FieldSaver.SaveDifferences(this, new TileSet())));
 
 			root.Add(new MiniYamlNode("Terrain", null,
 				TerrainInfo.Select(t => new MiniYamlNode("TerrainType@{0}".F(t.Type), t.Save())).ToList()));

OpenRA.Game/MiniYaml.cs

@@ -83,9 +83,9 @@ namespace OpenRA
 
 	public class MiniYaml
 	{
+		const int SpacesPerLevel = 4;
 		static readonly Func<string, string> StringIdentity = s => s;
 		static readonly Func<MiniYaml, MiniYaml> MiniYamlIdentity = my => my;
-
 		public string Value;
 		public List<MiniYamlNode> Nodes;
 
@@ -154,13 +154,45 @@ namespace OpenRA
 			{
 				var line = ll;
 				++lineNo;
+
 				var commentIndex = line.IndexOf('#');
 				if (commentIndex != -1)
 					line = line.Substring(0, commentIndex).TrimEnd(' ', '\t');
-				var t = line.TrimStart(' ', '\t');
+				if (line.Length == 0)
+					continue;
+				var cp = 0;
+				var level = 0;
+				var spaces = 0;
+				var textStart = false;
+				var c = line[cp];
+				while (!(c == '\n' || c == '\r') && cp < line.Length && !textStart)
+				{
+					c = line[cp];
+					switch (c)
+					{
+					    case ' ':
+							spaces++;
+							if (spaces >= SpacesPerLevel)
+							{
+								spaces = 0;
+								level++;
+							}
+
+							cp++;
+							break;
+						case '\t':
+							level++;
+							cp++;
+							break;
+						default:
+							textStart = true;
+							break;
+					}
+				}
+
+				var t = line.Substring(cp);
 				if (t.Length == 0)
 					continue;
-				var level = line.Length - t.Length;
 				var location = new MiniYamlNode.SourceLocation { Filename = filename, Line = lineNo };
 
 				if (levels.Count <= level)
@@ -211,28 +243,28 @@ namespace OpenRA
 			return FromLines(File.ReadAllLines(path), path);
 		}
 
-		public static List<MiniYamlNode> FromStream(Stream s)
+		public static List<MiniYamlNode> FromStream(Stream s, string fileName = "<no filename available>")
 		{
 			using (var reader = new StreamReader(s))
-				return FromString(reader.ReadToEnd());
+				return FromString(reader.ReadToEnd(), fileName);
 		}
 
-		public static List<MiniYamlNode> FromString(string text)
+		public static List<MiniYamlNode> FromString(string text, string fileName = "<no filename available>")
 		{
-			return FromLines(text.Split(new[] { "\r\n", "\n" }, StringSplitOptions.RemoveEmptyEntries), "<no filename available>");
-		}
-
-		public static List<MiniYamlNode> MergeLiberal(List<MiniYamlNode> a, List<MiniYamlNode> b)
-		{
-			return Merge(a, b, false);
+			return FromLines(text.Split(new[] { "\r\n", "\n" }, StringSplitOptions.RemoveEmptyEntries), fileName);
 		}
 
 		public static List<MiniYamlNode> MergeStrict(List<MiniYamlNode> a, List<MiniYamlNode> b)
+		{
+			return Merge(a, b, false);
+		}
+
+		public static List<MiniYamlNode> MergeLiberal(List<MiniYamlNode> a, List<MiniYamlNode> b)
 		{
 			return Merge(a, b, true);
 		}
 
-		static List<MiniYamlNode> Merge(List<MiniYamlNode> a, List<MiniYamlNode> b, bool throwErrors)
+		static List<MiniYamlNode> Merge(List<MiniYamlNode> a, List<MiniYamlNode> b, bool allowUnresolvedRemoves = false)
 		{
 			if (a.Count == 0)
 				return b;
@@ -243,10 +275,11 @@ namespace OpenRA
 
 			var dictA = a.ToDictionaryWithConflictLog(x => x.Key, "MiniYaml.Merge", null, x => "{0} (at {1})".F(x.Key, x.Location));
 			var dictB = b.ToDictionaryWithConflictLog(x => x.Key, "MiniYaml.Merge", null, x => "{0} (at {1})".F(x.Key, x.Location));
-			var keys = dictA.Keys.Union(dictB.Keys).ToList();
+			var allKeys = dictA.Keys.Union(dictB.Keys);
 
-			var noInherit = keys.Where(x => x.Length > 0 && x[0] == '-')
-				.ToDictionary(x => x.Substring(1), x => false);
+			var keys = allKeys.Where(x => x.Length == 0 || x[0] != '-').ToList();
+			var removeKeys = allKeys.Where(x => x.Length > 0 && x[0] == '-')
+				.Select(k => k.Substring(1)).ToHashSet();
 
 			foreach (var key in keys)
 			{
@@ -254,47 +287,55 @@ namespace OpenRA
 				dictA.TryGetValue(key, out aa);
 				dictB.TryGetValue(key, out bb);
 
-				if (noInherit.ContainsKey(key))
-				{
-					if (!throwErrors)
-						if (aa != null)
-							ret.Add(aa);
-
-					noInherit[key] = true;
-				}
+				if (removeKeys.Contains(key))
+					removeKeys.Remove(key);
 				else
 				{
 					var loc = aa == null ? default(MiniYamlNode.SourceLocation) : aa.Location;
-					var merged = (aa == null || bb == null) ? aa ?? bb : new MiniYamlNode(key, Merge(aa.Value, bb.Value, throwErrors), loc);
+					var merged = (aa == null || bb == null) ? aa ?? bb : new MiniYamlNode(key, Merge(aa.Value, bb.Value, allowUnresolvedRemoves), loc);
 					ret.Add(merged);
 				}
 			}
 
-			if (throwErrors && noInherit.ContainsValue(false))
-				throw new YamlException("Bogus yaml removals: {0}".F(
-					noInherit.Where(x => !x.Value).JoinWith(", ")));
+			if (removeKeys.Any())
+			{
+				if (allowUnresolvedRemoves)
+				{
+					// Add the removal nodes back for the next pass to deal with
+					foreach (var k in removeKeys)
+					{
+						var key = "-" + k;
+						MiniYamlNode rem;
+						if (!dictA.TryGetValue(key, out rem))
+							rem = dictB[key];
+						ret.Add(rem);
+					}
+				}
+				else
+					throw new YamlException("Bogus yaml removals: {0}".F(removeKeys.JoinWith(", ")));
+			}
 
 			return ret;
 		}
 
 		public static MiniYaml MergeLiberal(MiniYaml a, MiniYaml b)
 		{
-			return Merge(a, b, false);
+			return Merge(a, b, true);
 		}
 
 		public static MiniYaml MergeStrict(MiniYaml a, MiniYaml b)
 		{
-			return Merge(a, b, true);
+			return Merge(a, b, false);
 		}
 
-		static MiniYaml Merge(MiniYaml a, MiniYaml b, bool throwErrors)
+		static MiniYaml Merge(MiniYaml a, MiniYaml b, bool allowUnresolvedRemoves)
 		{
 			if (a == null)
 				return b;
 			if (b == null)
 				return a;
 
-			return new MiniYaml(a.Value ?? b.Value, Merge(a.Nodes, b.Nodes, throwErrors));
+			return new MiniYaml(a.Value ?? b.Value, Merge(a.Nodes, b.Nodes, allowUnresolvedRemoves));
 		}
 
 		public IEnumerable<string> ToLines(string name)

OpenRA.Game/ModData.cs

@@ -25,6 +25,7 @@ namespace OpenRA
 		public readonly WidgetLoader WidgetLoader;
 		public readonly MapCache MapCache;
 		public readonly ISpriteLoader[] SpriteLoaders;
+		public readonly ISpriteSequenceLoader SpriteSequenceLoader;
 		public readonly RulesetCache RulesetCache;
 		public ILoadScreen LoadScreen { get; private set; }
 		public VoxelLoader VoxelLoader { get; private set; }
@@ -38,6 +39,8 @@ namespace OpenRA
 			Languages = new string[0];
 			Manifest = new Manifest(mod);
 			ObjectCreator = new ObjectCreator(Manifest);
+			Manifest.LoadCustomData(ObjectCreator);
+
 			if (useLoadScreen)
 			{
 				LoadScreen = ObjectCreator.CreateObject<ILoadScreen>(Manifest.LoadScreen.Value);
@@ -50,17 +53,26 @@ namespace OpenRA
 			RulesetCache.LoadingProgress += HandleLoadingProgress;
 			MapCache = new MapCache(this);
 
-			var loaders = new List<ISpriteLoader>();
+			var spriteLoaders = new List<ISpriteLoader>();
 			foreach (var format in Manifest.SpriteFormats)
 			{
 				var loader = ObjectCreator.FindType(format + "Loader");
 				if (loader == null || !loader.GetInterfaces().Contains(typeof(ISpriteLoader)))
 					throw new InvalidOperationException("Unable to find a sprite loader for type '{0}'.".F(format));
 
-				loaders.Add((ISpriteLoader)ObjectCreator.CreateBasic(loader));
+				spriteLoaders.Add((ISpriteLoader)ObjectCreator.CreateBasic(loader));
 			}
 
-			SpriteLoaders = loaders.ToArray();
+			SpriteLoaders = spriteLoaders.ToArray();
+
+			var sequenceFormat = Manifest.Get<SpriteSequenceFormat>();
+			var sequenceLoader = ObjectCreator.FindType(sequenceFormat.Type + "Loader");
+			var ctor = sequenceLoader != null ? sequenceLoader.GetConstructor(new[] { typeof(ModData) }) : null;
+			if (sequenceLoader == null || !sequenceLoader.GetInterfaces().Contains(typeof(ISpriteSequenceLoader)) || ctor == null)
+				throw new InvalidOperationException("Unable to find a sequence loader for type '{0}'.".F(sequenceFormat.Type));
+
+			SpriteSequenceLoader = (ISpriteSequenceLoader)ctor.Invoke(new[] { this });
+			SpriteSequenceLoader.OnMissingSpriteError = s => Log.Write("debug", s);
 
 			// HACK: Mount only local folders so we have a half-working environment for the asset installer
 			GlobalFileSystem.UnmountAll();
@@ -104,7 +116,6 @@ namespace OpenRA
 			if (!Manifest.Translations.Any())
 			{
 				Languages = new string[0];
-				FieldLoader.Translations = new Dictionary<string, string>();
 				return;
 			}
 
@@ -132,7 +143,7 @@ namespace OpenRA
 					translations.Add(tkv.Key, tkv.Value);
 			}
 
-			FieldLoader.Translations = translations;
+			FieldLoader.SetTranslations(translations);
 		}
 
 		public Map PrepareMap(string uid)

OpenRA.Game/ModMetadata.cs

@@ -23,6 +23,7 @@ namespace OpenRA
 		public string Description;
 		public string Version;
 		public string Author;
+		public bool Hidden;
 
 		static Dictionary<string, ModMetadata> ValidateMods()
 		{

OpenRA.Game/Network/GeoIP.cs

@@ -0,0 +1,52 @@
+#region Copyright & License Information
+/*
+ * Copyright 2007-2015 The OpenRA Developers (see AUTHORS)
+ * This file is part of OpenRA, which is free software. It is made
+ * available to you under the terms of the GNU General Public License
+ * as published by the Free Software Foundation. For more information,
+ * see COPYING.
+ */
+#endregion
+
+using System;
+using System.IO;
+using ICSharpCode.SharpZipLib.Core;
+using ICSharpCode.SharpZipLib.GZip;
+using MaxMind.GeoIP2;
+
+namespace OpenRA.Network
+{
+	public class GeoIP
+	{
+		static DatabaseReader database;
+
+		public static void Initialize()
+		{
+			try
+			{
+				using (var fileStream = new FileStream("GeoLite2-Country.mmdb.gz", FileMode.Open, FileAccess.Read))
+					using (var gzipStream = new GZipInputStream(fileStream))
+						database = new DatabaseReader(gzipStream);
+			}
+			catch (Exception e)
+			{
+				Log.Write("geoip", "DatabaseReader failed: {0}", e);
+			}
+		}
+
+		public static string LookupCountry(string ip)
+		{
+			const string Unknown = "Unknown Location";
+
+			try
+			{
+				return database.Country(ip).Country.Name ?? Unknown;
+			}
+			catch (Exception e)
+			{
+				Log.Write("geoip", "LookupCountry failed: {0}", e);
+				return Unknown;
+			}
+		}
+	}
+}

OpenRA.Game/Network/Order.cs

@@ -195,7 +195,7 @@ namespace OpenRA
 
 			switch (OrderString)
 			{
-				/* 
+				/*
 				 * Format:
 				 * u8: orderID.
 				 * 0xFF: Full serialized order.

OpenRA.Game/Network/ReplayRecorderConnection.cs

@@ -57,7 +57,7 @@ namespace OpenRA.Network
 			var id = -1;
 			while (file == null)
 			{
-				var fullFilename = Path.Combine(dir, id < 0 ? "{0}.rep".F(filename) : "{0}-{1}.rep".F(filename, id));
+				var fullFilename = Path.Combine(dir, id < 0 ? "{0}.orarep".F(filename) : "{0}-{1}.orarep".F(filename, id));
 				id++;
 				try
 				{

OpenRA.Game/Network/Session.cs

@@ -102,7 +102,7 @@ namespace OpenRA.Network
 			public int Index;
 			public HSLColor PreferredColor; // Color that the client normally uses from settings.yaml.
 			public HSLColor Color; // Actual color that the client is using. Usually the same as PreferredColor but can be different on maps with locked colors.
-			public string Country;
+			public string Race;
 			public int SpawnPoint;
 			public string Name;
 			public string IpAddress;

OpenRA.Game/Network/UPnP.cs

@@ -44,7 +44,8 @@ namespace OpenRA.Network
 
 			if (NatDevice == null || NatDevice.GetType() != typeof(Mono.Nat.Upnp.UpnpNatDevice))
 			{
-				Log.Write("server", "No NAT devices with UPnP enabled found within {0} ms deadline. Disabling automatic port forwarding.".F(Game.Settings.Server.NatDiscoveryTimeout));
+				Log.Write("server",
+					"No NAT devices with UPnP enabled found within {0} ms deadline. Disabling automatic port forwarding.".F(Game.Settings.Server.NatDiscoveryTimeout));
 				Game.Settings.Server.NatDeviceAvailable = false;
 				Game.Settings.Server.AllowPortForward = false;
 			}

OpenRA.Game/Network/UnitOrders.cs

@@ -44,6 +44,10 @@ namespace OpenRA.Network
 							var player = world != null ? world.FindPlayerByClient(client) : null;
 							var suffix = (player != null && player.WinState == WinState.Lost) ? " (Dead)" : "";
 							suffix = client.IsObserver ? " (Spectator)" : suffix;
+
+							if (orderManager.LocalClient != null && client != orderManager.LocalClient && client.Team > 0 && client.Team == orderManager.LocalClient.Team)
+								suffix += " (Ally)";
+
 							Game.AddChatLine(client.Color.RGB, client.Name + suffix, order.TargetString);
 						}
 						else
@@ -154,7 +158,7 @@ namespace OpenRA.Network
 							Name = Game.Settings.Player.Name,
 							PreferredColor = Game.Settings.Player.Color,
 							Color = Game.Settings.Player.Color,
-							Country = "random",
+							Race = "Random",
 							SpawnPoint = 0,
 							Team = 0,
 							State = Session.ClientState.Invalid
@@ -293,8 +297,7 @@ namespace OpenRA.Network
 						if (!order.IsImmediate)
 						{
 							var self = order.Subject;
-							var health = self.TraitOrDefault<Health>();
-							if (health == null || !health.IsDead)
+							if (!self.IsDead)
 								foreach (var t in self.TraitsImplementing<IResolveOrder>())
 									t.ResolveOrder(self, order);
 						}

OpenRA.Game/ObjectCreator.cs

@@ -10,7 +10,6 @@
 
 using System;
 using System.Collections.Generic;
-using System.IO;
 using System.Linq;
 using System.Reflection;
 using OpenRA.Primitives;

OpenRA.Game/OpenRA.Game.csproj

@@ -45,38 +45,36 @@
   <ItemGroup>
     <Reference Include="System" />
     <Reference Include="System.Core" />
-    <Reference Include="System.Data" />
     <Reference Include="System.Drawing" />
-    <Reference Include="System.Xml" />
     <Reference Include="SharpFont">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\thirdparty\SharpFont.dll</HintPath>
+      <HintPath>..\thirdparty\download\SharpFont.dll</HintPath>
       <Private>False</Private>
     </Reference>
     <Reference Include="Mono.Nat">
       <SpecificVersion>False</SpecificVersion>
       <Private>False</Private>
       <Package>mono.nat</Package>
-      <HintPath>..\thirdparty\Mono.Nat.dll</HintPath>
+      <HintPath>..\thirdparty\download\Mono.Nat.dll</HintPath>
     </Reference>
     <Reference Include="Eluant">
-      <HintPath>..\thirdparty\Eluant.dll</HintPath>
+      <HintPath>..\thirdparty\download\Eluant.dll</HintPath>
       <Private>False</Private>
     </Reference>
     <Reference Include="ICSharpCode.SharpZipLib">
-      <HintPath>..\thirdparty\ICSharpCode.SharpZipLib.dll</HintPath>
+      <HintPath>..\thirdparty\download\ICSharpCode.SharpZipLib.dll</HintPath>
       <Private>False</Private>
     </Reference>
     <Reference Include="MaxMind.GeoIP2">
-      <HintPath>..\thirdparty\MaxMind.GeoIP2.dll</HintPath>
+      <HintPath>..\thirdparty\download\MaxMind.GeoIP2.dll</HintPath>
       <Private>False</Private>
     </Reference>
     <Reference Include="MaxMind.Db">
-      <HintPath>..\thirdparty\MaxMind.Db.dll</HintPath>
+      <HintPath>..\thirdparty\download\MaxMind.Db.dll</HintPath>
       <Private>False</Private>
     </Reference>
     <Reference Include="SDL2-CS">
-      <HintPath>..\thirdparty\SDL2-CS.dll</HintPath>
+      <HintPath>..\thirdparty\download\SDL2-CS.dll</HintPath>
       <Private>False</Private>
     </Reference>
   </ItemGroup>
@@ -84,10 +82,17 @@
     <Compile Include="Activities\Activity.cs" />
     <Compile Include="Activities\CallFunc.cs" />
     <Compile Include="Actor.cs" />
+    <Compile Include="CacheStorage.cs" />
+    <Compile Include="FileSystem\IdxEntry.cs" />
+    <Compile Include="LogProxy.cs" />
+    <Compile Include="FileFormats\IdxReader.cs" />
+    <Compile Include="FileSystem\BagFile.cs" />
+    <Compile Include="Map\MapPlayers.cs" />
     <Compile Include="MPos.cs" />
     <Compile Include="GameRules\Warhead.cs" />
     <Compile Include="Graphics\QuadRenderer.cs" />
     <Compile Include="Download.cs" />
+    <Compile Include="Effects\AsyncAction.cs" />
     <Compile Include="Effects\DelayedAction.cs" />
     <Compile Include="Effects\FlashTarget.cs" />
     <Compile Include="Effects\IEffect.cs" />
@@ -106,7 +111,6 @@
     <Compile Include="Graphics\MappedImage.cs" />
     <Compile Include="Graphics\Minimap.cs" />
     <Compile Include="Graphics\Renderer.cs" />
-    <Compile Include="Graphics\Sequence.cs" />
     <Compile Include="Graphics\SequenceProvider.cs" />
     <Compile Include="Graphics\Sheet.cs" />
     <Compile Include="Graphics\SheetBuilder.cs" />
@@ -124,6 +128,7 @@
     <Compile Include="Network\Connection.cs" />
     <Compile Include="Network\FrameData.cs" />
     <Compile Include="Network\GameServer.cs" />
+    <Compile Include="Network\GeoIP.cs" />
     <Compile Include="Network\Handshake.cs" />
     <Compile Include="Network\Order.cs" />
     <Compile Include="Network\OrderIO.cs" />
@@ -137,6 +142,9 @@
     <Compile Include="Orders\IOrderGenerator.cs" />
     <Compile Include="Orders\UnitOrderGenerator.cs" />
     <Compile Include="Player.cs" />
+    <Compile Include="Primitives\MergedStream.cs" />
+    <Compile Include="Primitives\SpatiallyPartitioned.cs" />
+    <Compile Include="Primitives\ConcurrentCache.cs" />
     <Compile Include="Selection.cs" />
     <Compile Include="Server\Connection.cs" />
     <Compile Include="Server\Exts.cs" />
@@ -170,38 +178,12 @@
     <Compile Include="Traits\World\ResourceType.cs" />
     <Compile Include="Traits\World\ScreenShaker.cs" />
     <Compile Include="Traits\World\Shroud.cs" />
-    <Compile Include="Widgets\BackgroundWidget.cs" />
-    <Compile Include="Widgets\ButtonWidget.cs" />
-    <Compile Include="Widgets\ChatDisplayWidget.cs" />
-    <Compile Include="Widgets\CheckboxWidget.cs" />
-    <Compile Include="Widgets\ChromeMetrics.cs" />
-    <Compile Include="Widgets\ColorBlockWidget.cs" />
-    <Compile Include="Widgets\DropDownButtonWidget.cs" />
-    <Compile Include="Widgets\GridLayout.cs" />
-    <Compile Include="Widgets\ImageWidget.cs" />
-    <Compile Include="Widgets\LabelWidget.cs" />
-    <Compile Include="Widgets\LineGraphWidget.cs" />
-    <Compile Include="Widgets\ListLayout.cs" />
-    <Compile Include="Widgets\MapPreviewWidget.cs" />
-    <Compile Include="Widgets\PasswordFieldWidget.cs" />
-    <Compile Include="Widgets\PerfGraphWidget.cs" />
-    <Compile Include="Widgets\ProgressBarWidget.cs" />
-    <Compile Include="Widgets\ScrollItemWidget.cs" />
-    <Compile Include="Widgets\ScrollPanelWidget.cs" />
-    <Compile Include="Widgets\SliderWidget.cs" />
-    <Compile Include="Widgets\TextFieldWidget.cs" />
-    <Compile Include="Widgets\VqaPlayerWidget.cs" />
-    <Compile Include="Widgets\Widget.cs" />
-    <Compile Include="Widgets\WidgetLoader.cs" />
-    <Compile Include="Widgets\WidgetUtils.cs" />
-    <Compile Include="Widgets\WorldInteractionControllerWidget.cs" />
     <Compile Include="World.cs" />
     <Compile Include="WorldUtils.cs" />
+    <Compile Include="VoiceExts.cs" />
     <Compile Include="Network\ReplayRecorderConnection.cs" />
-    <Compile Include="Widgets\TooltipContainerWidget.cs" />
     <Compile Include="Traits\DebugPauseState.cs" />
     <Compile Include="Network\UPnP.cs" />
-    <Compile Include="Widgets\ClientTooltipRegionWidget.cs" />
     <Compile Include="Graphics\Renderable.cs" />
     <Compile Include="Graphics\Voxel.cs" />
     <Compile Include="Graphics\VoxelRenderer.cs" />
@@ -209,17 +191,12 @@
     <Compile Include="Graphics\VoxelProvider.cs" />
     <Compile Include="Traits\BodyOrientation.cs" />
     <Compile Include="Graphics\VoxelAnimation.cs" />
-    <Compile Include="Widgets\ViewportControllerWidget.cs" />
     <Compile Include="Traits\Player\FrozenActorLayer.cs" />
     <Compile Include="Graphics\Theater.cs" />
     <Compile Include="Traits\Player\PlayerColorPalette.cs" />
     <Compile Include="Traits\Player\PlayerHighlightPalette.cs" />
     <Compile Include="Traits\World\ScreenMap.cs" />
     <Compile Include="Traits\World\ActorMap.cs" />
-    <Compile Include="Widgets\HotkeyEntryWidget.cs" />
-    <Compile Include="Widgets\SpriteWidget.cs" />
-    <Compile Include="Widgets\SpriteSequenceWidget.cs" />
-    <Compile Include="Widgets\RGBASpriteWidget.cs" />
     <Compile Include="Scripting\ScriptContext.cs" />
     <Compile Include="Scripting\ScriptActorInterface.cs" />
     <Compile Include="Scripting\ScriptObjectWrapper.cs" />
@@ -235,7 +212,6 @@
     <Compile Include="GameRules\RulesetCache.cs" />
     <Compile Include="Support\MersenneTwister.cs" />
     <Compile Include="GameInformation.cs" />
-    <Compile Include="Widgets\RootWidget.cs" />
     <Compile Include="Map\CellLayer.cs" />
     <Compile Include="Map\CellRegion.cs" />
     <Compile Include="Input\IInputHandler.cs" />
@@ -257,6 +233,14 @@
     <Compile Include="Graphics\HardwareCursor.cs" />
     <Compile Include="Support\PerfItem.cs" />
     <Compile Include="Support\PerfSample.cs" />
+    <Compile Include="Graphics\SpriteRenderable.cs" />
+    <Compile Include="Widgets\Widget.cs" />
+    <Compile Include="Widgets\RootWidget.cs" />
+    <Compile Include="Widgets\WidgetLoader.cs" />
+    <Compile Include="Widgets\ChromeMetrics.cs" />
+    <Compile Include="Widgets\WidgetUtils.cs" />
+    <Compile Include="Widgets\WorldInteractionControllerWidget.cs" />
+    <Compile Include="Graphics\PaletteReference.cs" />
   </ItemGroup>
   <ItemGroup>
     <Compile Include="FileSystem\D2kSoundResources.cs" />
@@ -267,12 +251,10 @@
     <Compile Include="FileSystem\ZipFile.cs" />
     <Compile Include="FileSystem\BigFile.cs" />
     <Compile Include="Map\PlayerReference.cs" />
-    <Compile Include="Map\SmudgeReference.cs" />
     <Compile Include="Map\TileReference.cs" />
     <Compile Include="Map\TileSet.cs" />
     <Compile Include="FieldLoader.cs" />
     <Compile Include="FieldSaver.cs" />
-    <Compile Include="InstallUtils.cs" />
     <Compile Include="Manifest.cs" />
     <Compile Include="Graphics\Vertex.cs" />
     <Compile Include="FileFormats\ImaAdpcmLoader.cs" />

OpenRA.Game/Orders/UnitOrderGenerator.cs

@@ -37,7 +37,7 @@ namespace OpenRA.Orders
 			var orders = world.Selection.Actors
 				.Select(a => OrderForUnit(a, target, mi))
 				.Where(o => o != null)
-				.ToArray();
+				.ToList();
 
 			var actorsInvolved = orders.Select(o => o.Actor).Distinct();
 			if (actorsInvolved.Any())
@@ -79,13 +79,27 @@ namespace OpenRA.Orders
 				target = frozen != null ? Target.FromFrozenActor(frozen) : Target.FromCell(world, xy);
 			}
 
-			var orders = world.Selection.Actors
+			var ordersWithCursor = world.Selection.Actors
 				.Select(a => OrderForUnit(a, target, mi))
-				.Where(o => o != null)
-				.ToArray();
+				.Where(o => o != null && o.Cursor != null);
 
-			var cursorName = orders.Select(o => o.Cursor).FirstOrDefault();
-			return cursorName ?? (useSelect ? "select" : "default");
+			var cursorOrder = ordersWithCursor.MaxByOrDefault(o => o.Order.OrderPriority);
+
+			return cursorOrder != null ? cursorOrder.Cursor : (useSelect ? "select" : "default");
+		}
+
+		// Used for classic mouse orders, determines whether or not action at xy is move or select
+		public static bool InputOverridesSelection(World world, int2 xy, MouseInput mi)
+		{
+			var target = Target.FromActor(world.ScreenMap.ActorsAt(xy).WithHighestSelectionPriority());
+			var underCursor = world.Selection.Actors.WithHighestSelectionPriority();
+
+			var o = OrderForUnit(underCursor, target, mi);
+
+			if (o != null && o.Order.OverrideSelection)
+				return false;
+
+			return true;
 		}
 
 		static UnitOrderResult OrderForUnit(Actor self, Target target, MouseInput mi)
@@ -96,7 +110,7 @@ namespace OpenRA.Orders
 			if (self.Destroyed || !target.IsValidFor(self))
 				return null;
 
-			if (mi.Button == MouseButton.Right)
+			if (mi.Button == Game.Settings.Game.MouseButtonPreference.Action)
 			{
 				foreach (var o in self.TraitsImplementing<IIssueOrder>()
 					.SelectMany(trait => trait.Orders