ffs, more paths

This reverts commit 911db3feb1.

.gitignore

@@ -12,20 +12,11 @@ mods/*/*.dll
 # Red Alert binary files
 mods/*/packages/*.[mM][iI][xX]
 
-# Crap generated by OpenRa
-sheet-*.png
-log.txt
-
-*.rep
-
 #binary stuff
 /*.dll
 *.pdb
 *.mdb
 *.exe
-OpenRA
-OpenRA.app
-*.vqa
 
 # backup files by various editors
 *~
@@ -33,10 +24,8 @@ OpenRA.app
 # dependency DLLs (different for every platform!)
 cg.dll
 cgGL.dll
-glfw.dll
 
 /OpenRa.Gl.dll
-settings.ini
 
 #monodevelop
 *.pidb

OpenRA.Editor/Form1.cs

@@ -36,9 +36,6 @@ namespace OpenRA.Editor
 			Rules.LoadRules(Game.modData.Manifest, new Map());
 
 			surface1.AfterChange += MakeDirty;
-			
-			string path = Directory.GetCurrentDirectory();
-			 Icon = new Icon(path + Path.DirectorySeparatorChar + "OpenRA.Editor" + Path.DirectorySeparatorChar + "OpenRA.Editor.Icon.ico");
 		}
 
 		void MakeDirty() { dirty = true; }

OpenRA.Editor/LegacyMapImporter.cs

@@ -17,6 +17,7 @@ using OpenRA;
 using OpenRA.FileFormats;
 using OpenRA.Traits;
 using System.Drawing;
+using System.Globalization;
 
 namespace OpenRA.Editor
 {
@@ -401,7 +402,7 @@ namespace OpenRA.Editor
 				{
 					new LocationInit(new int2(loc % MapSize, loc / MapSize)),
 					new OwnerInit(parts[0]),
-					new HealthInit(float.Parse(parts[2])/256),
+					new HealthInit(float.Parse(parts[2], NumberFormatInfo.InvariantInfo)/256),
 					new FacingInit((section == "INFANTRY") ? int.Parse(parts[6]) : int.Parse(parts[4])),
 					new ActorStanceInit(stance),
 				};

OpenRA.Editor/MapSelect.Designer.cs

@@ -52,11 +52,13 @@
 			this.txtTitle = new System.Windows.Forms.TextBox();
 			this.lblMapName = new System.Windows.Forms.Label();
 			this.lblMinimap = new System.Windows.Forms.Label();
+			this.pictureBox1 = new System.Windows.Forms.PictureBox();
 			((System.ComponentModel.ISupportInitialize)(this.pbMinimap)).BeginInit();
 			this.pnlBottom.SuspendLayout();
 			this.splitContainer1.Panel1.SuspendLayout();
 			this.splitContainer1.Panel2.SuspendLayout();
 			this.splitContainer1.SuspendLayout();
+			((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit();
 			this.SuspendLayout();
 			// 
 			// MapList
@@ -85,9 +87,9 @@
 			// 
 			// MapIconsList
 			// 
-			this.MapIconsList.ImageStream = ((System.Windows.Forms.ImageListStreamer)(resources.GetObject("MapIconsList.ImageStream")));
+			this.MapIconsList.ColorDepth = System.Windows.Forms.ColorDepth.Depth32Bit;
+			this.MapIconsList.ImageSize = new System.Drawing.Size(24, 24);
 			this.MapIconsList.TransparentColor = System.Drawing.Color.Transparent;
-			this.MapIconsList.Images.SetKeyName(0, "mapicon");
 			// 
 			// btnCancel
 			// 
@@ -141,6 +143,7 @@
 			// 
 			// pnlBottom
 			// 
+			this.pnlBottom.Controls.Add(this.pictureBox1);
 			this.pnlBottom.Controls.Add(this.txtPathOut);
 			this.pnlBottom.Controls.Add(this.lblPathOut);
 			this.pnlBottom.Controls.Add(this.lblPath);
@@ -301,6 +304,16 @@
 			this.lblMinimap.TabIndex = 6;
 			this.lblMinimap.Text = "Map preview:";
 			// 
+			// pictureBox1
+			// 
+			this.pictureBox1.Image = ((System.Drawing.Image)(resources.GetObject("pictureBox1.Image")));
+			this.pictureBox1.Location = new System.Drawing.Point(336, -9);
+			this.pictureBox1.Name = "pictureBox1";
+			this.pictureBox1.Size = new System.Drawing.Size(54, 35);
+			this.pictureBox1.TabIndex = 7;
+			this.pictureBox1.TabStop = false;
+			this.pictureBox1.Visible = false;
+			// 
 			// MapSelect
 			// 
 			this.AcceptButton = this.btnOk;
@@ -327,6 +340,7 @@
 			this.splitContainer1.Panel2.ResumeLayout(false);
 			this.splitContainer1.Panel2.PerformLayout();
 			this.splitContainer1.ResumeLayout(false);
+			((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit();
 			this.ResumeLayout(false);
 
         }
@@ -356,5 +370,6 @@
         public System.Windows.Forms.Label lblPathOut;
         public System.Windows.Forms.Label lblPath;
         public System.Windows.Forms.TextBox txtPathOut;
+		private System.Windows.Forms.PictureBox pictureBox1;
     }
 }

OpenRA.Editor/MapSelect.cs

@@ -1,13 +1,7 @@
 using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Data;
-using System.Drawing;
-using System.Linq;
-using System.Text;
-using OpenRA.FileFormats;
-using System.Windows.Forms;
 using System.IO;
+using System.Windows.Forms;
+using OpenRA.FileFormats;
 using OpenRA.Graphics;
 
 namespace OpenRA.Editor
@@ -19,11 +13,11 @@ namespace OpenRA.Editor
         public MapSelect()
         {
             InitializeComponent();
+			MapIconsList.Images.Add(pictureBox1.Image);
         }
 
-        private void MapSelect_Load(object sender, EventArgs e)
+        void MapSelect_Load(object sender, EventArgs e)
         {
-
             DirectoryInfo directory = new DirectoryInfo(MapFolderPath);
             DirectoryInfo[] directories = directory.GetDirectories();
             MapList.Items.Clear();
@@ -33,20 +27,14 @@ namespace OpenRA.Editor
                 ListViewItem map1 = new ListViewItem(subDirectory.Name);
                 map1.ImageIndex = 0;
                 MapList.Items.Add(map1);
-
             }
-            if (txtNew.Text == "unnamed")
-            {
-                //dumb indian code
-            }
-            else
-            {
+            
+			// hack
+			if (txtNew.Text != "unnamed")
                 MapList.Items[0].Selected = true;
-            }
-
         }
 
-        private void MapList_SelectedIndexChanged(object sender, EventArgs e)
+        void MapList_SelectedIndexChanged(object sender, EventArgs e)
         {
             if (MapList.SelectedItems.Count == 1)
             {
@@ -69,7 +57,7 @@ namespace OpenRA.Editor
             }
         }
 
-        private void txtPathOut_TextChanged(object sender, EventArgs e)
+        void txtPathOut_TextChanged(object sender, EventArgs e)
         {
             MapFolderPath = txtPathOut.Text;
         }

OpenRA.Editor/MapSelect.resx

@@ -120,73 +120,58 @@
   <metadata name="MapIconsList.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>17, 17</value>
   </metadata>
-  <data name="MapIconsList.ImageStream" mimetype="application/x-microsoft.net.object.binary.base64">
+  <assembly alias="System.Drawing" name="System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+  <data name="pictureBox1.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
-        AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj0yLjAuMC4w
-        LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
-        ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAABW
-        DgAAAk1TRnQBSQFMAwEBAAEoAQABKAEAARgBAAEYAQAE/wEhAQAI/wFCAU0BNgcAATYDAAEoAwABYAMA
-        ARgDAAEBAQABIAYAASQhAAEBAx8BLAM/AW8DSQGJAzYBWQMYASIDAQECDAADHQEqA0gBhQNCAXYDDwEU
-        AwEBAgMNARIDMwFSA0MBdwNRAacDDwEU/wAwAAEBAwMBBAM0BFQBwgFlAVMBUgH0AV4CWAHYA0oBjQMW
-        AR4DAgEDAwABAQMCAQMDGgElA00BlAEIAQkBJgH9A1ABpAM1AVcDQQFzA1MBugJDAVMB4wJTAVQBsgMA
-        AQH/ADAAAQEDDAEQA0IBdAFVAVQBUQHYAZkBiAGBAf8BoAGMAYUB/wF8AXABZQH4AzoBYQMKAQ4DCgEN
-        Ax0BKgM/AW0DVAG7ARkCGgH5AQABBQG/Af8BFwEbAUcB+QE5AUYBSwHrAQABBQFEAf8CCAFOAf0DDQER
-        /wAxAAMDAQQDHQEpA1ABpAFdAVMBUQHtAZsBiwGDAf8BnAGMAYQB/wGWAYQBdwH/AVsBWgFYAdgDMwFT
-        AzQBVANPAZ0CUwFSAdMCTAFOAfMBMAGeAbsB/wEUAXMBqwH/ARQBdQG/Af8BEAFmAbYB/wEXAY0BwgH/
-        AUgBYQFpAeEDAQEC/wAwAAEBAwkBDAMwAUwBVgJVAcMBewFqAWAB+gGoAZkBjwH/AZMBhAF3Af8BjAF3
-        AXAB/wGHAXEBbAH/A1YBvgNTAbwBTAFIAUYB5QF2AVsBUgH6AYMBbQFlAf8BUQFIAUcB/wEOAUsBpAH/
-        AQMBGgG4Af8BDQFRAZUB/wEZAZUBwAH/AUABagGBAesDMwFSAw0BEgMCAQP/ACUAAwEBAgMYASEDSwGP
-        A1EB3AGbAY4BhQH9AaEBkQGJAf8BhwFzAWsB/wGBAW4BZQH/AXUBZwFgAf8BUwFKAUMB/QFHAT4BOwH8
-        AZYBhgF5Af8BowGSAYoB/wFTAUoBUwH/AQMBGAHzAf8BEgFgAaYB/wEVAXYBlQH/AS8B/QH+Af8BBwEy
-        AZQB/wEVAXoByAH/AgABVAH/A00BlAMZASP/ACUAAwYBCAMtAUYDUwG8AWoBZQFiAfQBqgGbAZEB/wGJ
-        AXQBbQH/AYwBdwFuAf8BmgGJAYEB/wGLAXcBbwH/AXUBZQFeAf8BhgFxAWkB/wGVAYYBegH/AUEBPAFK
-        Af8BEwEfAYgB/wEKAREBrgH/ARwBegGVAf8BKgHfAeIB/wEOAVMBdwH/AQkBOQG8Af8BGQGBAaoB/wEK
-        ARIBqQH/ASABJQFSAfcDUQGg/wAlAAMQARUDQQFyA08B1gGTAYQBcgH9AZoBiQGDAf8BjwGAAXMB/wGW
-        AYYBeAH/AZ8BjQGEAf8BlgGFAXkB/wGUAYQBdwH/AZQBgwF3Af8BlwGHAYAB/wFqAV8BXAH/AWMBVwFW
-        Af8BYAFVAVMB/wFTAVcBWAH/ASIBYwGaAf8BDQFLAZ0B/wEgAY4BsAH/AUwBnAGvAf8BaAGaAa4B/wE7
-        AUsBWgH+A1ABn/8AJQADGAEiA00BlQF8AXUBbwH8AagBmAGOAf8BkQGBAXUB/wGNAXcBcAH/AZoBiQGB
-        Af8BkwGDAXYB/wGZAYgBgQH/AZwBiwGDAf8BlQGGAXgB/wGWAYYBeQH/AaABjwGHAf8BlgGFAXgB/wF2
-        AW8BbAH/AUwBbQGBAf8BHgE7AV0B/wEdAZ4BhAH/AVMBlwGpAf8BhgHFAd8B/wGIAb4B1wH/AUUBXwFi
-        AfsDQQFz/wAlAAMYASIDTQGVAZ0BjwGGAf8BmwGLAYMB/wGGAXEBagH/AYUBbwFoAf8BiAFzAWwB/wGJ
-        AXQBbAH/AZABdwFvAf8BlQGEAXcB/wGWAYUBeAH/AZ8BjwGGAf8BmQGLAYQB/wFtAYABhgH/AVYBkwGw
-        Af8BWgGmAccB/wFMAYMBpAH/AQUBFgGgAf8BYwGaAbAB/wGCAb8B2QH/AXEBrQHIAf8BXQFpAXIB3gMq
-        AUD/ACEAAwMBBAMmATgDUAGjAZoBjAGEAf8BpwGWAY4B/wGXAYYBegH/AZQBggF2Af8BlAGDAXcB/wGW
-        AYUBeAH/AZIBeQFyAf8BjwF5AXIB/wGVAYQBeAH/AY8BdgFrAf8BcAGAAYcB/wFaAZcBswH/AU8BmgHC
-        Af8BZQG1AdQB/wFlAaQBvgH/AR4BKgE1Af8BeAG6AdMB/wGAAbsB1QH/AYEBvwHaAf8BVQFWAVkBtQMP
-        ART/ACEAAwoBDQNBAXMDUgHPAasBmgGRAf8BmgGJAYIB/wGOAXgBcQH/AZEBgQF1Af8BlQGEAXcB/wGY
-        AYgBgAH/AYsBdQFuAf8BkQF6AXMB/wF4AW4BagH/AW8BrwHIAf8BWQGoAc0B/wFZAasBzAH/AVUBpgHJ
-        Af8BdQHDAeAB/wF6AcIB3wH/AYMBwAHbAf8BggHBAd0B/wFvAa4ByAH/AYsBvwHbAf8DSAGGAwUBB/8A
-        IQADHgErA1EBoAFSAVABTQHtAYMBbwFoAf8BgwFuAWcB/wGBAWwBZQH/AYEBbQFmAf8BiAFzAWsB/wGH
-        AXIBawH/AZQBhAF4Af8BhQF2AXMB/wFUAWwBgwH/AU0BhAGmAf8BZgGwAdAB/wFdAaoBywH/AWEBsQHR
-        Af8BdgG/Ad0B/wGFAcgB4wH/AYEBxAHfAf8BiAHHAeIB/wF3AbYB0QH/AW0BngG2Af8DPgFrAwIBA/8A
-        IQADOAFcA1UByAFrAlwB+AGRAYABdAH/AZgBiAGAAf8BlQGEAXgB/wGNAXcBcAH/AZUBhAF4Af8BmAGH
-        AYAB/wGTAYMBdwH/AWgBgAGLAf8BVgGQAbEB/wE3AUoBagH/AWMBqQHKAf8BYAGuAc8B/wFhAawBzAH/
-        AXYBvwHcAf8BiQHMAecB/wGDAcYB4gH/AYUBxQHgAf8BhwHDAd4B/wFIAYMBmwH/AzwBaAMEAQX/ACEA
-        A0kBiQFXAVYBVQHiAaQBkwGKAf8BrAGcAZMB/wGlAZUBjAH/AZYBhgF5Af8BkAF5AXQB/wGZAYgBgQH/
-        AaIBkQGJAf8BbgFdAVUB/wFkAZUBqwH/AWgBtQHVAf8BcgHBAd0B/wF0AbsB2wH/AV4BrAHOAf8BXwGt
-        AcwB/wF4AcMB4AH/AYgBywHmAf8BhQHGAeQB/wGDAcYB4gH/AYcBvwHdAf8BQwFVAWkB7gMbASb/ACUA
-        A08BpQFiAlgB7wGjAZMBigH/AZgBhwGAAf8BnwGOAYYB/wGdAYwBhAH/AZABeQFzAf8BiAFyAWsB/wGI
-        AXYBbwH/AWoBhQGPAf8BaAGwAdAB/wFvAbwB2gH/AWYBtgHWAf8BXwGxAdAB/wFdAa8B0AH/AXEBvQHa
-        Af8BcAG7AdoB/wGAAcQB3wH/AY8BzQHpAf8BigHJAeUB/wFbAZcBrAH9A0QBeQMAAQH/ACUAA1MBsQFs
-        Al8B8wGjAZIBigH/AZUBgwF4Af8BlAGCAXcB/wGUAYUBdwH/AYQBiwGNAf8BWwFzAYYB/wFcAYcBnQH/
-        AWEBrwHSAf8BbwG7AdoB/wF3AcEB3gH/AWwBuQHXAf8BYQGzAdIB/wFpAbkB1gH/AYABxQHhAf8BeAHC
-        Ad8B/wGAAcUB4QH/AYUBxAHhAf8BiQHGAeIB/wFSAXMBhAHzAzEBTv8AKQADUQHHAXsBcQFnAfgBqwGb
-        AZIB/wGQAYABdQH/AYQBbwFmAf8BcgGaAasB/wFiAasBzwH/AWQBsgHTAf8BbQG8AdoB/wFrAbgB1QH/
-        AXEBvgHbAf8BdgG/Ad0B/wFwAb4B2wH/AWgBuQHWAf8BgAHHAeEB/wGJAcsB5AH/AYoBzAHnAf8BjQHR
-        AewB/wGFAckB5gH/AW0BswHUAf8DTgGYAzABTAMAAQEDAAEB/wAhAAM+AWwBYgFfAV4ByQGJAYIBfAH1
-        AaQBkwGLAf8BhgGeAakB/wFnAa8B0gH/AXgBxAHgAf8BdgHCAd4B/wF2AcIB3gH/AXEBvwHbAf8BcwG8
-        AdoB/wFyAbsB2AH/AXQBuwHZAf8BdAG/Ad0B/wFhAZ0BwwH/AUEBYwGUAf8BbQGnAcgB/wGHAcQB4AH/
-        AYgBzQHpAf8BXwFxAXkB4AMsAUQDBwEJAwQBBgMAAQH/ACEAAwQBBQMZASMDNAFUA0oBiQFYAlsBwQFh
-        AXIBeQHiAW4BlwGoAfUBfQG0Ac8B/gGAAcUB4gH/AXIBvAHaAf8BcQG8AdoB/wFwAbsB2AH/AXUBvAHZ
-        Af8BjgHPAesB/wFtAa8B0gH/AU8BdQGkAf8BbAGrAc0B/wFuAa8BzwH/AY8BygHnAf8BWAFjAWYB0QMi
-        ATH/AD0AAwEBAgMJAQwDGgElA0IBdgFSAVwBZQHqAYEBxAHgAf4BigHHAeQB/wF5AcAB3QH/AYoBxgHi
-        Af8BlgHUAe4B/wF5AbgB1wH/AWEBoQHIAf8BaQGmAcwB/wFZAZIBvwH/AX8BwwHdAf4CRgFHAYEDAwEE
-        /wBJAAMCAQMDEAEWAzIBUANKAY0DUAGdA1IBoQFmAXUBewHgAXIBrwHFAf0BYAGXAb4B/wFgAZQBwAH/
-        AW8BqAHOAf8BQAF5AaoB/wM1AVYDAAEB/wBVAAMCAQMDBgEIAwoBDQMoAT0DQAFxAU8CUQGcAVsBYgFo
-        AdYBZQF/AZMB8gFKAX0BoQH8AyABL/8AcAABAQMIAQsDJAE2A0YBgQMDAQT/ADEAAUIBTQE+BwABPgMA
-        ASgDAAFgAwABGAMAAQEBAAEBBQABIAEBFgAD/wEAAeABOAEBCQABwAEAAQEJAAHAAQABAwkAAcABAAED
-        CQABgAsAAYALAAGACwABgAsAAYALAAGAPQABAQsAAQELAAEDIwABBwkAAfABAAEHCQAB/gEAAQcJAAH/
-        AcABDwkAAf8B/gEPCQAL
+        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
+        ga8AAAAASUVORK5CYII=
 </value>
   </data>
 </root>

OpenRA.Editor/Surface.cs

@@ -439,10 +439,6 @@ namespace OpenRA.Editor
 			float OffsetY = t.Centered ? t.Bitmap.Height / 2 - TileSet.TileSize / 2 : 0;
 			float DrawY = TileSet.TileSize * p.Y * Zoom + Offset.Y - OffsetY;
 
-			float width = t.Bitmap.Width * Zoom;
-			float height = t.Bitmap.Height * Zoom;
-			RectangleF sourceRect = new RectangleF(0, 0, t.Bitmap.Width, t.Bitmap.Height);
-			RectangleF destRect = new RectangleF(DrawX, DrawY, width, height);
 			g.DrawRectangle(CordonPen,
 				DrawX, DrawY,
 				t.Bitmap.Width * Zoom, t.Bitmap.Height * Zoom);

OpenRA.FileFormats/FieldLoader.cs

@@ -13,6 +13,7 @@ using System.Collections.Generic;
 using System.Drawing;
 using System.Linq;
 using System.Reflection;
+using System.Globalization;
 
 namespace OpenRA.FileFormats
 {
@@ -99,7 +100,7 @@ namespace OpenRA.FileFormats
 			else if (fieldType == typeof(float))
 			{
 				float res;
-				if (float.TryParse(x.Replace("%",""), out res))
+				if (float.TryParse(x.Replace("%",""),  System.Globalization.NumberStyles.Any, NumberFormatInfo.InvariantInfo, out res))
 					return res * (x.Contains( '%' ) ? 0.01f : 1f);
 				return InvalidValueAction(x,fieldType, field);
 			}
@@ -177,8 +178,9 @@ namespace OpenRA.FileFormats
 		{
 			var ret = new Dictionary<FieldInfo, Func<string, Type, MiniYaml, object>>();
 
-			foreach( var field in type.GetFields() )
+			foreach( var ff in type.GetFields() )
 			{
+				var field = ff;
 				var load = field.GetCustomAttributes<LoadAttribute>( false );
 				var loadUsing = field.GetCustomAttributes<LoadUsingAttribute>( false );
 				var fromYamlKey = field.GetCustomAttributes<FieldFromYamlKeyAttribute>( false );

OpenRA.FileFormats/Graphics/IGraphicsDevice.cs

@@ -52,13 +52,13 @@ namespace OpenRA.FileFormats.Graphics
 	public interface IVertexBuffer<T>
 	{
 		void Bind();
-		void SetData( T[] vertices );
+		void SetData( T[] vertices, int length );
 	}
 
 	public interface IIndexBuffer
 	{
 		void Bind();
-		void SetData( ushort[] indices );
+		void SetData( ushort[] indices, int length );
 	}
 
 	public interface IShader

OpenRA.Game/Cursor.cs

@@ -22,7 +22,7 @@ namespace OpenRA
 		
 		public void Draw(int frame, float2 pos)
 		{
-			Game.Renderer.SpriteRenderer.DrawSprite(sequence.GetSprite(frame), pos - sequence.Hotspot, sequence.Palette);
+			sequence.GetSprite(frame).DrawAt(pos - sequence.Hotspot, sequence.Palette);
 		}
 	}
 }

OpenRA.Game/GameRules/Settings.cs

@@ -8,13 +8,13 @@
  */
 #endregion
 
+using System;
 using System.Collections.Generic;
 using System.Drawing;
 using System.IO;
 using System.Windows.Forms;
 using OpenRA.FileFormats;
 using OpenRA.FileFormats.Graphics;
-using System;
 
 namespace OpenRA.GameRules
 {
@@ -69,6 +69,7 @@ namespace OpenRA.GameRules
 		// Behaviour settings
         public bool ViewportEdgeScroll = true;
         public bool InverseDragScroll = false;
+        public float ViewportEdgeScrollStep = 0.1f; // 0.1f equals 10 - Gecko
 
 		// Internal game settings
 		public int Timestep = 40;
@@ -133,16 +134,11 @@ namespace OpenRA.GameRules
 		{
 			var root = new List<MiniYamlNode>();
 			foreach( var kv in Sections )
-				root.Add( new MiniYamlNode( kv.Key, SectionYaml( kv.Value ) ) );
+				root.Add( new MiniYamlNode( kv.Key, FieldSaver.Save(kv.Value) ) );
 			
 			root.WriteToFile(SettingsFile);
 		}
 		
-		MiniYaml SectionYaml(object section)
-		{
-			return FieldSaver.SaveDifferences(section, Activator.CreateInstance(section.GetType()));
-		}
-		
 		void LoadSectionYaml(MiniYaml yaml, object section)
 		{
 			object defaults = Activator.CreateInstance(section.GetType());

OpenRA.Game/Graphics/LineRenderer.cs

@@ -13,45 +13,46 @@ using OpenRA.FileFormats.Graphics;
 
 namespace OpenRA.Graphics
 {
-	public class LineRenderer
+	public class LineRenderer : Renderer.IBatchRenderer
 	{
 		Renderer renderer;
-		IVertexBuffer<Vertex> vertexBuffer;
-		IIndexBuffer indexBuffer;            /* kindof a waste of space, but the GPU likes indexing, oh well */
 
-		const int linesPerBatch = 1024;
-
-		Vertex[] vertices = new Vertex[ 2 * linesPerBatch ];
-		ushort[] indices = new ushort[ 2 * linesPerBatch ];
-		int lines = 0;
+		Vertex[] vertices = new Vertex[ Renderer.TempBufferSize ];
+		ushort[] indices = new ushort[ Renderer.TempBufferSize ];
 		int nv = 0, ni = 0;
 
 		public LineRenderer( Renderer renderer )
 		{
 			this.renderer = renderer;
-			vertexBuffer = renderer.Device.CreateVertexBuffer(vertices.Length );
-			indexBuffer = renderer.Device.CreateIndexBuffer( indices.Length );
 		}
 
 		public void Flush()
 		{
-			if( lines > 0 )
+			if( ni > 0 )
 			{
 				renderer.LineShader.Render( () =>
 				{
-					vertexBuffer.SetData( vertices );
-					indexBuffer.SetData( indices );
-					renderer.DrawBatch( vertexBuffer, indexBuffer,
+					var vb = renderer.GetTempVertexBuffer();
+					var ib = renderer.GetTempIndexBuffer();
+					vb.SetData( vertices, nv );
+					ib.SetData( indices, ni );
+					renderer.DrawBatch( vb, ib,
 					nv, ni / 2, PrimitiveType.LineList );
 				} );
 
 				nv = 0; ni = 0;
-				lines = 0;
 			}
 		}
 
 		public void DrawLine( float2 start, float2 end, Color startColor, Color endColor )
 		{
+			Renderer.CurrentBatchRenderer = this;
+
+			if( ni + 2 > Renderer.TempBufferSize )
+				Flush();
+			if( nv + 2 > Renderer.TempBufferSize )
+				Flush();
+
 			indices[ ni++ ] = (ushort)nv;
 
 			vertices[ nv++ ] = new Vertex( start,
@@ -63,9 +64,6 @@ namespace OpenRA.Graphics
 			vertices[ nv++ ] = new Vertex( end,
 			new float2( endColor.R / 255.0f, endColor.G / 255.0f ),
 			new float2( endColor.B / 255.0f, endColor.A / 255.0f ) );
-
-			if( ++lines >= linesPerBatch )
-				Flush();
 		}
 		
 		public void FillRect( RectangleF r, Color color )

OpenRA.Game/Graphics/Renderer.cs

@@ -16,6 +16,7 @@ using OpenRA.FileFormats;
 using OpenRA.FileFormats.Graphics;
 using OpenRA.Support;
 using System.Windows.Forms;
+using System.Collections.Generic;
 
 namespace OpenRA.Graphics
 {
@@ -23,10 +24,10 @@ namespace OpenRA.Graphics
 	{
 		internal static int SheetSize;
 
-		public IShader SpriteShader { get; private set; }    /* note: shared shader params */
-		public IShader LineShader { get; private set; }
-		public IShader RgbaSpriteShader { get; private set; }
-		public IShader WorldSpriteShader { get; private set; }
+		internal IShader SpriteShader { get; private set; }    /* note: shared shader params */
+		internal IShader LineShader { get; private set; }
+		internal IShader RgbaSpriteShader { get; private set; }
+		internal IShader WorldSpriteShader { get; private set; }
 
 		public SpriteRenderer SpriteRenderer { get; private set; }
 		public SpriteRenderer RgbaSpriteRenderer { get; private set; }
@@ -37,6 +38,12 @@ namespace OpenRA.Graphics
 
 		public readonly SpriteFont RegularFont, BoldFont, TitleFont;
 
+		internal const int TempBufferSize = 8192;
+		const int TempBufferCount = 8;
+
+		Queue<IVertexBuffer<Vertex>> tempBuffersV = new Queue<IVertexBuffer<Vertex>>();
+		Queue<IIndexBuffer> tempBuffersI = new Queue<IIndexBuffer>();
+
 		public Renderer()
 		{
 			SpriteShader = device.CreateShader(FileSystem.Open("shaders/world-shp.fx"));
@@ -52,9 +59,15 @@ namespace OpenRA.Graphics
 			RegularFont = new SpriteFont("FreeSans.ttf", 14);
 			BoldFont = new SpriteFont("FreeSansBold.ttf", 14);
 			TitleFont = new SpriteFont("titles.ttf", 48);
+
+			for( int i = 0 ; i < TempBufferCount ; i++ )
+			{
+				tempBuffersV.Enqueue( device.CreateVertexBuffer( TempBufferSize ) );
+				tempBuffersI.Enqueue( device.CreateIndexBuffer( TempBufferSize ) );
+			}
 		}
 
-		public IGraphicsDevice Device { get { return device; } }
+		internal IGraphicsDevice Device { get { return device; } }
 
 		public void BeginFrame(float2 scroll)
 		{
@@ -81,6 +94,7 @@ namespace OpenRA.Graphics
 
 		public void EndFrame()
 		{
+			Flush();
 			device.End();
 			device.Present();
 		}
@@ -111,15 +125,9 @@ namespace OpenRA.Graphics
 		
 		public void Flush()
 		{
-			WorldSpriteRenderer.Flush();
-			RgbaSpriteRenderer.Flush();
-			LineRenderer.Flush();
+			CurrentBatchRenderer = null;
 		}
 
-
-
-
-
 		static IGraphicsDevice device;
 
 		public static Size Resolution { get { return device.WindowSize; } }
@@ -154,5 +162,49 @@ namespace OpenRA.Graphics
 			}
 			throw new NotImplementedException();
 		}
+
+		internal IVertexBuffer<Vertex> GetTempVertexBuffer()
+		{
+			var ret = tempBuffersV.Dequeue();
+			tempBuffersV.Enqueue( ret );
+			return ret;
+		}
+
+		internal IIndexBuffer GetTempIndexBuffer()
+		{
+			var ret = tempBuffersI.Dequeue();
+			tempBuffersI.Enqueue( ret );
+			return ret;
+		}
+
+		public interface IBatchRenderer
+		{
+			void Flush();
+		}
+
+		static IBatchRenderer currentBatchRenderer;
+		public static IBatchRenderer CurrentBatchRenderer
+		{
+			get { return currentBatchRenderer; }
+			set
+			{
+				if( currentBatchRenderer == value ) return;
+				if( currentBatchRenderer != null )
+					currentBatchRenderer.Flush();
+				currentBatchRenderer = value;
+			}
+		}
+
+		public void EnableScissor(int left, int top, int width, int height)
+		{
+			Flush();
+			Device.EnableScissor( left, top, width, height );
+		}
+
+		public void DisableScissor()
+		{
+			Flush();
+			Device.DisableScissor();
+		}
 	}
 }

OpenRA.Game/Graphics/Sprite.cs

@@ -49,6 +49,26 @@ namespace OpenRA.Graphics
 		{
 			return uvhax[ k ];
 		}
+
+		public void DrawAt( float2 location, string palette )
+		{
+			Game.Renderer.SpriteRenderer.DrawSprite( this, location, palette, this.size );
+		}
+
+		public void DrawAt( float2 location, int paletteIndex )
+		{
+			Game.Renderer.SpriteRenderer.DrawSprite( this, location, paletteIndex, this.size );
+		}
+
+		public void DrawAt(float2 location, string palette, float2 size)
+		{
+			Game.Renderer.SpriteRenderer.DrawSprite( this, location, palette, size );
+		}
+
+		public void DrawAt( float2 location, int paletteIndex, float2 size )
+		{
+			Game.Renderer.SpriteRenderer.DrawSprite( this, location, paletteIndex, size );
+		}
 	}
 
 	public enum TextureChannel

OpenRA.Game/Graphics/SpriteRenderer.cs

@@ -12,28 +12,20 @@ using OpenRA.FileFormats.Graphics;
 
 namespace OpenRA.Graphics
 {
-	public class SpriteRenderer
+	public class SpriteRenderer : Renderer.IBatchRenderer
 	{
-		IVertexBuffer<Vertex> vertexBuffer;
-		IIndexBuffer indexBuffer;
 		Renderer renderer;
 		IShader shader;
 
-		const int spritesPerBatch = 1024;
-
-		Vertex[] vertices = new Vertex[4 * spritesPerBatch];
-		ushort[] indices = new ushort[6 * spritesPerBatch];
+		Vertex[] vertices = new Vertex[Renderer.TempBufferSize];
+		ushort[] indices = new ushort[Renderer.TempBufferSize];
 		Sheet currentSheet = null;
-		int sprites = 0;
 		int nv = 0, ni = 0;
 
 		public SpriteRenderer(Renderer renderer, IShader shader)
 		{
 			this.renderer = renderer;
 			this.shader = shader;
-
-			vertexBuffer = renderer.Device.CreateVertexBuffer( vertices.Length );
-			indexBuffer = renderer.Device.CreateIndexBuffer( indices.Length );
 		}
 
 		public SpriteRenderer(Renderer renderer)
@@ -41,14 +33,16 @@ namespace OpenRA.Graphics
 
 		public void Flush()
 		{
-			if (sprites > 0)
+			if (ni > 0)
 			{
 				shader.SetValue( "DiffuseTexture", currentSheet.Texture );
 				shader.Render(() =>
 				{
-					vertexBuffer.SetData(vertices);
-					indexBuffer.SetData(indices);
-					renderer.DrawBatch(vertexBuffer, indexBuffer,
+					var vb = renderer.GetTempVertexBuffer();
+					var ib = renderer.GetTempIndexBuffer();
+					vb.SetData(vertices, nv);
+					ib.SetData(indices, ni);
+					renderer.DrawBatch(vb, ib,
 						new Range<int>(0, nv),
 						new Range<int>(0, ni),
 						PrimitiveType.TriangleList,
@@ -57,7 +51,6 @@ namespace OpenRA.Graphics
 
 				nv = 0; ni = 0;
 				currentSheet = null;
-				sprites = 0;
 			}
 		}
 				
@@ -73,14 +66,19 @@ namespace OpenRA.Graphics
 		
 		public void DrawSprite(Sprite s, float2 location, int paletteIndex, float2 size)
 		{
+			Renderer.CurrentBatchRenderer = this;
+
 			if (s.sheet != currentSheet)
 				Flush();
 
+			if( nv + 4 > Renderer.TempBufferSize )
+				Flush();
+			if( ni + 6 > Renderer.TempBufferSize )
+				Flush();
+
 			currentSheet = s.sheet;
 			Util.FastCreateQuad(vertices, indices, location.ToInt2(), s, paletteIndex, nv, ni, size);
 			nv += 4; ni += 6;
-			if (++sprites >= spritesPerBatch)
-				Flush();
 		}
 		
 		

OpenRA.Game/Graphics/TerrainRenderer.cs

@@ -56,10 +56,10 @@ namespace OpenRA.Graphics
 				}
 
 			vertexBuffer = Game.Renderer.Device.CreateVertexBuffer( vertices.Length );
-			vertexBuffer.SetData( vertices );
+			vertexBuffer.SetData( vertices, nv );
 
 			indexBuffer = Game.Renderer.Device.CreateIndexBuffer( indices.Length );
-			indexBuffer.SetData( indices );
+			indexBuffer.SetData( indices, ni );
 		}
 
 		public void Draw( Viewport viewport )

OpenRA.Game/Graphics/Viewport.cs

@@ -107,10 +107,6 @@ namespace OpenRA.Graphics
 			var c = new Cursor(cursorName);
 			c.Draw((int)cursorFrame, Viewport.LastMousePos + Location); 
 
-			renderer.RgbaSpriteRenderer.Flush();
-			renderer.SpriteRenderer.Flush();
-			renderer.WorldSpriteRenderer.Flush();
-
 			renderer.EndFrame();
 		}
 

OpenRA.Game/Graphics/WorldRenderer.cs

@@ -90,20 +90,16 @@ namespace OpenRA.Graphics
 		public void Draw()
 		{
 			var bounds = GetBoundsRect();
-			Game.Renderer.Device.EnableScissor(bounds.Left, bounds.Top, bounds.Width, bounds.Height);
+			Game.Renderer.EnableScissor(bounds.Left, bounds.Top, bounds.Width, bounds.Height);
 
 			terrainRenderer.Draw(Game.viewport);
 
 			if (world.OrderGenerator != null)
 				world.OrderGenerator.RenderBeforeWorld(world);
 
-			Game.Renderer.SpriteRenderer.Flush();
-			Game.Renderer.LineRenderer.Flush();
-
 			foreach (var image in worldSprites)
-				Game.Renderer.SpriteRenderer.DrawSprite(image.Sprite, image.Pos, image.Palette);
+				image.Sprite.DrawAt(image.Pos, image.Palette);
 			uiOverlay.Draw(world);
-			Game.Renderer.SpriteRenderer.Flush();
 
 			if (world.OrderGenerator != null)
 				world.OrderGenerator.RenderAfterWorld(world);
@@ -111,11 +107,7 @@ namespace OpenRA.Graphics
 			if (world.LocalPlayer != null)
 				world.LocalPlayer.Shroud.Draw();
 
-			Game.Renderer.SpriteRenderer.Flush();
-
-			Game.Renderer.Device.DisableScissor();
-
-			Game.Renderer.LineRenderer.Flush();
+			Game.Renderer.DisableScissor();
 		}
 
 		void DrawBox(RectangleF r, Color color)

OpenRA.Game/Server/MasterServerQuery.cs

@@ -20,9 +20,12 @@ namespace OpenRA.Server
 	static class MasterServerQuery
 	{
 		public static event Action<GameServer[]> OnComplete = _ => { };
+		public static event Action<string> OnVersion = _ => { };
 
 		static GameServer[] Games = { };
+		static string Version = "";
 		static AutoResetEvent ev = new AutoResetEvent(false);
+		static AutoResetEvent ev2 = new AutoResetEvent(false);
 
 		public static void Refresh(string masterServerUrl)
 		{
@@ -30,9 +33,7 @@ namespace OpenRA.Server
 			{
 				try
 				{
-					var wc = new WebClient();
-					var data = wc.DownloadData(new Uri(masterServerUrl + "list.php"));
-					var str = Encoding.UTF8.GetString(data);
+					var str = GetData(new Uri(masterServerUrl + "list.php"));
 
 					var yaml = MiniYaml.FromString(str);
 
@@ -52,6 +53,32 @@ namespace OpenRA.Server
 		{
 			if (ev.WaitOne(TimeSpan.FromMilliseconds(0))) 
 				OnComplete(Games);
+			if (ev2.WaitOne(TimeSpan.FromMilliseconds(0)))
+				OnVersion(Version);
+		}
+
+		static string GetData(Uri uri)
+		{
+			var wc = new WebClient();
+			var data = wc.DownloadData(uri);
+			return Encoding.UTF8.GetString(data);
+		}
+
+		public static void GetCurrentVersion(string masterServerUrl)
+		{
+			new Thread(() =>
+				{
+					try
+					{
+						Version = GetData(new Uri(masterServerUrl + "VERSION"));
+					}
+					catch
+					{
+						Version = "";
+					}
+
+					ev2.Set();
+				}).Start();
 		}
 	}
 

OpenRA.Game/ShroudRenderer.cs

@@ -151,65 +151,39 @@ namespace OpenRA
 			var minx = clipRect.Left;
 			var maxx = clipRect.Right;
 
-			var shroudPalette = "fog";
+			DrawShroud( minx, miny, maxx, maxy, fogSprites, "fog" );
+			DrawShroud( minx, miny, maxx, maxy, sprites, "shroud" );
+		}
+
+		void DrawShroud( int minx, int miny, int maxx, int maxy, Sprite[,] s, string pal )
+		{
+			var shroudPalette = Game.world.WorldRenderer.GetPaletteIndex(pal);
 
 			for (var j = miny; j < maxy; j++)
 			{
 				var starti = minx;
 				for (var i = minx; i < maxx; i++)
 				{
-					if (fogSprites[i, j] == shadowBits[0x0f])
+					if (s[i, j] == shadowBits[0x0f])
 						continue;
 
 					if (starti != i)
 					{
-						Game.Renderer.SpriteRenderer.DrawSprite(fogSprites[starti, j],
-						    Game.CellSize * new float2(starti, j),
-						    shroudPalette,
-						    new float2(Game.CellSize * (i - starti), Game.CellSize));
-						starti = i+1;
-					}
-
-					Game.Renderer.SpriteRenderer.DrawSprite(fogSprites[i, j],
-						Game.CellSize * new float2(i, j),
-						shroudPalette);
-					starti = i+1;
-				}
-
-				if (starti < maxx)
-					Game.Renderer.SpriteRenderer.DrawSprite(fogSprites[starti, j],
-						Game.CellSize * new float2(starti, j),
-						shroudPalette,
-						new float2(Game.CellSize * (maxx - starti), Game.CellSize));
-			}
-
-			shroudPalette = "shroud";
-
-			for (var j = miny; j < maxy; j++)
-			{
-				var starti = minx;
-				for (var i = minx; i < maxx; i++)
-				{
-					if (sprites[i, j] == shadowBits[0x0f])
-						continue;
-
-					if (starti != i)
-					{
-						Game.Renderer.SpriteRenderer.DrawSprite(sprites[starti, j],
+						s[starti, j].DrawAt(
 							Game.CellSize * new float2(starti, j),
 							shroudPalette,
 							new float2(Game.CellSize * (i - starti), Game.CellSize));
 						starti = i + 1;
 					}
 
-					Game.Renderer.SpriteRenderer.DrawSprite(sprites[i, j],
+					s[i, j].DrawAt(
 						Game.CellSize * new float2(i, j),
 						shroudPalette);
 					starti = i + 1;
 				}
 
 				if (starti < maxx)
-					Game.Renderer.SpriteRenderer.DrawSprite(sprites[starti, j],
+					s[starti, j].DrawAt(
 						Game.CellSize * new float2(starti, j),
 						shroudPalette,
 						new float2(Game.CellSize * (maxx - starti), Game.CellSize));

OpenRA.Game/Traits/Building.cs

@@ -64,19 +64,14 @@ namespace OpenRA.Traits
 				return Info.Power;
 			
 			var health = self.TraitOrDefault<Health>();
-			var healthFraction = (health == null) ? 1f : health.HPFraction;
-			return (int)(healthFraction * Info.Power);	
+			return health != null ? (Info.Power * health.HP / health.MaxHP) : Info.Power;
 		}
 
 		public void Damaged(Actor self, AttackInfo e)
 		{
 			// Power plants lose power with damage
 			if (Info.Power > 0)
-			{					
-				var health = self.TraitOrDefault<Health>();
-				var healthFraction = (health == null) ? 1f : health.HPFraction;
-				PlayerPower.UpdateActor(self, (int)(healthFraction * Info.Power));
-			}
+				PlayerPower.UpdateActor(self, GetPowerUsage());
 			
 			if (e.DamageState == DamageState.Dead)
 			{

OpenRA.Game/Traits/Player/DeveloperMode.cs

@@ -67,18 +67,15 @@ namespace OpenRA.Traits
 						break;
 					}
 				case "DevShroud":
-					{
+					{
+						DisableShroud ^= true;
 						if (self.World.LocalPlayer == self.Owner)
-						{
-							DisableShroud ^= true;
 							Game.world.LocalPlayer.Shroud.Disabled = DisableShroud;
-						}
 						break;	
 					}
 				case "DevPathDebug":
 					{
-						if (self.World.LocalPlayer == self.Owner)
-							PathDebug ^= true;
+						PathDebug ^= true;
 						break;
 					}
 				case "DevUnitDebug":

OpenRA.Game/Traits/Selectable.cs

@@ -96,7 +96,7 @@ namespace OpenRA.Traits
 			var pipImages = new Animation("pips");
 			pipImages.PlayFetchIndex("groups", () => (int)group);
 			pipImages.Tick();
-			Game.Renderer.SpriteRenderer.DrawSprite(pipImages.Image, basePosition + new float2(-8, 1), "chrome");
+			pipImages.Image.DrawAt(basePosition + new float2(-8, 1), "chrome");
 		}
 
 		void DrawPips(Actor self, float2 basePosition)
@@ -122,7 +122,7 @@ namespace OpenRA.Traits
 					}
 					var pipImages = new Animation("pips");
 					pipImages.PlayRepeating(pipStrings[(int)pip]);
-					Game.Renderer.SpriteRenderer.DrawSprite(pipImages.Image, pipxyBase + pipxyOffset, "chrome");
+					pipImages.Image.DrawAt(pipxyBase + pipxyOffset, "chrome");
 					pipxyOffset += new float2(4, 0);
 				}
 				// Increment row
@@ -148,7 +148,7 @@ namespace OpenRA.Traits
 						
 					var tagImages = new Animation("pips");
 					tagImages.PlayRepeating(tagStrings[(int)tag]);
-					Game.Renderer.SpriteRenderer.DrawSprite(tagImages.Image, tagxyBase + tagxyOffset, "chrome");
+					tagImages.Image.DrawAt(tagxyBase + tagxyOffset, "chrome");
 					
 					// Increment row
 					tagxyOffset.Y += 8;
@@ -159,12 +159,13 @@ namespace OpenRA.Traits
 		void DrawUnitPath(Actor self)
 		{
 			if (!Game.world.LocalPlayer.PlayerActor.Trait<DeveloperMode>().PathDebug) return;
-			
+
+			var activity = self.GetCurrentActivity();
 			var mobile = self.TraitOrDefault<IMove>();
-			if (mobile != null)
+			if (activity != null && mobile != null)
 			{
 				var alt = new float2(0, -mobile.Altitude);
-				var path = self.GetCurrentActivity().GetCurrentPath();
+				var path = activity.GetCurrentPath();
 				var start = self.CenterLocation + alt;
 
 				var c = Color.Green;

OpenRA.Game/Traits/TraitsInterfaces.cs

@@ -49,7 +49,6 @@ namespace OpenRA.Traits
 	public interface INotifyProduction { void UnitProduced(Actor self, Actor other, int2 exit); }
 	public interface INotifyCapture { void OnCapture(Actor self, Actor captor, Player oldOwner, Player newOwner); }
 	public interface IAcceptSpy { void OnInfiltrate(Actor self, Actor spy); }
-	public interface INotifyEnterCell { void OnEnterCell(Actor self, int2 cell); }
 	public interface IStoreOre { int Capacity { get; }}
 
 	public interface IDisable { bool Disabled { get; } }
@@ -70,12 +69,6 @@ namespace OpenRA.Traits
 		IEnumerable<int2> OccupiedCells();
 	}
 	
-	public interface IOccupyAir
-	{
-		int2 TopLeft { get; }
-		IEnumerable<int2> OccupiedAirCells();
-	}
-
 	public static class IOccupySpaceExts
 	{
 		public static int2 NearestCellTo( this IOccupySpace ios, int2 other )

OpenRA.Game/Traits/World/BibLayer.cs

@@ -84,7 +84,7 @@ namespace OpenRA.Traits
 				if (world.LocalPlayer != null && !world.LocalPlayer.Shroud.IsExplored(kv.Key))
 					continue;
 
-				Game.Renderer.SpriteRenderer.DrawSprite(bibSprites[kv.Value.type - 1][kv.Value.image],
+				bibSprites[kv.Value.type - 1][kv.Value.image].DrawAt(
 					Game.CellSize * kv.Key, "terrain");
 			}
 		}

OpenRA.Game/Traits/World/ResourceLayer.cs

@@ -18,7 +18,7 @@ namespace OpenRA.Traits
 	public class ResourceLayerInfo : TraitInfo<ResourceLayer> { }
 
 	public class ResourceLayer: IRenderOverlay, IWorldLoaded
-	{		
+	{
 		World world;
 
 		public ResourceType[] resourceTypes;
@@ -37,6 +37,9 @@ namespace OpenRA.Traits
 			var miny = cliprect.Top;
 			var maxy = cliprect.Bottom;
 
+			foreach( var rt in world.WorldActor.TraitsImplementing<ResourceType>() )
+				rt.info.PaletteIndex = world.WorldRenderer.GetPaletteIndex(rt.info.Palette);
+
 			for (int x = minx; x < maxx; x++)
 				for (int y = miny; y < maxy; y++)
 				{
@@ -46,9 +49,9 @@ namespace OpenRA.Traits
 
 					var c = content[x, y];
 					if (c.image != null)
-						Game.Renderer.SpriteRenderer.DrawSprite(c.image[c.density],
+						c.image[c.density].DrawAt(
 							Game.CellSize * new int2(x, y),
-							c.type.info.Palette);
+							c.type.info.PaletteIndex);
 				}
 		}
 
@@ -146,6 +149,7 @@ namespace OpenRA.Traits
 			content[p.X, p.Y].type = null;
 			content[p.X, p.Y].image = null;
 			content[p.X, p.Y].density = 0;
+			world.Map.CustomTerrain[p.X, p.Y] = null;
 		}
 
 		public ResourceType GetResource(int2 p) { return content[p.X, p.Y].type; }

OpenRA.Game/Traits/World/ResourceType.cs

@@ -23,6 +23,7 @@ namespace OpenRA.Traits
 		public readonly string TerrainType = "Ore";
 
 		public Sprite[][] Sprites;
+		public int PaletteIndex;
 		
 		public object Create(ActorInitializer init) { return new ResourceType(this); }
 	}

OpenRA.Game/UiOverlay.cs

@@ -49,7 +49,7 @@ namespace OpenRA
 				for (var i = world.Map.Bounds.Left; i < world.Map.Bounds.Right; i++)
 					for (var j = world.Map.Bounds.Top; j < world.Map.Bounds.Bottom; j++)	
 						if (uim.GetUnitsAt(new int2(i, j)).Any())
-							Game.Renderer.SpriteRenderer.DrawSprite(unitDebug, Game.CellSize * new float2(i, j), "terrain");
+							unitDebug.DrawAt(Game.CellSize * new float2(i, j), "terrain");
 			}
 		}
 
@@ -63,19 +63,17 @@ namespace OpenRA
 			if (Rules.Info[name].Traits.Contains<LineBuildInfo>())
 			{
 				foreach (var t in LineBuildUtils.GetLineBuildCells(world, topLeft, name, bi))
-					Game.Renderer.SpriteRenderer.DrawSprite(world.IsCloseEnoughToBase(world.LocalPlayer, name, bi, t)
-						? buildOk : buildBlocked, Game.CellSize * t, "terrain");
+					(world.IsCloseEnoughToBase(world.LocalPlayer, name, bi, t) ? buildOk : buildBlocked)
+						.DrawAt(Game.CellSize * t, "terrain");
 			}
 			else
 			{
 				var res = world.WorldActor.Trait<ResourceLayer>();
 				var isCloseEnough = world.IsCloseEnoughToBase(world.LocalPlayer, name, bi, topLeft);
 				foreach (var t in Footprint.Tiles(name, bi, topLeft))
-					Game.Renderer.SpriteRenderer.DrawSprite((isCloseEnough && world.IsCellBuildable(t, bi.WaterBound) && res.GetResource(t) == null)
-						? buildOk : buildBlocked, Game.CellSize * t, "terrain");
+					((isCloseEnough && world.IsCellBuildable(t, bi.WaterBound) && res.GetResource(t) == null) ? buildOk : buildBlocked)
+						.DrawAt(Game.CellSize * t, "terrain");
 			}
-			
-			Game.Renderer.SpriteRenderer.Flush();
 		}
 	}
 

OpenRA.Game/Widgets/ChatDisplayWidget.cs

@@ -41,8 +41,7 @@ namespace OpenRA.Widgets
 			if (DrawBackground)
 				WidgetUtils.DrawPanel("dialog3", chatLogArea);
 			
-			Game.Renderer.RgbaSpriteRenderer.Flush();
-			Game.Renderer.Device.EnableScissor(chatLogArea.Left, chatLogArea.Top, chatLogArea.Width, chatLogArea.Height);
+			Game.Renderer.EnableScissor(chatLogArea.Left, chatLogArea.Top, chatLogArea.Width, chatLogArea.Height);
 			foreach (var line in recentLines.AsEnumerable().Reverse())
 			{
 				chatpos.Y -= 20;
@@ -52,8 +51,7 @@ namespace OpenRA.Widgets
 				Game.Renderer.RegularFont.DrawText(line.Text, chatpos + new int2(inset, 0), Color.White);
 			}
 
-			Game.Renderer.RgbaSpriteRenderer.Flush();
-			Game.Renderer.Device.DisableScissor();
+			Game.Renderer.DisableScissor();
 		}
 		
 		public void AddLine(Color c, string from, string text)

OpenRA.Game/Widgets/ChatEntryWidget.cs

@@ -33,8 +33,6 @@ namespace OpenRA.Widgets
 
 				Game.Renderer.BoldFont.DrawText(text, RenderOrigin + new float2(3, 7), Color.White);
 				Game.Renderer.RegularFont.DrawText(content, RenderOrigin + new float2(3 + w, 7), Color.White);
-
-				Game.Renderer.RgbaSpriteRenderer.Flush();
 			}
 		}
 		

OpenRA.Game/Widgets/ColorBlockWidget.cs

@@ -37,7 +37,6 @@ namespace OpenRA.Widgets
 		public override void DrawInner(World world)
 		{
 			WidgetUtils.FillRectWithColor(RenderBounds, GetColor());
-			Game.Renderer.LineRenderer.Flush();
 		}
 	}
 }

OpenRA.Game/Widgets/Delegates/MainMenuButtonsDelegate.cs

@@ -9,6 +9,7 @@
 #endregion
 
 using OpenRA.FileFormats;
+using OpenRA.Server;
 
 namespace OpenRA.Widgets.Delegates
 {
@@ -31,6 +32,8 @@ namespace OpenRA.Widgets.Delegates
 				var s = FileSystem.Open("VERSION");
 				version.Text = s.ReadAllText();
 				s.Close();
+				MasterServerQuery.OnVersion += v => { if (!string.IsNullOrEmpty(v)) version.Text += "\nLatest: " + v; };
+				MasterServerQuery.GetCurrentVersion(Game.Settings.Server.MasterServer);
 			}
 		}
 	}

OpenRA.Game/Widgets/Delegates/ServerBrowserDelegate.cs

@@ -30,8 +30,8 @@ namespace OpenRA.Widgets.Delegates
 
 			MasterServerQuery.OnComplete += games => RefreshServerList(games);
 
-			widget.GetWidget("JOINSERVER_PROGRESS_TITLE").Visible = true;
-			widget.GetWidget<LabelWidget>("JOINSERVER_PROGRESS_TITLE").Text = "Fetching game list...";
+			bg.GetWidget("JOINSERVER_PROGRESS_TITLE").Visible = true;
+			bg.GetWidget<LabelWidget>("JOINSERVER_PROGRESS_TITLE").Text = "Fetching game list...";
 
 			bg.Children.RemoveAll(a => GameButtons.Contains(a));
 			GameButtons.Clear();
@@ -62,8 +62,8 @@ namespace OpenRA.Widgets.Delegates
 
 			bg.GetWidget("REFRESH_BUTTON").OnMouseUp = mi =>
 			{
-				widget.GetWidget("JOINSERVER_PROGRESS_TITLE").Visible = true;
-				widget.GetWidget<LabelWidget>("JOINSERVER_PROGRESS_TITLE").Text = "Fetching game list...";
+				bg.GetWidget("JOINSERVER_PROGRESS_TITLE").Visible = true;
+				bg.GetWidget<LabelWidget>("JOINSERVER_PROGRESS_TITLE").Text = "Fetching game list...";
 
 				bg.Children.RemoveAll(a => GameButtons.Contains(a));
 				GameButtons.Clear();
@@ -125,6 +125,10 @@ namespace OpenRA.Widgets.Delegates
 		{
 			var r = Widget.RootWidget;
 			var bg = r.GetWidget("JOINSERVER_BG");
+
+            if (bg == null) // We got a MasterServer reply AFTER the browser is gone, just return to prevent crash - Gecko
+                return;
+
 			var sl = bg.GetWidget<ListBoxWidget>("SERVER_LIST");
 
 			sl.Children.Clear();
@@ -184,7 +188,6 @@ namespace OpenRA.Widgets.Delegates
 
 			dc.GetWidget("JOIN_BUTTON").OnMouseUp = mi =>
 			{
-
 				var address = dc.GetWidget<TextFieldWidget>("SERVER_ADDRESS").Text;
 				var cpts = address.Split(':').ToArray();
 				if (cpts.Length != 2)
@@ -201,7 +204,8 @@ namespace OpenRA.Widgets.Delegates
 			dc.GetWidget("CANCEL_BUTTON").OnMouseUp = mi =>
 			{
 				Widget.CloseWindow();
-				return widget.GetWidget("MAINMENU_BUTTON_JOIN").OnMouseUp(mi);
+				Widget.OpenWindow("MAINMENU_BG");
+				return true;
 			};
 		}
 	}

OpenRA.Game/Widgets/Delegates/SettingsMenuDelegate.cs

@@ -53,6 +53,14 @@ namespace OpenRA.Widgets.Delegates
                 Game.Settings.Game.ViewportEdgeScroll ^= true;
                 return true;
             };
+            
+            // Added scroll sensitivity - Gecko	
+            var edgeScrollSlider = general.GetWidget<SliderWidget>("EDGE_SCROLL_AMOUNT");
+            if (edgeScrollSlider != null) // Backwards compatible - Gecko
+            {
+                edgeScrollSlider.OnChange += x => { x += 0.1f; Game.Settings.Game.ViewportEdgeScrollStep = x; };
+                edgeScrollSlider.GetOffset = () => { return Game.Settings.Game.ViewportEdgeScrollStep - 0.1f; };
+            }
 
             var inverseScroll = general.GetWidget<CheckboxWidget>("INVERSE_SCROLL");
             inverseScroll.Checked = () => Game.Settings.Game.InverseDragScroll;

OpenRA.Game/Widgets/ListBoxWidget.cs

@@ -71,15 +71,12 @@ namespace OpenRA.Widgets
 			WidgetUtils.DrawRGBA(ChromeProvider.GetImage("scrollbar", "down_arrow"),
 				new float2(downButtonRect.Left + downOffset, downButtonRect.Top + downOffset));
 
-			Game.Renderer.RgbaSpriteRenderer.Flush();
-
-			Game.Renderer.Device.EnableScissor(backgroundRect.X, backgroundRect.Y + HeaderHeight, backgroundRect.Width, backgroundRect.Height - HeaderHeight);
+			Game.Renderer.EnableScissor(backgroundRect.X, backgroundRect.Y + HeaderHeight, backgroundRect.Width, backgroundRect.Height - HeaderHeight);
 
 			foreach (var child in Children)
 				child.Draw(world);
 
-			Game.Renderer.RgbaSpriteRenderer.Flush();
-			Game.Renderer.Device.DisableScissor();
+			Game.Renderer.DisableScissor();
 		}
 
 		public override int2 ChildOrigin { get { return RenderOrigin + new int2(0, (int)ListOffset); } }

OpenRA.Game/Widgets/MapPreviewWidget.cs

@@ -105,8 +105,6 @@ namespace OpenRA.Widgets
 				new float2(MapRect.Location),
 				new float2( MapRect.Size ) );
 
-			Game.Renderer.RgbaSpriteRenderer.Flush();
-
 			// Overlay spawnpoints
 			var colors = SpawnColors();
 			foreach (var p in map.SpawnPoints)
@@ -120,12 +118,9 @@ namespace OpenRA.Widgets
 					sprite = OwnedSpawn;
 					offset = new int2(-OwnedSpawn.bounds.Width/2, -OwnedSpawn.bounds.Height/2);
 					WidgetUtils.FillRectWithColor(new Rectangle(pos.X + offset.X + 2, pos.Y + offset.Y + 2, 12, 12), colors[p]);
-					Game.Renderer.LineRenderer.Flush();
 				}
 				Game.Renderer.RgbaSpriteRenderer.DrawSprite(sprite, pos + offset);
 			}
-
-			Game.Renderer.Flush();
 		}
 	}
 }

OpenRA.Game/Widgets/PerfGraphWidget.cs

@@ -40,8 +40,6 @@ namespace OpenRA.Widgets
 					return b;
 				});
 			}
-
-			Game.Renderer.LineRenderer.Flush();
 		}
 	}
 }

OpenRA.Game/Widgets/TextFieldWidget.cs

@@ -127,16 +127,13 @@ namespace OpenRA.Widgets
 				if (Focused)
 					textPos += new int2(Bounds.Width - 2 * margin - textSize.X, 0);
 
-				Game.Renderer.Device.EnableScissor(pos.X + margin, pos.Y, Bounds.Width - 2 * margin, Bounds.Bottom);
+				Game.Renderer.EnableScissor(pos.X + margin, pos.Y, Bounds.Width - 2 * margin, Bounds.Bottom);
 			}
 
 			font.DrawText(Text + cursor, textPos, Color.White);
 
 			if (textSize.X > Bounds.Width - 2 * margin)
-			{
-				Game.Renderer.RgbaSpriteRenderer.Flush();
-				Game.Renderer.Device.DisableScissor();
-			}
+				Game.Renderer.DisableScissor();
 		}
 
 		public override Widget Clone() { return new TextFieldWidget(this); }

OpenRA.Game/Widgets/ViewportScrollControllerWidget.cs

@@ -1,172 +1,174 @@
-#region Copyright & License Information
-/*
- * Copyright 2007-2010 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 LICENSE.
- */
-#endregion
-
+#region Copyright & License Information
+/*
+ * Copyright 2007-2010 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 LICENSE.
+ */
+#endregion
+
 using System;
 using OpenRA.Graphics;
 
-namespace OpenRA.Widgets
-{
-	[Flags]
-	public enum ScrollDirection
-	{
-		None = 0,
-		Up = 1,
-		Left = 2,
-		Down = 4,
-		Right = 8
-	}
-	
-	class ViewportScrollControllerWidget : Widget
-	{
-		public int EdgeScrollThreshold = 15;
-
-		ScrollDirection Keyboard;
+namespace OpenRA.Widgets
+{
+	[Flags]
+	public enum ScrollDirection
+	{
+		None = 0,
+		Up = 1,
+		Left = 2,
+		Down = 4,
+		Right = 8
+	}
+	
+	class ViewportScrollControllerWidget : Widget
+	{
+		public int EdgeScrollThreshold = 15;
+
+		ScrollDirection Keyboard;
 		ScrollDirection Edge;
 
-		public ViewportScrollControllerWidget() : base() { }
-		protected ViewportScrollControllerWidget(ViewportScrollControllerWidget widget) : base(widget) {}
-		public override void DrawInner( World world ) {}
-		
-		public override bool HandleInputInner(MouseInput mi)
-		{									
-			if (mi.Event == MouseInputEvent.Move &&
-				(mi.Button == MouseButton.Middle || mi.Button == (MouseButton.Left | MouseButton.Right)))
+		public ViewportScrollControllerWidget() : base() { }
+		protected ViewportScrollControllerWidget(ViewportScrollControllerWidget widget) : base(widget) {}
+		public override void DrawInner( World world ) {}
+		
+		public override bool HandleInputInner(MouseInput mi)
+		{									
+			if (mi.Event == MouseInputEvent.Move &&
+				(mi.Button == MouseButton.Middle || mi.Button == (MouseButton.Left | MouseButton.Right)))
 			{
                 int InverseScroll = Game.Settings.Game.InverseDragScroll ? -1 : 1;
-                Game.viewport.Scroll((Viewport.LastMousePos - mi.Location) * InverseScroll);
-				return true;
-			}
-			return false;
-		}
-		
-		public override string GetCursor(int2 pos)
-		{
-			if (!Game.Settings.Game.ViewportEdgeScroll)
-				return null;
-
-			if (Edge.Includes(ScrollDirection.Up) && Edge.Includes(ScrollDirection.Left)){
-				ScrollDirection BlockedDirections = Game.viewport.GetBlockedDirections();
-				if(BlockedDirections.Includes(ScrollDirection.Up) && BlockedDirections.Includes(ScrollDirection.Left))
-					return "scroll-tl-blocked";
-				else
-					return "scroll-tl";
-			}
-			if (Edge.Includes(ScrollDirection.Up) && Edge.Includes(ScrollDirection.Right)){
-				ScrollDirection BlockedDirections = Game.viewport.GetBlockedDirections();
-				if (BlockedDirections.Includes(ScrollDirection.Up) && BlockedDirections.Includes(ScrollDirection.Right))
-					return "scroll-tr-blocked";
-				else
-					return "scroll-tr";
-			}
-			if (Edge.Includes(ScrollDirection.Down) && Edge.Includes(ScrollDirection.Left)){
-				ScrollDirection BlockedDirections = Game.viewport.GetBlockedDirections();
-				if (BlockedDirections.Includes(ScrollDirection.Down) && BlockedDirections.Includes(ScrollDirection.Left))
-					return "scroll-bl-blocked";
-				else
-					return "scroll-bl";
-			}
-			if (Edge.Includes(ScrollDirection.Down) && Edge.Includes(ScrollDirection.Right)){
-				ScrollDirection BlockedDirections = Game.viewport.GetBlockedDirections();
-				if (BlockedDirections.Includes(ScrollDirection.Down) && BlockedDirections.Includes(ScrollDirection.Right))
-					return "scroll-br-blocked";
-				else
-					return "scroll-br";
-			}
-			
-			if (Edge.Includes(ScrollDirection.Up))
-				if (Game.viewport.GetBlockedDirections().Includes(ScrollDirection.Up))
-					return "scroll-t-blocked";
-				else
-					return "scroll-t";
-			if (Edge.Includes(ScrollDirection.Down))
-				if (Game.viewport.GetBlockedDirections().Includes(ScrollDirection.Down))
-					return "scroll-b-blocked";
-				else
-					return "scroll-b";
-			if (Edge.Includes(ScrollDirection.Left))
-				if (Game.viewport.GetBlockedDirections().Includes(ScrollDirection.Left))
-					return "scroll-l-blocked";
-				else
-					return "scroll-l";
-			if (Edge.Includes(ScrollDirection.Right))
-				if (Game.viewport.GetBlockedDirections().Includes(ScrollDirection.Right))
-					return "scroll-r-blocked";
-				else
-					return "scroll-r";
-			
-			return null;
-		}
-
-		public override bool LoseFocus (MouseInput mi)
-		{
-			Keyboard = ScrollDirection.None;
-			return base.LoseFocus(mi);
-		}
-		
-		public override bool HandleKeyPressInner(KeyInput e)
-		{			
-			switch (e.KeyName)
-			{
-				case "up": Keyboard = Keyboard.Set(ScrollDirection.Up, (e.Event == KeyInputEvent.Down)); return true;
-				case "down": Keyboard = Keyboard.Set(ScrollDirection.Down, (e.Event == KeyInputEvent.Down)); return true;
-				case "left": Keyboard = Keyboard.Set(ScrollDirection.Left, (e.Event == KeyInputEvent.Down)); return true;
-				case "right": Keyboard = Keyboard.Set(ScrollDirection.Right, (e.Event == KeyInputEvent.Down)); return true;
-			}
-			return false;
-		}
-		
-		public override void Tick(World world)
-		{
-			Edge = ScrollDirection.None;
-			if (Game.Settings.Game.ViewportEdgeScroll && Game.HasInputFocus)
-			{
-				// Check for edge-scroll
-				if (Viewport.LastMousePos.X < EdgeScrollThreshold)
-					Edge = Edge.Set(ScrollDirection.Left, true);
-				if (Viewport.LastMousePos.Y < EdgeScrollThreshold)
-					Edge = Edge.Set(ScrollDirection.Up, true);
-				if (Viewport.LastMousePos.X >= Game.viewport.Width - EdgeScrollThreshold)
-					Edge = Edge.Set(ScrollDirection.Right, true);
-				if (Viewport.LastMousePos.Y >= Game.viewport.Height - EdgeScrollThreshold)
-					Edge = Edge.Set(ScrollDirection.Down, true);
-			}
-			
-			if(Keyboard != ScrollDirection.None || Edge != ScrollDirection.None)
-			{
-				var scroll = new float2(0,0);
-				if (Keyboard.Includes(ScrollDirection.Up) || Edge.Includes(ScrollDirection.Up))
-					scroll += new float2(0, -10);
-				if (Keyboard.Includes(ScrollDirection.Right) || Edge.Includes(ScrollDirection.Right))
-					scroll += new float2(10, 0);
-				if (Keyboard.Includes(ScrollDirection.Down) || Edge.Includes(ScrollDirection.Down))
-					scroll += new float2(0, 10);
-				if (Keyboard.Includes(ScrollDirection.Left) || Edge.Includes(ScrollDirection.Left))
-					scroll += new float2(-10, 0);
-			
-				Game.viewport.Scroll(scroll);
-			}
-		}
-		
-		public override Widget Clone() { return new ViewportScrollControllerWidget(this); }
-	}
-	
-	public static class ViewportExts
-	{	
-		public static bool Includes(this ScrollDirection d, ScrollDirection s)
-		{
-			return (d & s) == s;
-		}
-		
-		public static ScrollDirection Set(this ScrollDirection d, ScrollDirection s, bool val)
-		{
-			return (d.Includes(s) != val) ? d ^ s : d;
-		}
-	}
+                Game.viewport.Scroll((Viewport.LastMousePos - mi.Location) * InverseScroll);
+				return true;
+			}
+			return false;
+		}
+		
+		public override string GetCursor(int2 pos)
+		{
+			if (!Game.Settings.Game.ViewportEdgeScroll)
+				return null;
+
+			if (Edge.Includes(ScrollDirection.Up) && Edge.Includes(ScrollDirection.Left)){
+				ScrollDirection BlockedDirections = Game.viewport.GetBlockedDirections();
+				if(BlockedDirections.Includes(ScrollDirection.Up) && BlockedDirections.Includes(ScrollDirection.Left))
+					return "scroll-tl-blocked";
+				else
+					return "scroll-tl";
+			}
+			if (Edge.Includes(ScrollDirection.Up) && Edge.Includes(ScrollDirection.Right)){
+				ScrollDirection BlockedDirections = Game.viewport.GetBlockedDirections();
+				if (BlockedDirections.Includes(ScrollDirection.Up) && BlockedDirections.Includes(ScrollDirection.Right))
+					return "scroll-tr-blocked";
+				else
+					return "scroll-tr";
+			}
+			if (Edge.Includes(ScrollDirection.Down) && Edge.Includes(ScrollDirection.Left)){
+				ScrollDirection BlockedDirections = Game.viewport.GetBlockedDirections();
+				if (BlockedDirections.Includes(ScrollDirection.Down) && BlockedDirections.Includes(ScrollDirection.Left))
+					return "scroll-bl-blocked";
+				else
+					return "scroll-bl";
+			}
+			if (Edge.Includes(ScrollDirection.Down) && Edge.Includes(ScrollDirection.Right)){
+				ScrollDirection BlockedDirections = Game.viewport.GetBlockedDirections();
+				if (BlockedDirections.Includes(ScrollDirection.Down) && BlockedDirections.Includes(ScrollDirection.Right))
+					return "scroll-br-blocked";
+				else
+					return "scroll-br";
+			}
+			
+			if (Edge.Includes(ScrollDirection.Up))
+				if (Game.viewport.GetBlockedDirections().Includes(ScrollDirection.Up))
+					return "scroll-t-blocked";
+				else
+					return "scroll-t";
+			if (Edge.Includes(ScrollDirection.Down))
+				if (Game.viewport.GetBlockedDirections().Includes(ScrollDirection.Down))
+					return "scroll-b-blocked";
+				else
+					return "scroll-b";
+			if (Edge.Includes(ScrollDirection.Left))
+				if (Game.viewport.GetBlockedDirections().Includes(ScrollDirection.Left))
+					return "scroll-l-blocked";
+				else
+					return "scroll-l";
+			if (Edge.Includes(ScrollDirection.Right))
+				if (Game.viewport.GetBlockedDirections().Includes(ScrollDirection.Right))
+					return "scroll-r-blocked";
+				else
+					return "scroll-r";
+			
+			return null;
+		}
+
+		public override bool LoseFocus (MouseInput mi)
+		{
+			Keyboard = ScrollDirection.None;
+			return base.LoseFocus(mi);
+		}
+		
+		public override bool HandleKeyPressInner(KeyInput e)
+		{			
+			switch (e.KeyName)
+			{
+				case "up": Keyboard = Keyboard.Set(ScrollDirection.Up, (e.Event == KeyInputEvent.Down)); return true;
+				case "down": Keyboard = Keyboard.Set(ScrollDirection.Down, (e.Event == KeyInputEvent.Down)); return true;
+				case "left": Keyboard = Keyboard.Set(ScrollDirection.Left, (e.Event == KeyInputEvent.Down)); return true;
+				case "right": Keyboard = Keyboard.Set(ScrollDirection.Right, (e.Event == KeyInputEvent.Down)); return true;
+			}
+			return false;
+		}
+		
+		public override void Tick(World world)
+		{
+			Edge = ScrollDirection.None;
+			if (Game.Settings.Game.ViewportEdgeScroll && Game.HasInputFocus)
+			{
+				// Check for edge-scroll
+				if (Viewport.LastMousePos.X < EdgeScrollThreshold)
+					Edge = Edge.Set(ScrollDirection.Left, true);
+				if (Viewport.LastMousePos.Y < EdgeScrollThreshold)
+					Edge = Edge.Set(ScrollDirection.Up, true);
+				if (Viewport.LastMousePos.X >= Game.viewport.Width - EdgeScrollThreshold)
+					Edge = Edge.Set(ScrollDirection.Right, true);
+				if (Viewport.LastMousePos.Y >= Game.viewport.Height - EdgeScrollThreshold)
+					Edge = Edge.Set(ScrollDirection.Down, true);
+			}
+			
+			if(Keyboard != ScrollDirection.None || Edge != ScrollDirection.None)
+			{
+                var scroll = new float2(0, 0);
+
+                // Modified to use the ViewportEdgeScrollStep setting - Gecko
+                if (Keyboard.Includes(ScrollDirection.Up) || Edge.Includes(ScrollDirection.Up))
+                    scroll += new float2(0, -(Game.Settings.Game.ViewportEdgeScrollStep * 100));
+                if (Keyboard.Includes(ScrollDirection.Right) || Edge.Includes(ScrollDirection.Right))
+                    scroll += new float2((Game.Settings.Game.ViewportEdgeScrollStep * 100), 0);
+                if (Keyboard.Includes(ScrollDirection.Down) || Edge.Includes(ScrollDirection.Down))
+                    scroll += new float2(0, (Game.Settings.Game.ViewportEdgeScrollStep * 100));
+                if (Keyboard.Includes(ScrollDirection.Left) || Edge.Includes(ScrollDirection.Left))
+                    scroll += new float2(-(Game.Settings.Game.ViewportEdgeScrollStep * 100), 0);
+			
+				Game.viewport.Scroll(scroll);
+			}
+		}
+		
+		public override Widget Clone() { return new ViewportScrollControllerWidget(this); }
+	}
+	
+	public static class ViewportExts
+	{	
+		public static bool Includes(this ScrollDirection d, ScrollDirection s)
+		{
+			return (d & s) == s;
+		}
+		
+		public static ScrollDirection Set(this ScrollDirection d, ScrollDirection s, bool val)
+		{
+			return (d.Includes(s) != val) ? d ^ s : d;
+		}
+	}
 }

OpenRA.Game/Widgets/WidgetUtils.cs

@@ -127,8 +127,6 @@ namespace OpenRA.Widgets
 				DrawRGBA(ss[6], new float2(Bounds.Left, Bounds.Bottom - ss[6].size.Y));
 			if (ps.HasFlags(PanelSides.Right | PanelSides.Bottom))
 				DrawRGBA(ss[7], new float2(Bounds.Right - ss[7].size.X, Bounds.Bottom - ss[7].size.Y));
-
-			Game.Renderer.RgbaSpriteRenderer.Flush();
 		}
 	}
 

OpenRA.Game/Widgets/WorldInteractionControllerWidget.cs

@@ -39,8 +39,6 @@ namespace OpenRA.Widgets
 
 			foreach (var u in SelectActorsInBox(world, selbox.Value.First, selbox.Value.Second))
 				world.WorldRenderer.DrawSelectionBox(u, Color.Yellow);
-			
-			Game.Renderer.LineRenderer.Flush();
 		}
 		
 		float2 dragStart, dragEnd;

OpenRA.Game/Widgets/WorldTooltipWidget.cs

@@ -85,7 +85,6 @@ namespace OpenRA.Widgets
 					ChromeProvider.GetImage("flags", actor.Owner.Country.Race),
 					new float2(Viewport.LastMousePos.X + 30, Viewport.LastMousePos.Y + 50));
 			}
-			Game.Renderer.RgbaSpriteRenderer.Flush();
 		}
 	}
 }

OpenRA.Game/World.cs

@@ -194,7 +194,6 @@ namespace OpenRA
 			readonly World world;
 
 			public readonly Cache<Player, OwnedByCachedView> OwnedBy;
-			readonly TypeDictionary hasTrait = new TypeDictionary();
 
 			public AllQueries( World world )
 			{

OpenRA.Gl/IndexBuffer.cs

@@ -22,13 +22,21 @@ namespace OpenRA.GlRenderer
 		{
 			Gl.glGenBuffers(1, out buffer);
 			GraphicsDevice.CheckGlError();
-		}
-
-		public void SetData(ushort[] data)
-		{
 			Bind();
 			Gl.glBufferData(Gl.GL_ELEMENT_ARRAY_BUFFER,
-				new IntPtr(2 * data.Length), data, Gl.GL_DYNAMIC_DRAW);
+				new IntPtr(2 * size),
+				new ushort[ size ],
+				Gl.GL_DYNAMIC_DRAW);
+			GraphicsDevice.CheckGlError();
+		}
+
+		public void SetData(ushort[] data, int length)
+		{
+			Bind();
+			Gl.glBufferSubData(Gl.GL_ELEMENT_ARRAY_BUFFER,
+				IntPtr.Zero,
+				new IntPtr(2 * length),
+				data);
 			GraphicsDevice.CheckGlError();
 		}
 

OpenRA.Gl/VertexBuffer.cs

@@ -24,13 +24,21 @@ namespace OpenRA.GlRenderer
 		{
 			Gl.glGenBuffers(1, out buffer);
 			GraphicsDevice.CheckGlError();
-		}
-
-		public void SetData(T[] data)
-		{
 			Bind();
 			Gl.glBufferData(Gl.GL_ARRAY_BUFFER,
-				new IntPtr(Marshal.SizeOf(typeof(T)) * data.Length), data, Gl.GL_DYNAMIC_DRAW);
+				new IntPtr(Marshal.SizeOf(typeof(T)) * size),
+				new T[ size ],
+				Gl.GL_DYNAMIC_DRAW);
+			GraphicsDevice.CheckGlError();
+		}
+
+		public void SetData(T[] data, int length)
+		{
+			Bind();
+			Gl.glBufferSubData(Gl.GL_ARRAY_BUFFER,
+				IntPtr.Zero,
+				new IntPtr(Marshal.SizeOf(typeof(T)) * length),
+				data);
 			GraphicsDevice.CheckGlError();
 		}
 

OpenRA.Mods.Cnc/CncLoadScreen.cs

@@ -65,7 +65,6 @@ namespace OpenRA.Mods.Cnc
 			WidgetUtils.FillRectWithSprite(StripeRect, Stripe);			
 			r.RgbaSpriteRenderer.DrawSprite(Logo, LogoPos);
 			Font.DrawText(text, new float2(Renderer.Resolution.Width - textSize.X - 20, Renderer.Resolution.Height - textSize.Y - 20), Color.White);
-			r.RgbaSpriteRenderer.Flush();
 			r.EndFrame();
 		}
 	}

OpenRA.Mods.RA/Effects/Missile.cs

@@ -123,7 +123,8 @@ namespace OpenRA.Mods.RA.Effects
 
 		public IEnumerable<Renderable> Render()
 		{
-			yield return new Renderable(anim.Image, Pos - 0.5f * anim.Image.size - new float2(0, Altitude), "effect", (int)Pos.Y);
+			yield return new Renderable(anim.Image, Pos - 0.5f * anim.Image.size - new float2(0, Altitude), 
+				Args.weapon.Underwater ? "shadow" : "effect", (int)Pos.Y);
 		}
 	}
 }

OpenRA.Mods.RA/Effects/RepairIndicator.cs

@@ -29,7 +29,7 @@ namespace OpenRA.Mods.RA.Effects
 
 		public void Tick( World world )
 		{
-			if (--framesLeft == 0 || a.IsDead())
+			if (--framesLeft == 0 || !a.IsInWorld || a.IsDead())
 				world.AddFrameEndTask(w => w.Remove(this));
 		}
 

OpenRA.Mods.RA/HackyAI.cs

@@ -86,11 +86,18 @@ namespace OpenRA.Mods.RA
             return buildableThings.ElementAtOrDefault(random.Next(buildableThings.Count()));
         }
 
+		bool HasAdequatePower()
+		{
+			/* note: CNC `fact` provides a small amount of power. don't get jammed because of that. */
+			return playerPower.PowerProvided > 50 && 
+				playerPower.PowerProvided > playerPower.PowerDrained * 1.2;
+		}
+
 		ActorInfo ChooseBuildingToBuild(ProductionQueue queue)
 		{
 			var buildableThings = queue.BuildableItems();
 
-			if (playerPower.PowerProvided <= playerPower.PowerDrained * 1.2)	/* try to maintain 20% excess power */
+			if (!HasAdequatePower())	/* try to maintain 20% excess power */
 			{
 				/* find the best thing we can build which produces power */
 				var best = buildableThings.Where(a => GetPowerProvidedBy(a) > 0)

OpenRA.Mods.RA/Harvester.cs

@@ -153,7 +153,7 @@ namespace OpenRA.Mods.RA
 			{
 				if (order.TargetActor != LinkedProc)
 				{
-					if (LinkedProc != null)
+					if (LinkedProc != null && LinkedProc.IsInWorld)
 						LinkedProc.TraitsImplementing<IAcceptOre>().FirstOrDefault().UnlinkHarvester(LinkedProc,self);
 					LinkedProc = order.TargetActor;
 					LinkedProc.TraitsImplementing<IAcceptOre>().FirstOrDefault().LinkHarvester(LinkedProc,self);

OpenRA.Mods.RA/Minelayer.cs

@@ -110,8 +110,8 @@ namespace OpenRA.Mods.RA
 				}
 
 				var underCursor = world.FindUnitsAtMouse(mi.Location)
-					//.Where(a => a.Info.Traits.Contains<SelectableInfo>())
-					.OrderByDescending(a => a.Info.Traits.Contains<SelectableInfo>() ? a.Info.Traits.Get<SelectableInfo>().Priority : int.MinValue)
+					.OrderByDescending(a => a.Info.Traits.Contains<SelectableInfo>() 
+						? a.Info.Traits.Get<SelectableInfo>().Priority : int.MinValue)
 					.FirstOrDefault();
 
 				if (mi.Button == MouseButton.Right && underCursor == null)
@@ -120,13 +120,16 @@ namespace OpenRA.Mods.RA
 
 			public void Tick(World world)
 			{
-				if (minelayer.IsDead() || !minelayer.IsInWorld)
+				if (!minelayer.IsInWorld || minelayer.IsDead())
 					world.CancelInputMode();
 			}
 
 			int2 lastMousePos;
 			public void RenderAfterWorld(World world)
 			{
+				if (!minelayer.IsInWorld)
+					return;
+
 				var ml = minelayer.Trait<Minelayer>();
 				var movement = minelayer.Trait<IMove>();
 				var minefield = GetMinefieldCells(ml.minefieldStart, lastMousePos, minelayer.Info.Traits.Get<MinelayerInfo>().MinefieldDepth)

OpenRA.Mods.RA/RALoadScreen.cs

@@ -65,7 +65,6 @@ namespace OpenRA.Mods.RA
 			WidgetUtils.FillRectWithSprite(StripeRect, Stripe);			
 			r.RgbaSpriteRenderer.DrawSprite(Logo, LogoPos);
 			Font.DrawText(text, new float2(Renderer.Resolution.Width - textSize.X - 20, Renderer.Resolution.Height - textSize.Y - 20), Color.White);
-			r.RgbaSpriteRenderer.Flush();
 			r.EndFrame();
 		}
 	}

OpenRA.Mods.RA/Render/RenderBuilding.cs

@@ -77,7 +77,6 @@ namespace OpenRA.Mods.RA.Render
 
 		public void PlayCustomAnimBackwards(Actor self, string name, Action a)
 		{
-			var hasSequence = anim.HasSequence(NormalizeSequence(self, name));
 			anim.PlayBackwardsThen(NormalizeSequence(self, name),
 				() => { anim.PlayRepeating(NormalizeSequence(self, "idle")); a(); });
 		}

OpenRA.Mods.RA/Widgets/BuildPaletteWidget.cs

@@ -204,7 +204,6 @@ namespace OpenRA.Mods.RA.Widgets
 					new float2(origin.X - 9, origin.Y + 48 * w));
 			WidgetUtils.DrawRGBA(ChromeProvider.GetImage(paletteCollection, "bottom"),
 				new float2(origin.X - 9, origin.Y - 1 + 48 * numActualRows));
-			Game.Renderer.RgbaSpriteRenderer.Flush();
 
 
 			// Icons
@@ -270,8 +269,6 @@ namespace OpenRA.Mods.RA.Widgets
 			foreach (var ob in overlayBits)
 				WidgetUtils.DrawSHP(ob.First, ob.Second);
 
-			Game.Renderer.WorldSpriteRenderer.Flush();
-
 			// Tooltip
 			if (tooltipItem != null && !paletteAnimating && paletteOpen)
 				DrawProductionTooltip(world, tooltipItem, 
@@ -287,7 +284,6 @@ namespace OpenRA.Mods.RA.Widgets
 
 			WidgetUtils.DrawRGBA(ChromeProvider.GetImage(paletteCollection, "dock-bottom"),
 				new float2(Game.viewport.Width - 14, origin.Y - 1 + 48 * numActualRows));
-			Game.Renderer.RgbaSpriteRenderer.Flush();
 
 			return 48 * y + 9;
 		}
@@ -418,8 +414,6 @@ namespace OpenRA.Mods.RA.Widgets
 
 				y += tabHeight;
 			}
-			
-			Game.Renderer.RgbaSpriteRenderer.Flush();
 		}
 
 		void DrawRightAligned(string text, int2 pos, Color c)
@@ -482,8 +476,6 @@ namespace OpenRA.Mods.RA.Widgets
 			p += new int2(0, 15);
 			Game.Renderer.RegularFont.DrawText(tooltip.Description.Replace("\\n", "\n"), 
 				p.ToInt2(), Color.White);
-
-			Game.Renderer.RgbaSpriteRenderer.Flush();
 		}
 
         bool DoBuildingHotkey(char c, World world)

OpenRA.Mods.RA/Widgets/PowerBinWidget.cs

@@ -69,9 +69,6 @@ namespace OpenRA.Mods.RA.Widgets
 				}
 				Game.Renderer.LineRenderer.DrawLine(Game.viewport.Location + barStart + leftOffset, Game.viewport.Location + powerLevel + rightOffset, color, color);
 			}
-			// Draw on top of the sprite
-			Game.Renderer.RgbaSpriteRenderer.Flush();
-			Game.Renderer.LineRenderer.Flush();
 
 			// Power usage indicator
 			var indicator = ChromeProvider.GetImage( powerCollection, "power-indicator");
@@ -80,7 +77,6 @@ namespace OpenRA.Mods.RA.Widgets
 			float2 powerDrainLevel = new float2(lastPowerDrainedPos.Value - indicator.size.X / 2, barStart.Y - 1);
 
 			Game.Renderer.RgbaSpriteRenderer.DrawSprite(indicator, powerDrainLevel);
-			Game.Renderer.RgbaSpriteRenderer.Flush();
 		}
 	}
 }

OpenRA.Mods.RA/Widgets/RadarBinWidget.cs

@@ -137,7 +137,6 @@ namespace OpenRA.Mods.RA.Widgets
 				Game.Renderer.RgbaSpriteRenderer.DrawSprite(customTerrainSprite, o, s);
 				Game.Renderer.RgbaSpriteRenderer.DrawSprite(actorSprite, o, s);
 				Game.Renderer.RgbaSpriteRenderer.DrawSprite(shroudSprite, o, s);
-				Game.Renderer.RgbaSpriteRenderer.Flush();
 
 				// Draw viewport rect
 				if (radarAnimationFrame == radarSlideAnimationLength + radarActivateAnimationLength)
@@ -146,14 +145,12 @@ namespace OpenRA.Mods.RA.Widgets
 					var br = CellToMinimapPixel(new int2((int)((Game.viewport.Location.X + Game.viewport.Width)/Game.CellSize), (int)((Game.viewport.Location.Y + Game.viewport.Height)/Game.CellSize)));
 					var tr = new int2(br.X, tl.Y);
 					var bl = new int2(tl.X, br.Y);
-					Game.Renderer.LineRenderer.Flush();
-					Game.Renderer.Device.EnableScissor((int)mapRect.Left, (int)mapRect.Top, (int)mapRect.Width, (int)mapRect.Height);
+					Game.Renderer.EnableScissor((int)mapRect.Left, (int)mapRect.Top, (int)mapRect.Width, (int)mapRect.Height);
 					Game.Renderer.LineRenderer.DrawLine(Game.viewport.Location + tl, Game.viewport.Location + tr, Color.White, Color.White);
 					Game.Renderer.LineRenderer.DrawLine(Game.viewport.Location + tr, Game.viewport.Location + br, Color.White, Color.White);
 					Game.Renderer.LineRenderer.DrawLine(Game.viewport.Location + br, Game.viewport.Location + bl, Color.White, Color.White);
 					Game.Renderer.LineRenderer.DrawLine(Game.viewport.Location + bl, Game.viewport.Location + tl, Color.White, Color.White);
-					Game.Renderer.LineRenderer.Flush();
-					Game.Renderer.Device.DisableScissor();
+					Game.Renderer.DisableScissor();
 				}
 			}
 			

OpenRA.Mods.RA/Widgets/SpecialPowerBinWidget.cs

@@ -77,8 +77,6 @@ namespace OpenRA.Mods.RA.Widgets
 				WidgetUtils.DrawRGBA(WidgetUtils.GetChromeImage(world,"specialbin-middle"), new float2(rectBounds.X, rectBounds.Y + i * 51));
 			WidgetUtils.DrawRGBA(WidgetUtils.GetChromeImage(world,"specialbin-bottom"), new float2(rectBounds.X, rectBounds.Y + numPowers * 51));
 
-			Game.Renderer.RgbaSpriteRenderer.Flush();
-			
 			// Hack Hack Hack
 			rectBounds.Width = 69;
 			rectBounds.Height = 10 + numPowers * 51 + 21;
@@ -147,7 +145,6 @@ namespace OpenRA.Mods.RA.Widgets
 					y += 51;
 				}
 			}
-			Game.Renderer.WorldSpriteRenderer.Flush();
 		}
 		
 		Action<MouseInput> HandleSupportPower(SupportPower sp)

OpenRA.Mods.RA/World/SmudgeLayer.cs

@@ -85,7 +85,7 @@ namespace OpenRA.Mods.RA
 				if (world.LocalPlayer != null && !world.LocalPlayer.Shroud.IsExplored(kv.Key))
 					continue;
 
-				Game.Renderer.SpriteRenderer.DrawSprite(smudgeSprites[kv.Value.type- 1][kv.Value.image],
+				smudgeSprites[kv.Value.type- 1][kv.Value.image].DrawAt(
 						Game.CellSize * kv.Key, "terrain");
 			}
 		}

mods/cnc/chrome/mainmenu.yaml

@@ -67,9 +67,9 @@ Background@MAINMENU_BG:
 		Label@VERSION_STRING:
 			Id:VERSION_STRING
 			X:WINDOW_RIGHT - PARENT_LEFT - WIDTH - 15
-			Y:WINDOW_BOTTOM - PARENT_TOP - 25
+			Y:WINDOW_BOTTOM - PARENT_TOP - 65
 			Width:400
-			Height:35
+			Height:70
 			Text:
 			Align:Right
 			Bold:True

mods/cnc/chrome/serverbrowser.yaml

@@ -245,7 +245,7 @@ Background@JOINSERVER_BG:
 			Bold:True
 Background@DIRECTCONNECT_BG:
 	Id:DIRECTCONNECT_BG
-	Delegate:ServerBrowserDelegate
+	Delegate:DirectConnectDelegate
 	X:(WINDOW_RIGHT - WIDTH)/2
 	Y:(WINDOW_BOTTOM - HEIGHT)/2
 	Width:400

mods/cnc/chrome/settings.yaml

@@ -90,10 +90,22 @@ Background@SETTINGS_MENU:
 					Width:200
 					Height:20
 					Text: Enable Edge Scrolling
+				Label@EDGE_SCROLL_AMOUNT_LABEL:
+					Id:EDGE_SCROLL_AMOUNT_LABEL
+					X:0
+					Y:70
+					Text: Scroll Speed
+				Slider@EDGE_SCROLL_AMOUNT:
+					Id:EDGE_SCROLL_AMOUNT
+					X:130
+					Y:60
+					Width:250
+					Height:20
+					Ticks:5
 				Checkbox@INVERSE_SCROLL:
 					Id:INVERSE_SCROLL
 					X:0
-					Y:60
+					Y:120
 					Width:200
 					Height:20
 					Text: Invert Mouse Drag Scrolling

mods/ra/chrome/mainmenu.yaml

@@ -67,9 +67,9 @@ Background@MAINMENU_BG:
 		Label@VERSION_STRING:
 			Id:VERSION_STRING
 			X:WINDOW_RIGHT - PARENT_LEFT - WIDTH - 15
-			Y:WINDOW_BOTTOM - PARENT_TOP - 25
+			Y:WINDOW_BOTTOM - PARENT_TOP - 65
 			Width:400
-			Height:35
+			Height:70
 			Text:
 			Align:Right
 			Bold:True

mods/ra/chrome/serverbrowser.yaml

@@ -247,7 +247,7 @@ Background@JOINSERVER_BG:
 			Bold:True
 Background@DIRECTCONNECT_BG:
 	Id:DIRECTCONNECT_BG
-	Delegate:ServerBrowserDelegate
+	Delegate:DirectConnectDelegate
 	X:(WINDOW_RIGHT - WIDTH)/2
 	Y:(WINDOW_BOTTOM - HEIGHT)/2
 	Width:400

mods/ra/chrome/settings.yaml

@@ -91,10 +91,22 @@ Background@SETTINGS_MENU:
 					Width:200
 					Height:20
 					Text: Enable Edge Scrolling
+				Label@EDGE_SCROLL_AMOUNT_LABEL:
+					Id:EDGE_SCROLL_AMOUNT_LABEL
+					X:0
+					Y:70
+					Text: Scroll Speed
+				Slider@EDGE_SCROLL_AMOUNT:
+					Id:EDGE_SCROLL_AMOUNT
+					X:130
+					Y:60
+					Width:250
+					Height:20
+					Ticks:5
 				Checkbox@INVERSE_SCROLL:
 					Id:INVERSE_SCROLL
 					X:0
-					Y:60
+					Y:120
 					Width:200
 					Height:20
 					Text: Invert Mouse Drag Scrolling

mods/ra/rules/vehicles.yaml

@@ -468,6 +468,8 @@ SS:
 		PrimaryWeapon: TorpTube
 		PrimaryLocalOffset: -4,0,0,4,0,0
 		FireDelay: 2
+	Selectable:
+		Bounds: 38,38
 	Chronoshiftable:
 	IronCurtainable:
 	RepairableNear:
@@ -507,6 +509,8 @@ MSUB:
 	AttackBase:
 		PrimaryWeapon: SubMissile
 		FireDelay: 2
+	Selectable:
+		Bounds: 44,44
 	Chronoshiftable:
 	IronCurtainable:
 	RepairableNear:
@@ -539,11 +543,17 @@ DD:
 		PrimaryWeapon: Stinger
 		SecondaryWeapon: DepthCharge
 		PrimaryOffset: 0,-8,0,-3
+		PrimaryLocalOffset: -4,0,-20,4,0,20
+	Selectable:
+		Bounds: 38,38
 	RenderUnitTurreted:
 	AutoTarget:
 	Chronoshiftable:
 	IronCurtainable:
 	RepairableNear:
+	DetectCloaked:
+		Range: 4
+	RenderDetectionCircle:
 
 CA:
 	Inherits: ^Ship
@@ -577,6 +587,8 @@ CA:
 		PrimaryLocalOffset: -4,-5,0,4,-5,0
 		SecondaryLocalOffset: -4,-5,0,4,-5,0
 		Recoil: 4
+	Selectable:
+		Bounds: 44,44
 	RenderUnitTurreted:
 	AutoTarget:
 	Chronoshiftable:
@@ -638,6 +650,8 @@ PT:
 		PrimaryWeapon: 2Inch
 		SecondaryWeapon: DepthCharge
 		PrimaryOffset: 0,-6,0,-1
+	Selectable:
+		Bounds: 32,32
 	RenderUnitTurreted:
 	AutoTarget:
 	Chronoshiftable:
@@ -931,7 +945,7 @@ FTRK:
 		Name: Flak Truck
 		Description: Flak Truck, good for scouting.\n  Strong vs Light Vehicles\nand Aircraft, Weak vs Tanks 
 	Health:
-		HP: 300
+		HP: 120
 	Armor: 
 		Type: Light
 	Mobile:

mods/ra/sequences.yaml

@@ -1811,4 +1811,10 @@ ftrk:
 		Facings: 32
 	turret:
 		Start: 32
-		Facings: 32
+		Facings: 32
+
+bubbles:
+	idle:
+		Start: 0
+		Length: *
+		Tick: 220

mods/ra/weapons.yaml

@@ -663,6 +663,8 @@ Stinger:
 	ROF: 60
 	Range: 9
 	Report: MISSILE6
+	Burst: 2
+	BurstDelay: 0
 	ValidTargets: Ground, Air
 	Projectile: Missile
 		Arm: 3
@@ -696,9 +698,13 @@ TorpTube:
 	Underwater: yes
 	Burst: 2
 	BurstDelay: 1
-	Projectile: Bullet
+	Projectile: Missile
 		Image: MISSILE
+		Arm: 3
 		Speed: 6
+		Trail: bubbles
+		ROT: 1
+		RangeLimit: 160
 	Warhead:
 		Spread: 3
 		Versus: 
@@ -805,7 +811,7 @@ Heal:
 		
 SCUD:
 	ROF: 250
-	Range: 13
+	Range: 10
 	Report: MISSILE1
 	Projectile: Bullet
 		Speed: 10
@@ -828,7 +834,7 @@ SCUD:
 		WaterExplosion: large_splash
 		InfDeath: 2
 		SmudgeType: Crater
-		Damage: 700
+		Damage: 600
 		ImpactSound: firebl3
 		WaterImpactSound: splash9
 
@@ -950,10 +956,10 @@ FLAK-23:
 	Warhead:
 		Spread: 3
 		Versus: 
-			None: 70%
-			Wood: 50%
+			None: 40%
+			Wood: 10%
 			Light: 60%
-			Heavy: 60%
+			Heavy: 10%
 			Concrete: 20%
 		Explosion: med_explosion
 		Damage: 20

packaging/checkout-and-build.sh

@@ -0,0 +1,72 @@
+#!/bin/bash
+ARGS=3
+E_BADARGS=85
+
+if [ $# -ne "$ARGS" ]; then
+  echo "Usage: `basename $0` tag username password"
+  exit $E_BADARGS
+fi
+
+msg () {
+  echo -ne $1
+  echo $2
+  echo -ne "\E[0m"
+}
+
+TAG=$1
+
+VERSION=`echo $TAG | grep -o "[0-9]\\+-\\?[0-9]\\?"`
+
+_gitroot="git://github.com/chrisforbes/OpenRA.git"
+_gitname="OpenRA"
+
+if [ -z $VERSION ]; then
+    msg "\E[31m" "Malformed tag $TAG"
+    exit 1
+fi
+
+if [ ! -d ~/openra-package/ ]; then
+    mkdir ~/openra-package/
+fi
+pushd ~/openra-package/ &> /dev/null
+
+msg "\E[32m" "Connecting to GIT server...."
+
+if [ -d $_gitname ] ; then
+    pushd $_gitname &> /dev/null && git pull origin
+    msg "\E[32m" "The local files are updated."
+    popd &> /dev/null # $_gitname
+else
+    git clone $_gitroot $_gitname
+fi
+
+msg "\E[32m" "GIT checkout done or server timeout"
+
+rm -rf "$_gitname-build"
+git clone "$_gitname" "$_gitname-build"
+pushd "$_gitname-build" &> /dev/null
+
+msg "\E[32m" "Checking out $TAG"
+git checkout $TAG &> /dev/null
+if [ $? -ne 0 ]; then
+    msg "\E[31m" "Checkout of $TAG failed."
+    exit 1
+fi
+
+git describe --tags > "VERSION"
+
+msg "\E[32m" "Starting make..."
+make prefix=/usr DESTDIR=../built install
+if [ $? -ne 0 ]; then
+    msg "\E[31m" "Build failed."
+    exit 1
+fi
+
+pushd packaging &> /dev/null
+
+./package-all.sh $TAG $2 $3
+
+popd &> /dev/null # packaging
+popd &> /dev/null # $_gitname-build
+popd &> /dev/null # ~/openra-package/
+

packaging/linux/deb/DEBIAN/control

@@ -4,7 +4,7 @@ Architecture: i386
 Maintainer: Matthew Bowra-Dean <matthew@ijw.co.nz>
 Uploaders: Maikel van den Hout <ma1kelvdh@gmail.com>
 Installed-Size: 8306	
-Depends: nvidia-cg-toolkit (>= 2.2), libopenal1, mono-runtime, libmono-winforms2.0-cil, libfreetype6, libsdl1.2debian, libgl1-mesa-glx, libgl1-mesa-dri, zenity, wget, unzip
+Depends: nvidia-cg-toolkit (>= 2.1), libopenal1, mono-runtime, libmono-winforms2.0-cil, libfreetype6, libsdl1.2debian, libgl1-mesa-glx, libgl1-mesa-dri, zenity, wget, unzip
 Section: games
 Priority: extra
 Homepage: http://www.open-ra.org/

packaging/osx/buildpackage.sh

@@ -0,0 +1,39 @@
+#!/bin/bash
+
+# Files to include in the package
+# Specified relative to the build-dir (argument $1)
+FILES="OpenRA.Game.exe OpenRA.Gl.dll OpenRA.FileFormats.dll FreeSans.ttf FreeSansBold.ttf titles.ttf shaders mods/ra mods/cnc VERSION"
+
+# Files that match the above patterns, that should be excluded
+EXCLUDE="*.mdb"
+
+if [ $# -ne "2" ]; then
+	echo "Usage: `basename $0` build-dir version"
+    exit 1
+fi
+
+# Dirty build dir; last build failed?
+if [ -e "OpenRA.app" ]; then
+	echo "Error: OpenRA.app already exists"
+    exit 2
+fi
+
+# Copy the template to build the game package
+# Assumes it is layed out with the correct directory structure
+cp -rv template.app OpenRA.app
+
+for i in $FILES; do
+	cp -Rv "$1/$i" "OpenRA.app/Contents/Resources/$i" || exit 3
+done
+
+# Delete excluded files
+pushd "OpenRA.app/Contents/Resources/" &> /dev/null
+for i in $EXCLUDE; do
+	find . -path "$i" -delete
+done
+popd &> /dev/null
+
+# Package app bundle into a zip
+zip OpenRA-$2 -r -9 OpenRA.app
+rm -rf OpenRA.app
+echo "Done!"

packaging/osx/package-game.sh

@@ -1,31 +0,0 @@
-#!/bin/sh
-# OpenRA Packaging script for osx
-#    Packages game files into the launcher app
-#    previously created by the package-launcher script
-
-PACKAGING_PATH="$1/osxbuild"
-SOURCE_PATH="$1"
-BUNDLE_PATH="OpenRA.app"
-TARGET_PATH="$PACKAGING_PATH/OpenRA.app/Contents/Resources"
-
-FILES="OpenRA.Game.exe OpenRA.Gl.dll OpenRA.FileFormats.dll FreeSans.ttf FreeSansBold.ttf titles.ttf shaders mods/ra mods/cnc VERSION"
-EXCLUDE="*.mdb"
-
-# Copy source files into packaging dir
-mkdir -p $PACKAGING_PATH
-cp -r "$BUNDLE_PATH" "$PACKAGING_PATH/OpenRA.app"
-mkdir -p "$TARGET_PATH/mods"
-
-for i in $FILES; do
-	cp -R "$SOURCE_PATH/$i" "$TARGET_PATH/$i"
-done
-
-# Delete unwanted files
-cd $TARGET_PATH
-for i in $EXCLUDE; do
-	find . -path "$i" -delete
-done
-
-cd $PACKAGING_PATH
-zip OpenRA-$2 -r -9 OpenRA.app 
-echo "Done!"

packaging/osx/package-local.sh

@@ -1,32 +0,0 @@
-#!/bin/sh
-# OpenRA Packaging script for osx
-#    Packages game files into the launcher app
-#    previously created by the package-launcher script
-
-PWD=`pwd`
-PACKAGING_PATH="$PWD/osxbuild"
-SOURCE_PATH="$PWD/."
-BUNDLE_PATH="$SOURCE_PATH/packaging/osx/OpenRA.app"
-TARGET_PATH="$PACKAGING_PATH/OpenRA.app/Contents/Resources"
-
-FILES="OpenRA.Game.exe OpenRA.Gl.dll OpenRA.FileFormats.dll FreeSans.ttf FreeSansBold.ttf titles.ttf shaders mods/ra mods/cnc VERSION"
-EXCLUDE="*.mdb ./mods/cnc/packages/*.mix ./mods/ra/packages/*.mix  ./mods/cnc/packages/*.MIX ./mods/ra/packages/*.MIX"
-
-# Copy source files into packaging dir
-mkdir -p $PACKAGING_PATH
-cp -r "$BUNDLE_PATH" "$PACKAGING_PATH/OpenRA.app"
-mkdir -p "$TARGET_PATH/mods"
-
-for i in $FILES; do
-	cp -R "$i" "$TARGET_PATH/$i"
-done
-
-# Delete unwanted files
-cd $TARGET_PATH
-for i in $EXCLUDE; do
-	find . -path "$i" -delete
-done
-
-cd $PACKAGING_PATH
-zip OpenRA -r -9 OpenRA.app 
-echo "Done!"

packaging/package-all.sh

@@ -1,138 +1,122 @@
 #!/bin/bash
-
-TAG=$1
-
-VERSION=`echo $TAG | grep -o "[0-9]\\+-\\?[0-9]\\?"`
-
-_gitroot="git://github.com/chrisforbes/OpenRA.git"
-_gitname="OpenRA"
-
 msg () {
   echo -ne $1
   echo $2
   echo -ne "\E[0m"
 }
 
-if [ -z $VERSION ]; then
-  msg "\E[31m" "Malformed tag $TAG"
-  exit 1
-fi
+TAG=$1
 
-if [ ! -d ~/openra-package/ ]; then
-  mkdir ~/openra-package/
-fi
-pushd ~/openra-package/ &> /dev/null
+TYPE=`echo $TAG | grep -o "^[a-z]\\+"`
+VERSION=`echo $TAG | grep -o "[0-9]\\+-\\?[0-9]\\?"`
 
-msg "\E[32m" "Connecting to GIT server...."
+FTPSERVER=openra.res0l.net
 
-if [ -d $_gitname ] ; then
-  pushd $_gitname &> /dev/null && git pull origin
-  msg "\E[32m" "The local files are updated."
-  popd &> /dev/null # $_gitname
-else
-  git clone $_gitroot $_gitname
-fi
-
-msg "\E[32m" "GIT checkout done or server timeout"
-
-rm -rf "$_gitname-build"
-git clone "$_gitname" "$_gitname-build"
-pushd "$_gitname-build" &> /dev/null
-
-msg "\E[32m" "Checking out $TAG"
-git checkout $TAG &> /dev/null
-if [ $? -ne 0 ]; then
-  msg "\E[31m" "Checkout of $TAG failed."
-  exit 1
-fi
-
-git describe --tags > "VERSION"
-
-msg "\E[32m" "Starting make..."
-make prefix=/usr DESTDIR=../built install
-if [ $? -ne 0 ]; then
-  msg "\E[31m" "Build failed."
-  exit 1
-fi
-
-pushd packaging &> /dev/null
-
-####### *nix Builds #######
-pushd linux &> /dev/null
-
-#Desktop Icons
-BUILTDIR=../../../built
-mkdir -p $BUILTDIR/usr/share/applications/
-sed -i "3,3 d" openra-ra.desktop
-sed -i "3,3 i\Version=$VERSION" openra-ra.desktop
-sed -i "3,3 d" openra-cnc.desktop
-sed -i "3,3 i\Version=$VERSION" openra-cnc.desktop
-cp openra-ra.desktop $BUILTDIR/usr/share/applications/
-cp openra-cnc.desktop $BUILTDIR/usr/share/applications/
-
-#Menu entries
-mkdir -p $BUILTDIR/usr/share/menu/
-cp openra-ra $BUILTDIR/usr/share/menu/
-cp openra-cnc $BUILTDIR/usr/share/menu/
-
-#Icon images
-mkdir -p $BUILTDIR/usr/share/pixmaps/
-cp openra.32.xpm $BUILTDIR/usr/share/pixmaps/
-mkdir -p $BUILTDIR/usr/share/icons/
-cp -r hicolor $BUILTDIR/usr/share/icons/
-
-popd &> /dev/null
-
-#Arch-Linux
-msg "\E[34m" "Building Arch-Linux package."
-pushd linux/pkgbuild/ &> /dev/null
-sh buildpackage.sh "ftp.open-ra.org" "httpdocs/releases/linux" "$2" "$3" "$VERSION" &> package.log
-if [ $? -ne 0 ]; then
-  msg "\E[31m" "Package build failed, refer to log."
-fi
-popd &> /dev/null
-
-#RPM
-msg "\E[34m" "Building RPM package."
-pushd linux/rpm/ &> /dev/null
-sh buildpackage.sh "ftp.open-ra.org" "httpdocs/releases/linux" "$2" "$3" "$VERSION" ~/rpmbuild &> package.log
-if [ $? -ne 0 ]; then
-  msg "\E[31m" "Package build failed, refer to log."
-fi
-popd &> /dev/null
-
-#deb
-msg "\E[34m" "Building deb package."
-pushd linux/deb/ &> /dev/null
-./buildpackage.sh "ftp.open-ra.org" "httpdocs/releases/linux" "$2" "$3" "$VERSION" ~/openra-package/built ~/debpackage &> package.log
-if [ $? -ne 0 ]; then
-  msg "\E[31m" "Package build failed, refer to log."
-fi
-popd &> /dev/null
-
-####### OSX #######
-msg "\E[34m" "Building OSX package."
-pushd osx/ &>/dev/null
-sh package-game.sh ~/openra-package/$_gitname-build "$VERSION" &> package.log
-if [ $? -eq 0 ]; then
-  ../uploader.sh mac "$VERSION" ~/openra-package/$_gitname-build/osxbuild/OpenRA-$VERSION.zip "$2" "$3"
-else
-  msg "\E[31m" "Package build failed, refer to log."
-fi
-popd &> /dev/null
+case "$TYPE" in
+    "release") 
+        FTPPATH="openra.res0l.net/releases"
+        ;;
+    "playtest") 
+        FTPPATH="openra.res0l.net/playtests"
+        ;;
+    *)
+        msg "\E[31m" "Unrecognized tag prefix $TYPE"
+        exit 1
+        ;;
+esac
 
 ####### Windows #######
-msg "\E[34m" "Building Windows package."
-pushd windows/ &> /dev/null
-makensis -DSRCDIR=/home/openra/openra-package/$_gitname-build OpenRA.nsi &> package.log
-if [ $? -eq 0 ]; then
-  mv OpenRA.exe OpenRA-$VERSION.exe
-  ../uploader.sh windows "$VERSION" OpenRA-$VERSION.exe "$2" "$3"
-else
-  msg "\E[31m" "Package build failed, refer to log."  
-fi
-popd &> /dev/null
+(
+    msg "\E[34m" "Building Windows package."
+    pushd windows/ &> /dev/null
+    makensis -DSRCDIR=/home/openra/openra-package/OpenRA-build OpenRA.nsi &> package.log
+    if [ $? -eq 0 ]; then
+        mv OpenRA.exe OpenRA-$VERSION.exe
+        ../uploader.sh windows "$VERSION" OpenRA-$VERSION.exe "$FTPPATH" "$2" "$3"
+    else
+        msg "\E[31m" "Windows package build failed, refer to $PWD/package.log."  
+    fi
+    popd &> /dev/null
+) &
 
-popd &> /dev/null # packaging
-popd &> /dev/null # $_gitname-build
-popd &> /dev/null # ~/openra-package/
+####### OSX #######
+(
+    msg "\E[34m" "Building OSX package."
+    pushd osx/ &>/dev/null
+    sh buildpackage.sh /home/openra/openra-package/OpenRA-build "$VERSION" &> package.log
+    if [ $? -eq 0 ]; then
+        ../uploader.sh mac "$VERSION" OpenRA-$VERSION.zip "$FTPPATH" "$2" "$3"
+    else
+        msg "\E[31m" "OSX package build failed, refer to $PWD/package.log."
+    fi
+    popd &> /dev/null
+) &
+
+####### *nix Builds #######
+(
+    pushd linux &> /dev/null
+
+    #Desktop Icons
+    BUILTDIR=../../../built
+    mkdir -p $BUILTDIR/usr/share/applications/
+    sed -i "3,3 d" openra-ra.desktop
+    sed -i "3,3 i\Version=$VERSION" openra-ra.desktop
+    sed -i "3,3 d" openra-cnc.desktop
+    sed -i "3,3 i\Version=$VERSION" openra-cnc.desktop
+    cp openra-ra.desktop $BUILTDIR/usr/share/applications/
+    cp openra-cnc.desktop $BUILTDIR/usr/share/applications/
+
+    #Menu entries
+    mkdir -p $BUILTDIR/usr/share/menu/
+    cp openra-ra $BUILTDIR/usr/share/menu/
+    cp openra-cnc $BUILTDIR/usr/share/menu/
+
+    #Icon images
+    mkdir -p $BUILTDIR/usr/share/pixmaps/
+    cp openra.32.xpm $BUILTDIR/usr/share/pixmaps/
+    mkdir -p $BUILTDIR/usr/share/icons/
+    cp -r hicolor $BUILTDIR/usr/share/icons/
+
+    popd &> /dev/null
+    
+    (
+        #Arch-Linux
+        msg "\E[34m" "Building Arch-Linux package."
+        pushd linux/pkgbuild/ &> /dev/null
+        sh buildpackage.sh "$FTPSERVER" "$FTPPATH/linux" "$2" "$3" "$VERSION" &> package.log
+        if [ $? -ne 0 ]; then
+            msg "\E[31m" "Arch-Linux package build failed, refer to $PWD/package.log."
+        fi
+        popd &> /dev/null
+    ) &
+
+    (
+        #RPM
+        msg "\E[34m" "Building RPM package."
+        pushd linux/rpm/ &> /dev/null
+        sh buildpackage.sh "$FTPSERVER" "$FTPPATH/linux" "$2" "$3" "$VERSION" ~/rpmbuild &> package.log
+        if [ $? -ne 0 ]; then
+            msg "\E[31m" "RPM package build failed, refer to $PWD/package.log."
+        fi
+        popd &> /dev/null
+    ) &
+
+    (
+        #deb
+        msg "\E[34m" "Building deb package."
+        pushd linux/deb/ &> /dev/null
+        ./buildpackage.sh "$FTPSERVER" "$FTPPATH/linux" "$2" "$3" "$VERSION" ~/openra-package/built ~/debpackage &> package.log
+        if [ $? -ne 0 ]; then
+            msg "\E[31m" "deb package build failed, refer to $PWD/package.log."
+        fi
+        popd &> /dev/null
+    ) &
+    
+    wait
+) &
+
+wait
+
+if [ "$TYPE" = "release" ]; then
+    wput --basename=../ -u ../VERSION ftp://$FTPSERVER/$FTPPATH/master/
+fi

packaging/uploader.sh

@@ -6,8 +6,9 @@
 PLATFORM=$1
 VERSION=$2
 FILENAME=$3
+FTPPATH=$4
 
-FTP="ftp://$4:$5@ftp.open-ra.org/httpdocs/releases/${PLATFORM}/"
+FTP="ftp://$5:$6@openra.res0l.net/${FTPPATH}/${PLATFORM}/"
 
 if [ ! -e "${FILENAME}" ]; then
 	echo "File not found: ${FILENAME}"

packaging/windows/OpenRA.nsi

@@ -17,6 +17,8 @@
 
 !include "MUI2.nsh"
 !include "ZipDLL.nsh"
+!include "FileFunc.nsh"
+!include "WordFunc.nsh"
 
 Name "OpenRA"
 OutFile "OpenRA.exe"
@@ -178,7 +180,11 @@ SectionGroupEnd
 ;***************************
 Section "-OpenAl" OpenAl
 	AddSize 768
-	IfFileExists $SYSDIR\OpenAL32.dll done installal
+	ClearErrors
+	${GetFileVersion} $SYSDIR\OpenAL32.dll $0
+	IfErrors installal 0
+	${VersionCompare} $0 "6.14.357.24" $1
+	IntCmp $1 1 done done installal
 	installal:
 		SetOutPath "$TEMP"
 		NSISdl::download http://connect.creativelabs.com/openal/Downloads/oalinst.zip oalinst.zip

shaders/chrome-rgba.fx

@@ -48,3 +48,16 @@ technique high_quality {
 		BlendFunc = int2( SrcAlpha, OneMinusSrcAlpha );
 	}
 }
+
+technique high_quality_cg21 {
+	pass p0	{
+		BlendEnable = true;
+		DepthTestEnable = false;
+		CullFaceEnable = false;
+		VertexProgram = compile arbvp1 Simple_vp();
+		FragmentProgram = compile arbfp1 Simple_fp();
+		
+		BlendEquation = FuncAdd;
+		BlendFunc = int2( SrcAlpha, OneMinusSrcAlpha );
+	}
+}

shaders/chrome-shp.fx

@@ -66,3 +66,15 @@ technique low_quality {
 	}
 }
 
+technique low_quality_cg21 {
+	pass p0 {
+		BlendEnable = true;
+		DepthTestEnable = false;
+		CullFaceEnable = false;
+		VertexProgram = compile arbvp1 Simple_vp();
+		FragmentProgram = compile arbfp1 Palette_fp();
+
+		BlendEquation = FuncAdd;
+		BlendFunc = int2( SrcAlpha, OneMinusSrcAlpha );
+	}
+}

shaders/line.fx

@@ -41,3 +41,17 @@ technique high_quality {
 		BlendFunc = int2( SrcAlpha, OneMinusSrcAlpha );
 	}
 }
+
+technique high_quality_cg21 {
+	pass p0	{
+		BlendEnable = true;
+		DepthTestEnable = false;
+		//CullMode = None;
+		//FillMode = Wireframe;
+		VertexProgram = compile arbvp1 Simple_vp();
+		FragmentProgram = compile arbfp1 Simple_fp();
+		
+		BlendEquation = FuncAdd;
+		BlendFunc = int2( SrcAlpha, OneMinusSrcAlpha );
+	}
+}

shaders/world-shp.fx

@@ -65,3 +65,16 @@ technique low_quality {
 		BlendFunc = int2( SrcAlpha, OneMinusSrcAlpha );
 	}
 }
+
+technique low_quality_cg21 {
+	pass p0 {
+		BlendEnable = true;
+		DepthTestEnable = false;
+		CullFaceEnable = false;
+		VertexProgram = compile arbvp1 Simple_vp();
+		FragmentProgram = compile arbfp1 Palette_fp();
+
+		BlendEquation = FuncAdd;
+		BlendFunc = int2( SrcAlpha, OneMinusSrcAlpha );
+	}
+}