Merge branch 'master' of git://github.com/chrisforbes/OpenRA

OpenRa.Game/Graphics/WorldRenderer.cs

@@ -190,10 +190,18 @@ namespace OpenRa.Game.Graphics
 					pipImages.PlayRepeating(pipStrings[(int)pip]);
 					spriteRenderer.DrawSprite(pipImages.Image, pipxyBase + pipxyOffset, 0);
 					pipxyOffset += new float2(4, 0);
+					
+					if (pipxyOffset.X+5 > selectedUnit.SelectedSize.X)
+					{
+						//spriteRenderer.Flush();
+						pipxyOffset.X = 0;
+						pipxyOffset.Y -= 4;
+					}
 				}
 				// Increment row
 				pipxyOffset.X = 0;
 				pipxyOffset.Y -= 5;
+				//spriteRenderer.Flush();
 			}
 		}
 		

OpenRa.Game/MainWindow.cs

@@ -104,7 +104,7 @@ namespace OpenRa.Game
 		{
 			base.OnMouseMove(e);
 
-			if (e.Button == MouseButtons.Middle)
+			if (e.Button == MouseButtons.Middle || e.Button == (MouseButtons.Left | MouseButtons.Right))
 			{
 				int2 p = new int2(e.Location);
 				Game.viewport.Scroll(lastPos - p);

OpenRa.Game/Traits/Harvester.cs

@@ -57,7 +57,7 @@ namespace OpenRa.Game.Traits
 
 		public IEnumerable<PipType> GetPips()
 		{
-			const int numPips = 7;
+			const int numPips = 20;
 			for (int i = 0; i < numPips; i++)
 			{
 				if (gemsCarried * 1.0f / Rules.General.BailCount > i * 1.0f / numPips)