suspecting drag instead

Moved to http://github.com/beedee/OpenRAWebsite/

HACKING

@@ -5,43 +5,82 @@ There are n main sections to OpenRA: UI, Rendering, unit behaviour, ...
 All  units/structures/most things in the map are Actors. Actors contain a  collection of traits.
 Traits consist of an info class and a  class that does stuff
 
-Actor assembly is done via the mod's yaml files. A section  exists for each actor type, and within that section we list the traits  the actor should have. These get looked up in the loaded mod DLLs. Each trait can contain properties, which are automatically loaded into the corresponding fields on the trait's ITraitInfo.
+Actor assembly is done via the mod's yaml files. A section  exists for each actor type, 
+and within that section we list the traits  the actor should have. 
+These get looked up in the loaded mod DLLs. Each trait can contain properties, 
+which are automatically loaded into the corresponding fields on the trait's ITraitInfo.
 
 - Traits: look at TraitInterfaces.cs
-    We've tried to make individual traits implement as self-contained a unit of functionality as possible - all cross-trait references should be in terms of an interface from TraitInterfaces.cs.
+    We've tried to make individual traits implement as self-contained a unit of functionality 
+    as possible - all cross-trait references should be in terms of an interface from 
+    TraitInterfaces.cs.
     
-- Things an actor can be *doing* are represented as IActivity implementations. Actor has a queue of these. There's a standard set of activities in OpenRa.Game/Traits/Activities, and mods tend to define more as they need them. (RA defines various special-infantry actions as activities).
+- Things an actor can be *doing* are represented as IActivity implementations. 
+    Actor has a queue of these. There's a standard set of activities in 
+    OpenRa.Game/Traits/Activities, and mods tend to define more as they need them. (RA 
+    defines various special-infantry actions as activities).
 
-- Units offer orders they can perform (given context) through traits that implement IIssueOrder. Every trait with this interface is given a chance to generate orders for the current context.
+- Units offer orders they can perform (given context) through traits that implement IIssueOrder. 
+  Every trait with this interface is given a chance to generate orders for the current context.
 
-- For more complex things that require modal UI (like special abilities, RA-style sell/repair buttons, etc) we have IOrderGenerator implementations. This can completely replace the normal actors-provide-orders model temporarily. IOGs wiring is provided through OpenRa.Game/Controller.cs (ToggleInputMode<T>, CancelInputMode)
+- For more complex things that require modal UI (like special abilities, 
+  RA-style sell/repair buttons, etc) we have IOrderGenerator implementations. This can 
+  completely replace the normal actors-provide-orders model temporarily. IOGs wiring is 
+  provided through OpenRa.Game/Controller.cs (ToggleInputMode<T>, CancelInputMode)
 
-- Things that don't affect gameplay, or (increasingly) are just transient are implemented as IEffect, rather than real Actors. This is similar to the temp ents mechanism in many other game engines.
+- Things that don't affect gameplay, or (increasingly) are just transient are implemented as 
+  IEffect, rather than real Actors. This is similar to the temp ents mechanism in many other 
+  game engines.
 
-- Most player-level or global-level game behavior is implemented as traits on special Player and World actors. These are accessible via Player.PlayerActor and World.WorldActor. This includes production queue support, ore/tiberium growth, various palette manipulation magic.
+- Most player-level or global-level game behavior is implemented as traits on special Player 
+  and World actors. These are accessible via Player.PlayerActor and World.WorldActor. This 
+  includes production queue support, ore/tiberium growth, various palette manipulation magic.
 
-- Many traits can be modified by adding an appropriate IFooModifier implementation to the unit. This includes rendering, where IRenderModifier allows you to define an arbitrary transform on the Renderables emitted by the actor's IRender implementation(s). Examples are things like cloaking, invisibility to certain players, flying units with shadows, etc. Other modifiers can affect movement speed, damage taken, weapon firepower, etc.
+- Many traits can be modified by adding an appropriate IFooModifier implementation to the unit.
+  This includes rendering, where IRenderModifier allows you to define an arbitrary transform on 
+  the Renderables emitted by the actor's IRender implementation(s). Examples are things like 
+  cloaking, invisibility to certain players, flying units with shadows, etc. Other modifiers 
+  can affect movement speed, damage taken, weapon firepower, etc.
 
-Game code is collected into "Mod" units. Mods can be added prior to starting the game. Currently there is no dependancy mechanism, but provided you are doing additions or overrides you can add multiple mods without problem.
+Game code is collected into "Mod" units. Mods can be added prior to starting the game. 
+Currently there is no dependancy mechanism, but provided you are doing additions or overrides 
+you can add multiple mods without problem.
 Everything is a mod  (including RA - which is loaded by default). 
 
-The contents of the mod is defined in a manifest file mod.yaml. This lists the packages containing art assets (typically .mix files), yaml files defining actor defintions, and ini files containing legacy information that have yet to be ported over to the (relatively new) yaml system.
+The contents of the mod is defined in a manifest file mod.yaml. This lists the packages 
+containing art assets (typically .mix files), yaml files defining actor defintions, 
+and ini files containing legacy information that have yet to be ported over to 
+the (relatively new) yaml system.
 
-The unit artwork itself must be defined in a Sequences file (typically Sequences.xml; check mod.yaml for a list of what the mod uses); the format is self explanatory. There is also the SequenceEditor tool to make this easy.
+The unit artwork itself must be defined in a Sequences file (typically Sequences.xml; 
+check mod.yaml for a list of what the mod uses); the format is self explanatory. There is 
+also the SequenceEditor tool to make this easy.
 
-Chrome artwork is similarly defined in Chrome.xml. Chrome is already mod dependent. Sortof ;) mod-dependent *behavior* would be nice too, not just skinning. This is a property of the traits however; once we port UI into traits this will become a non-issue.
+Chrome artwork is similarly defined in Chrome.xml. Chrome is already mod dependent. Sortof ;) 
+mod-dependent *behavior* would be nice too, not just skinning. This is a property of the traits
+however; once we port UI into traits this will become a non-issue.
 
 Rendering
 OpenRa.Game/Chrome.cs is the user interface. 
-Three renderers (SpriteRenderer, LineRenderer, Rgba?Renderer) render most stuff. Don't forget to flush the renderer (if you want to see anything).
+Three renderers (SpriteRenderer, LineRenderer, Rgba?Renderer) render most stuff. Don't forget 
+to flush the renderer (if you want to see anything).
 
-UserSettings stores the data loaded from settings.ini (or defaults). Eventually we need to be able to save values changed in game into settings.ini (not yet implemented)
+UserSettings stores the data loaded from settings.ini (or defaults). Eventually we need to be 
+able to save values changed in game into settings.ini (not yet implemented)
 
-Bugs: There is a list of known bugs and features at http://red-bull.ijw.co.nz:3690/OpenRA . There's also a few at http://github.com/chrisforbes/OpenRA/issues (which won't be ported over, but no more bugs should be added here).
+Bugs: There is a list of known bugs and features at http://red-bull.ijw.co.nz:3690/OpenRA .
 
 We also have a website at http://www.open-ra.org/ . 
 
-As far as using git, get your own repository on github. You probably want to set up the gitbot to spam irc when you make commits (its nice to know). Push your changes into your git repository, and it will/might :P be merged into chrisforbes/OpenRA . Alli: setup howto for this?
+Our IRC channel is #openra on irc.freenode.net .
+
+As far as using git, get your own repository on github. You probably want to set up the gitbot
+to spam irc when you make commits (its nice to know). Push your changes into your git 
+repository, and it will/might :P be merged into chrisforbes/OpenRA . 
+See http://help.github.com/ for working with GitHub and see http://progit.org/ for working 
+with Git.
+
+
 
 Other things we probably want to put in here:
     - A guide on how to add a generic unit via yaml using existing traits
@@ -50,6 +89,6 @@ Other things we probably want to put in here:
     - VFS (OpenRa.FileFormats.FileSystem, Package, Folder classes)
     - Trait inheritance (and the magicness of ^ActorType)
     - Removing inherited traits (prepend `-` to the trait name)
-    - Multiple instances of a trait (`@` and all subsequent characters are ignored for the purposes 
-        of looking up the trait.
+    - Multiple instances of a trait (`@` and all subsequent characters are ignored for 
+        the purposes of looking up the trait.
 

OpenRA.Editor/Form1.cs

@@ -11,15 +11,12 @@
 using System;
 using System.Collections.Generic;
 using System.Drawing;
-using System.Drawing.Imaging;
 using System.IO;
 using System.Linq;
 using System.Windows.Forms;
 using OpenRA.FileFormats;
-using OpenRA.GameRules;
-using OpenRA.Traits;
-using OpenRA.Widgets;
 using OpenRA.Graphics;
+using OpenRA.Traits;
 
 namespace OpenRA.Editor
 {
@@ -39,6 +36,9 @@ 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; }
@@ -86,6 +86,7 @@ namespace OpenRA.Editor
 			MakeDirty();
 		}
 
+		// this code is insanely stupid, and mostly my fault -- chrisf
 		void PrepareMapResources(Manifest manifest, Map map)
 		{
 			Rules.LoadRules(manifest, map);
@@ -102,7 +103,7 @@ namespace OpenRA.Editor
 			{
 				try
 				{
-					var bitmap = RenderTemplate(tileset, (ushort)t.Key, palette);
+					var bitmap = RenderUtils.RenderTemplate(tileset, (ushort)t.Key, palette);
 					var ibox = new PictureBox
 					{
 						Image = bitmap,
@@ -134,7 +135,7 @@ namespace OpenRA.Editor
 				{
 					var info = Rules.Info[a];
 					if (!info.Traits.Contains<RenderSimpleInfo>()) continue;
-					var template = RenderActor(info, tileset, palette);
+					var template = RenderUtils.RenderActor(info, tileset, palette);
 					var ibox = new PictureBox
 					{
 						Image = template.Bitmap,
@@ -166,7 +167,7 @@ namespace OpenRA.Editor
 			{
 				try
 				{
-					var template = RenderResourceType(a, tileset.Extensions, palette);
+					var template = RenderUtils.RenderResourceType(a, tileset.Extensions, palette);
 					var ibox = new PictureBox
 					{
 						Image = template.Bitmap,
@@ -202,153 +203,6 @@ namespace OpenRA.Editor
 			pmMiniMap.Image = Minimap.AddStaticResources(surface1.Map, Minimap.TerrainBitmap(surface1.Map, true));
 		}
 
-		static Bitmap RenderTemplate(TileSet ts, ushort n, Palette p)
-		{
-			var template = ts.Templates[n];
-			var tile = ts.Tiles[n];
-
-			var bitmap = new Bitmap(ts.TileSize * template.Size.X, ts.TileSize * template.Size.Y);
-			var data = bitmap.LockBits(new Rectangle(0, 0, bitmap.Width, bitmap.Height),
-				ImageLockMode.WriteOnly, PixelFormat.Format32bppArgb);
-
-			unsafe
-			{
-				int* q = (int*)data.Scan0.ToPointer();
-				var stride = data.Stride >> 2;
-
-				for (var u = 0; u < template.Size.X; u++)
-					for (var v = 0; v < template.Size.Y; v++)
-						if (tile.TileBitmapBytes[u + v * template.Size.X] != null)
-						{
-							var rawImage = tile.TileBitmapBytes[u + v * template.Size.X];
-							for (var i = 0; i < ts.TileSize; i++)
-								for (var j = 0; j < ts.TileSize; j++)
-									q[(v * ts.TileSize + j) * stride + u * ts.TileSize + i] = p.GetColor(rawImage[i + ts.TileSize * j]).ToArgb();
-						}
-						else
-						{
-							for (var i = 0; i < ts.TileSize; i++)
-								for (var j = 0; j < ts.TileSize; j++)
-									q[(v * ts.TileSize + j) * stride + u * ts.TileSize + i] = Color.Transparent.ToArgb();
-						}
-			}
-
-			bitmap.UnlockBits(data);
-			return bitmap;
-		}
-
-		static ActorTemplate RenderActor(ActorInfo info, TileSet tileset, Palette p)
-		{
-			var ri = info.Traits.Get<RenderSimpleInfo>();
-			string image = null;
-			if (ri.OverrideTheater != null)
-				for (int i = 0; i < ri.OverrideTheater.Length; i++)
-					if (ri.OverrideTheater[i] == tileset.Id)
-						image = ri.OverrideImage[i];
-
-			image = image ?? ri.Image ?? info.Name;
-			using (var s = FileSystem.OpenWithExts(image, tileset.Extensions))
-			{
-				var shp = new ShpReader(s);
-				var frame = shp[0];
-
-				var bitmap = new Bitmap(shp.Width, shp.Height);
-				var data = bitmap.LockBits(new Rectangle(0, 0, bitmap.Width, bitmap.Height),
-					ImageLockMode.WriteOnly, PixelFormat.Format32bppArgb);
-
-				unsafe
-				{
-					int* q = (int*)data.Scan0.ToPointer();
-					var stride = data.Stride >> 2;
-
-					for (var i = 0; i < shp.Width; i++)
-						for (var j = 0; j < shp.Height; j++)
-							q[j * stride + i] = p.GetColor(frame.Image[i + shp.Width * j]).ToArgb();
-				}
-
-				bitmap.UnlockBits(data);
-
-                try
-                {
-                    using (var s2 = FileSystem.OpenWithExts(image + "2", tileset.Extensions))
-                    {
-                        shp = new ShpReader(s2);
-                        frame = shp[0];
-
-                        var bitmap2 = new Bitmap(shp.Width, shp.Height);
-                        var data2 = bitmap2.LockBits(new Rectangle(0, 0, bitmap2.Width, bitmap2.Height),
-                            ImageLockMode.WriteOnly, PixelFormat.Format32bppArgb);
-
-                        unsafe
-                        {
-                            int* q = (int*)data2.Scan0.ToPointer();
-                            var stride2 = data2.Stride >> 2;
-
-                            for (var i = 0; i < shp.Width; i++)
-                                for (var j = 0; j < shp.Height; j++)
-                                    q[j * stride2 + i] = p.GetColor(frame.Image[i + shp.Width * j]).ToArgb();
-                        }
-
-                        bitmap2.UnlockBits(data);
-                        System.Drawing.Bitmap finalImage = null;
-                        finalImage = new System.Drawing.Bitmap(bitmap2.Width, bitmap2.Height);
-
-                        using (System.Drawing.Graphics g = System.Drawing.Graphics.FromImage(finalImage))
-                        {
-                            //set background color
-                            g.Clear(System.Drawing.Color.Transparent);
-
-                            //go through each image and draw it on the final image
-                            int offset = 0;
-                                g.DrawImage(bitmap,
-                                  new System.Drawing.Rectangle(offset, 0, bitmap.Width, bitmap.Height));
-                                g.DrawImage(bitmap2,
-                                  new System.Drawing.Rectangle(offset, 0, bitmap2.Width, bitmap2.Height));
-
-                        }
-                        
-                        bitmap = finalImage;
-
-                    }
-                }
-                catch (Exception ed)
-                {
-                    //
-                }
-
-
-
-				return new ActorTemplate { Bitmap = bitmap, Info = info, Centered = !info.Traits.Contains<BuildingInfo>() };
-			}
-		}
-
-		static ResourceTemplate RenderResourceType(ResourceTypeInfo info, string[] exts, Palette p)
-		{
-			var image = info.SpriteNames[0];
-			using (var s = FileSystem.OpenWithExts(image, exts))
-			{
-				var shp = new ShpReader(s);
-				var frame = shp[shp.ImageCount - 1];
-
-				var bitmap = new Bitmap(shp.Width, shp.Height);
-				var data = bitmap.LockBits(new Rectangle(0, 0, bitmap.Width, bitmap.Height),
-					ImageLockMode.WriteOnly, PixelFormat.Format32bppArgb);
-
-				unsafe
-				{
-					int* q = (int*)data.Scan0.ToPointer();
-					var stride = data.Stride >> 2;
-
-					for (var i = 0; i < shp.Width; i++)
-						for (var j = 0; j < shp.Height; j++)
-							q[j * stride + i] = p.GetColor(frame.Image[i + shp.Width * j]).ToArgb();
-				}
-
-				bitmap.UnlockBits(data);
-				return new ResourceTemplate { Bitmap = bitmap, Info = info, Value = shp.ImageCount - 1 };
-			}
-		}
-
 		void ResizeClicked(object sender, EventArgs e)
 		{
 			using (var rd = new ResizeDialog())
@@ -522,7 +376,7 @@ namespace OpenRA.Editor
 		{
 			if (!dirty) return;
 
-			switch (MessageBox.Show("The map has been modified since it was last saved. Save changes now?",
+			switch (MessageBox.Show("The map has been modified since it was last saved. " + "\r\n" + "Save changes now?",
 				"Unsaved Changes", MessageBoxButtons.YesNoCancel, MessageBoxIcon.Exclamation))
 			{
 				case DialogResult.Yes: SaveClicked(null, EventArgs.Empty); break;
@@ -569,4 +423,4 @@ namespace OpenRA.Editor
             catch { }
         }
 	}
-}
+}

OpenRA.Editor/OpenRA.Editor.csproj

@@ -125,6 +125,7 @@
       <DependentUpon>Settings.settings</DependentUpon>
       <DesignTimeSharedInput>True</DesignTimeSharedInput>
     </Compile>
+    <Compile Include="RenderUtils.cs" />
     <Compile Include="ResizeDialog.cs">
       <SubType>Form</SubType>
     </Compile>

OpenRA.Editor/RenderUtils.cs

@@ -0,0 +1,136 @@
+#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.Drawing;
+using System.Drawing.Imaging;
+using OpenRA.FileFormats;
+using OpenRA.Traits;
+
+namespace OpenRA.Editor
+{
+	static class RenderUtils
+	{
+		public static Bitmap RenderTemplate(TileSet ts, ushort n, Palette p)
+		{
+			var template = ts.Templates[n];
+			var tile = ts.Tiles[n];
+
+			var bitmap = new Bitmap(ts.TileSize * template.Size.X, ts.TileSize * template.Size.Y);
+			var data = bitmap.LockBits(new Rectangle(0, 0, bitmap.Width, bitmap.Height),
+				ImageLockMode.WriteOnly, PixelFormat.Format32bppArgb);
+
+			unsafe
+			{
+				int* q = (int*)data.Scan0.ToPointer();
+				var stride = data.Stride >> 2;
+
+				for (var u = 0; u < template.Size.X; u++)
+					for (var v = 0; v < template.Size.Y; v++)
+						if (tile.TileBitmapBytes[u + v * template.Size.X] != null)
+						{
+							var rawImage = tile.TileBitmapBytes[u + v * template.Size.X];
+							for (var i = 0; i < ts.TileSize; i++)
+								for (var j = 0; j < ts.TileSize; j++)
+									q[(v * ts.TileSize + j) * stride + u * ts.TileSize + i] = p.GetColor(rawImage[i + ts.TileSize * j]).ToArgb();
+						}
+						else
+						{
+							for (var i = 0; i < ts.TileSize; i++)
+								for (var j = 0; j < ts.TileSize; j++)
+									q[(v * ts.TileSize + j) * stride + u * ts.TileSize + i] = Color.Transparent.ToArgb();
+						}
+			}
+
+			bitmap.UnlockBits(data);
+			return bitmap;
+		}
+
+		static Bitmap RenderShp(ShpReader shp, Palette p)
+		{
+			var frame = shp[0];
+
+			var bitmap = new Bitmap(shp.Width, shp.Height);
+			var data = bitmap.LockBits(new Rectangle(0, 0, bitmap.Width, bitmap.Height),
+				ImageLockMode.WriteOnly, PixelFormat.Format32bppArgb);
+
+			unsafe
+			{
+				int* q = (int*)data.Scan0.ToPointer();
+				var stride2 = data.Stride >> 2;
+
+				for (var i = 0; i < shp.Width; i++)
+					for (var j = 0; j < shp.Height; j++)
+						q[j * stride2 + i] = p.GetColor(frame.Image[i + shp.Width * j]).ToArgb();
+			}
+
+			bitmap.UnlockBits(data);
+			return bitmap;
+		}
+
+		public static ActorTemplate RenderActor(ActorInfo info, TileSet tileset, Palette p)
+		{
+			var ri = info.Traits.Get<RenderSimpleInfo>();
+			string image = null;
+			if (ri.OverrideTheater != null)
+				for (int i = 0; i < ri.OverrideTheater.Length; i++)
+					if (ri.OverrideTheater[i] == tileset.Id)
+						image = ri.OverrideImage[i];
+
+			image = image ?? ri.Image ?? info.Name;
+			using (var s = FileSystem.OpenWithExts(image, tileset.Extensions))
+			{
+				var shp = new ShpReader(s);
+				var bitmap = RenderShp(shp, p);
+
+				try
+				{
+					using (var s2 = FileSystem.OpenWithExts(image + "2", tileset.Extensions))
+					{
+						var shp2 = new ShpReader(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, Info = info, Centered = !info.Traits.Contains<BuildingInfo>() };
+			}
+		}
+
+		public static ResourceTemplate RenderResourceType(ResourceTypeInfo info, string[] exts, Palette p)
+		{
+			var image = info.SpriteNames[0];
+			using (var s = FileSystem.OpenWithExts(image, exts))
+			{
+				var shp = new ShpReader(s);
+				var frame = shp[shp.ImageCount - 1];
+
+				var bitmap = new Bitmap(shp.Width, shp.Height);
+				var data = bitmap.LockBits(new Rectangle(0, 0, bitmap.Width, bitmap.Height),
+					ImageLockMode.WriteOnly, PixelFormat.Format32bppArgb);
+
+				unsafe
+				{
+					int* q = (int*)data.Scan0.ToPointer();
+					var stride = data.Stride >> 2;
+
+					for (var i = 0; i < shp.Width; i++)
+						for (var j = 0; j < shp.Height; j++)
+							q[j * stride + i] = p.GetColor(frame.Image[i + shp.Width * j]).ToArgb();
+				}
+
+				bitmap.UnlockBits(data);
+				return new ResourceTemplate { Bitmap = bitmap, Info = info, Value = shp.ImageCount - 1 };
+			}
+		}
+	}
+}

OpenRA.FileFormats/Thirdparty/Random.cs

@@ -18,6 +18,8 @@ namespace OpenRA.Thirdparty
 	{
 		uint[] mt = new uint[624];
 		int index = 0;
+		
+		public int Last;
 
 		public Random() : this(Environment.TickCount) { }
 		
@@ -39,7 +41,8 @@ namespace OpenRA.Thirdparty
 			y ^= y >> 18;
 
 			index = (index + 1) % 624;
-			return (int)(y % int.MaxValue);
+			Last = (int)(y % int.MaxValue);
+			return Last;
 		}
 
 		public int Next(int low, int high) { return low + Next() % (high - low); }

OpenRA.Game/Actor.cs

@@ -6,17 +6,16 @@
  * as published by the Free Software Foundation. For more information,
  * see LICENSE.
  */
-#endregion
-
-using System;
-using System.Collections.Generic;
-using System.Drawing;
-using System.Linq;
-using OpenRA.FileFormats;
-using OpenRA.GameRules;
-using OpenRA.Traits;
-using OpenRA.Traits.Activities;
-using OpenRA.Support;
+#endregion
+
+using System;
+using System.Collections.Generic;
+using System.Drawing;
+using System.Linq;
+using OpenRA.FileFormats;
+using OpenRA.Support;
+using OpenRA.Traits;
+using OpenRA.Traits.Activities;
 
 namespace OpenRA
 {

OpenRA.Game/Game.cs

@@ -18,11 +18,9 @@ using OpenRA.GameRules;
 using OpenRA.Graphics;
 using OpenRA.Network;
 using OpenRA.Server;
-using OpenRA.Support;
-using OpenRA.Traits;
-using OpenRA.Widgets;
-
-using Timer = OpenRA.Support.Timer;
+using OpenRA.Support;
+using OpenRA.Widgets;
+
 using XRandom = OpenRA.Thirdparty.Random;
 
 namespace OpenRA
@@ -294,9 +292,9 @@ namespace OpenRA
 		public static void Exit() { quit = true; }
 
 		public static Action<Color,string,string> AddChatLine = (c,n,s) => {};
-
+
 		public static void Debug(string s, params object[] args)
-		{
+		{
 			AddChatLine(Color.White, "Debug", String.Format(s,args)); 
 		}
 

OpenRA.Game/Graphics/Viewport.cs

@@ -158,5 +158,13 @@ namespace OpenRA.Graphics
 			if (localPlayer.Shroud.Disabled) return null;
 			return localPlayer.Shroud.Bounds;
 		}
+		
+		public Rectangle ViewBounds()
+		{
+			int2 boundary = new int2(1,1); // Add a curtain of cells around the viewport to account for rounding errors
+			var tl = ViewToWorld(int2.Zero).ToInt2() - boundary;
+			var br = ViewToWorld(new int2(Width, Height)).ToInt2() + boundary;
+			return Rectangle.FromLTRB(tl.X, tl.Y, br.X, br.Y);
+		}
 	}
 }

OpenRA.Game/Network/SyncReport.cs

@@ -3,61 +3,87 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using OpenRA.FileFormats;
+using OpenRA.Support;
 
 namespace OpenRA.Network
 {
 	class SyncReport
 	{
-		Queue<Pair<int, string>> syncReports = new Queue<Pair<int, string>>();
 		const int numSyncReports = 5;
+		Report[] syncReports = new Report[numSyncReports];
+		int curIndex = 0;
 
+		public SyncReport()
+		{
+			for (var i = 0; i < numSyncReports; i++)
+				syncReports[i] = new SyncReport.Report();
+		}
+		
 		internal void UpdateSyncReport()
 		{
 			if (!Game.Settings.Debug.RecordSyncReports)
 				return;
-
-			while (syncReports.Count >= numSyncReports) syncReports.Dequeue();
-			syncReports.Enqueue(Pair.New(Game.orderManager.FrameNumber, GenerateSyncReport()));
+			
+			GenerateSyncReport(syncReports[curIndex]);
+			curIndex = ++curIndex % numSyncReports;
 		}
-
-		string GenerateSyncReport()
+		
+		void GenerateSyncReport(Report report)
 		{
-			var sb = new StringBuilder();
-			sb.AppendLine("Actors:");
-			foreach (var a in Game.world.Actors)
-				sb.AppendLine("\t {0} {1} {2} ({3})".F(
-					a.ActorID,
-					a.Info.Name,
-					(a.Owner == null) ? "null" : a.Owner.InternalName,
-					Sync.CalculateSyncHash(a)));
-
-			sb.AppendLine("Tick Actors:");
+			report.Frame = Game.orderManager.FrameNumber;
+			report.SyncedRandom = Game.world.SharedRandom.Last;
+			report.Traits.Clear();
 			foreach (var a in Game.world.Queries.WithTraitMultiple<object>())
 			{
 				var sync = Sync.CalculateSyncHash(a.Trait);
 				if (sync != 0)
-					sb.AppendLine("\t {0} {1} {2} {3} ({4})".F(
-						a.Actor.ActorID,
-						a.Actor.Info.Name,
-						(a.Actor.Owner == null) ? "null" : a.Actor.Owner.InternalName,
-						a.Trait.GetType().Name,
-						sync));
+					report.Traits.Add(new TraitReport()
+					{
+						ActorID = a.Actor.ActorID,
+						Type = a.Actor.Info.Name,
+						Owner = (a.Actor.Owner == null) ? "null" : a.Actor.Owner.InternalName,
+						Trait = a.Trait.GetType().Name,
+						Hash = sync
+					});
 			}
-
-			return sb.ToString();
 		}
 
 		internal void DumpSyncReport(int frame)
 		{
-			var f = syncReports.FirstOrDefault(a => a.First == frame);
-			if (f == default(Pair<int, string>))
-			{
-				Log.Write("sync", "No sync report available!");
-				return;
-			}
-
-			Log.Write("sync", "Sync for net frame {0} -------------", f.First);
-			Log.Write("sync", "{0}", f.Second);
+			foreach (var r in syncReports)
+				if (r.Frame == frame)
+				{
+					Log.Write("sync", "Sync for net frame {0} -------------", r.Frame);
+					Log.Write("sync", "SharedRandom: "+r.SyncedRandom);
+					Log.Write("sync", "Synced Traits:");
+					foreach (var a in r.Traits)
+						Log.Write("sync", "\t {0} {1} {2} {3} ({4})".F(
+							a.ActorID,
+							a.Type,
+							a.Owner,
+					        a.Trait,
+					        a.Hash
+						));
+					return;
+				}
+			Log.Write("sync", "No sync report available!");
 		}
+	
+		class Report
+		{
+			public int Frame;
+			public int SyncedRandom;
+			public List<TraitReport> Traits = new List<TraitReport>();
+		}
+		
+		struct TraitReport
+		{
+			public uint ActorID;
+			public string Type;
+			public string Owner;
+			public string Trait;
+			public int Hash;
+		}
+
 	}
 }

OpenRA.Game/OpenRA.Game.csproj

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="3.5">
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -227,6 +227,7 @@
     <Compile Include="Graphics\CursorProvider.cs" />
     <Compile Include="Traits\Player\TechTree.cs" />
     <Compile Include="Traits\Player\ClassicProductionQueue.cs" />
+    <Compile Include="Traits\Player\PowerManager.cs" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\OpenRA.FileFormats\OpenRA.FileFormats.csproj">

OpenRA.Game/ShroudRenderer.cs

@@ -145,7 +145,7 @@ namespace OpenRA
 			}
 
 			var clipRect = Bounds.HasValue ? Rectangle.Intersect(Bounds.Value, map.Bounds) : map.Bounds;
-
+			clipRect = Rectangle.Intersect(Game.viewport.ViewBounds(), clipRect);
 			var miny = clipRect.Top;
 			var maxy = clipRect.Bottom;
 			var minx = clipRect.Left;

OpenRA.Game/Traits/Activities/Drag.cs

@@ -30,7 +30,8 @@ namespace OpenRA.Traits.Activities
 		int ticks = 0;
 		public IActivity Tick( Actor self )
 		{
-			self.CenterLocation = float2.Lerp(startLocation, endLocation, (float)ticks/(length-1));
+			self.CenterLocation = float2.Lerp(startLocation, endLocation, (float)ticks/(length-1));
+			Log.Write("debug", "drag #{0} {1} {2}", self.ActorID, ticks, self.CenterLocation);
 			
 			if (++ticks >= length)
 				return NextActivity;

OpenRA.Game/Traits/Building.cs

@@ -38,17 +38,14 @@ namespace OpenRA.Traits
 		public object Create(ActorInitializer init) { return new Building(init); }
 	}
 
-	public class Building : INotifyDamage, IResolveOrder, IRenderModifier, IOccupySpace
+	public class Building : INotifyDamage, IResolveOrder, IOccupySpace
 	{
 		readonly Actor self;
 		public readonly BuildingInfo Info;
 		[Sync]
 		readonly int2 topLeft;
-
-		public bool Disabled
-		{
-			get	{ return self.TraitsImplementing<IDisable>().Any(t => t.Disabled); }
-		}
+		
+		readonly PowerManager PlayerPower;
 
 		public Building(ActorInitializer init)
 		{
@@ -57,27 +54,30 @@ namespace OpenRA.Traits
 			Info = self.Info.Traits.Get<BuildingInfo>();
 			self.CenterLocation = Game.CellSize 
 				* ((float2)topLeft + .5f * (float2)Info.Dimensions);
+			
+			PlayerPower = init.self.Owner.PlayerActor.Trait<PowerManager>();
 		}
 		
 		public int GetPowerUsage()
 		{
-			var modifier = self
-				.TraitsImplementing<IPowerModifier>()
-				.Select(t => t.GetPowerModifier())
-				.Product();
+			if (Info.Power <= 0)
+				return Info.Power;
 			
-			if (Info.Power > 0)
-			{
-				var health = self.TraitOrDefault<Health>();
-				var healthFraction = (health == null) ? 1f : health.HPFraction;
-				return (int)(modifier * healthFraction * Info.Power);
-			}
-			else
-				return (int)(modifier * Info.Power);
+			var health = self.TraitOrDefault<Health>();
+			var healthFraction = (health == null) ? 1f : health.HPFraction;
+			return (int)(healthFraction * 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));
+			}
+			
 			if (e.DamageState == DamageState.Dead)
 			{
 				self.World.WorldActor.Trait<ScreenShaker>().AddEffect(10, self.CenterLocation, 1);
@@ -94,16 +94,6 @@ namespace OpenRA.Traits
 			}
 		}
 		
-		public IEnumerable<Renderable> ModifyRender(Actor self, IEnumerable<Renderable> r)
-		{
-			foreach (var a in r)
-			{
-				yield return a;
-				if (Disabled)
-					yield return a.WithPalette("disabled");
-			}
-		}
-
 		public int2 TopLeft
 		{
 			get { return topLeft; }

OpenRA.Game/Traits/Mobile.cs

@@ -61,7 +61,7 @@ namespace OpenRA.Traits
 		public int Facing { get; set; }
 		[Sync]
 		public int Altitude { get; set; }
-		[Sync]
+		
 		public int ROT { get { return Info.ROT; } }
 		public int InitialFacing { get { return Info.InitialFacing; } }
 		

OpenRA.Game/Traits/Player/ClassicProductionQueue.cs

@@ -15,7 +15,7 @@ using OpenRA.FileFormats;
 
 namespace OpenRA.Traits
 {
-	public class ClassicProductionQueueInfo : ProductionQueueInfo, ITraitPrerequisite<TechTreeInfo>
+	public class ClassicProductionQueueInfo : ProductionQueueInfo, ITraitPrerequisite<TechTreeInfo>, ITraitPrerequisite<PowerManagerInfo>, ITraitPrerequisite<PlayerResourcesInfo>
 	{
 		public override object Create(ActorInitializer init) { return new ClassicProductionQueue(init.self, this); }
 	}

OpenRA.Game/Traits/Player/PlayerResources.cs

@@ -45,17 +45,53 @@ namespace OpenRA.Traits
 		public int OreCapacity;
 		[Sync]
 		public int DisplayOre;
+
+		public float GetSiloFullness() { return (float)Ore / OreCapacity; }
+
+		public void GiveOre(int num)
+		{
+			Ore += num;
+			
+			if (Ore > OreCapacity)
+			{
+				nextSiloAdviceTime = 0;
+				Ore = OreCapacity;
+			}
+		}
 		
-		[Sync]
-		public int PowerProvided;
-		[Sync]
-		public int PowerDrained;
+		public bool TakeOre(int num)
+		{
+			if (Ore < num) return false;
+			Ore -= num;
+			
+			return true;
+		}
 		
+		public void GiveCash(int num)
+		{
+			Cash += num;
+		}
+		
+		public bool TakeCash(int num)
+		{			
+			if (Cash + Ore < num) return false;
+			
+			// Spend ore before cash
+			Ore -= num;
+			if (Ore < 0)
+			{
+				Cash += Ore;
+				Ore = 0;	
+			}
+			
+			return true;
+		}
+
 		const float displayCashFracPerFrame = .07f;
 		const int displayCashDeltaPerFrame = 37;
 		int nextSiloAdviceTime = 0;
 
-		void TickOre(Actor self)
+		public void Tick(Actor self)
 		{
 			OreCapacity = self.World.Queries.OwnedBy[Owner].WithTrait<IStoreOre>()
 				.Sum(a => a.Trait.Capacity);
@@ -102,91 +138,5 @@ namespace OpenRA.Traits
 				Sound.PlayToPlayer(self.Owner, eva.CashTickDown);
 			}
 		}
-		
-		int nextPowerAdviceTime = 0;
-		void TickPower()
-		{
-			var oldBalance = PowerProvided - PowerDrained;
-
-			PowerProvided = 0;
-			PowerDrained = 0;
-
-			var myBuildings = Owner.World.Queries.OwnedBy[Owner].WithTrait<Building>();
-
-			foreach (var a in myBuildings)
-			{
-				var q = a.Trait.GetPowerUsage();
-				if (q > 0)
-					PowerProvided += q;
-				else
-					PowerDrained -= q;
-			}
-
-			if (PowerProvided - PowerDrained < 0)
-				if (PowerProvided - PowerDrained != oldBalance)
-					nextPowerAdviceTime = 0;
-			
-			if (--nextPowerAdviceTime <= 0)
-			{
-				if (PowerProvided - PowerDrained < 0)
-					Owner.GiveAdvice(Rules.Info["world"].Traits.Get<EvaAlertsInfo>().LowPower);
-				
-				nextPowerAdviceTime = AdviceInterval;
-			}
-		}
-
-		public PowerState GetPowerState()
-		{
-			if (PowerProvided >= PowerDrained) return PowerState.Normal;
-			if (PowerProvided > PowerDrained / 2) return PowerState.Low;
-			return PowerState.Critical;
-		}
-
-		public float GetSiloFullness() { return (float)Ore / OreCapacity; }
-
-		public void GiveOre(int num)
-		{
-			Ore += num;
-			
-			if (Ore > OreCapacity)
-			{
-				nextSiloAdviceTime = 0;
-				Ore = OreCapacity;
-			}
-		}
-		
-		public bool TakeOre(int num)
-		{
-			if (Ore < num) return false;
-			Ore -= num;
-			
-			return true;
-		}
-		
-		public void GiveCash(int num)
-		{
-			Cash += num;
-		}
-		
-		public bool TakeCash(int num)
-		{			
-			if (Cash + Ore < num) return false;
-			
-			// Spend ore before cash
-			Ore -= num;
-			if (Ore < 0)
-			{
-				Cash += Ore;
-				Ore = 0;	
-			}
-			
-			return true;
-		}
-
-		public void Tick(Actor self)
-		{
-			TickPower();
-			TickOre(self);
-		}
 	}
 }

OpenRA.Game/Traits/Player/PowerManager.cs

@@ -0,0 +1,111 @@
+#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 System.Linq;
+using System.Collections.Generic;
+using OpenRA.FileFormats;
+
+namespace OpenRA.Traits
+{
+	public class PowerManagerInfo : ITraitInfo
+	{
+		public readonly int AdviceInterval = 250;
+		public object Create(ActorInitializer init) { return new PowerManager(init, this); }
+	}
+
+	public class PowerManager : ITick
+	{
+		PowerManagerInfo Info;
+		Player Player;
+		
+		Dictionary<Actor, int> PowerDrain = new Dictionary<Actor, int>();
+		[Sync] int totalProvided;
+		public int PowerProvided { get { return totalProvided; } }
+	
+		[Sync] int totalDrained;
+		public int PowerDrained { get { return totalDrained; } }
+		
+		public PowerManager(ActorInitializer init, PowerManagerInfo info)
+		{
+			Info = info;
+			Player = init.self.Owner;
+			
+			init.world.ActorAdded += ActorAdded;
+			init.world.ActorRemoved += ActorRemoved;
+		}
+		
+		void ActorAdded(Actor a)
+		{
+			if (a.Owner != Player || !a.HasTrait<Building>())
+				return;
+			PowerDrain.Add(a, a.Trait<Building>().GetPowerUsage());
+			UpdateTotals();
+		}
+		
+		void ActorRemoved(Actor a)
+		{
+			if (a.Owner != Player || !a.HasTrait<Building>())
+				return;
+			PowerDrain.Remove(a);
+			UpdateTotals();
+		}
+		
+		void UpdateTotals()
+		{
+			totalProvided = 0;
+			totalDrained = 0;
+			foreach (var kv in PowerDrain)
+			{
+				var p = kv.Value;
+				if (p > 0)
+					totalProvided += p;
+				else
+					totalDrained -= p;
+			}
+		}
+		
+		public void UpdateActor(Actor a, int newPower)
+		{
+			if (a.Owner != Player || !a.HasTrait<Building>())
+				return;
+		
+			PowerDrain[a] = newPower;
+			UpdateTotals();
+		}
+		
+		int nextPowerAdviceTime = 0;
+		bool wasLowPower = false;
+		public void Tick(Actor self)
+		{
+			var lowPower = totalProvided < totalDrained;
+			if (lowPower && !wasLowPower)
+				nextPowerAdviceTime = 0;
+			wasLowPower = lowPower;
+			
+			if (--nextPowerAdviceTime <= 0)
+			{
+				if (lowPower)
+					Player.GiveAdvice(Rules.Info["world"].Traits.Get<EvaAlertsInfo>().LowPower);
+				
+				nextPowerAdviceTime = Info.AdviceInterval;
+			}
+		}
+		
+		public PowerState PowerState
+		{
+			get {
+				if (PowerProvided >= PowerDrained) return PowerState.Normal;
+				if (PowerProvided > PowerDrained / 2) return PowerState.Low;
+				return PowerState.Critical;
+			}
+		}
+	}
+}

OpenRA.Game/Traits/Player/ProductionQueue.cs

@@ -11,7 +11,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using OpenRA.FileFormats;
 
 namespace OpenRA.Traits
 {
@@ -27,6 +26,8 @@ namespace OpenRA.Traits
 	{
 		public readonly Actor self;
 		public ProductionQueueInfo Info;
+		readonly PowerManager PlayerPower;
+		readonly PlayerResources PlayerResources;
 		
 		// TODO: sync these
 		// A list of things we are currently building
@@ -39,7 +40,9 @@ namespace OpenRA.Traits
 		{
 			this.self = self;
 			this.Info = info;
-
+			PlayerResources = playerActor.Trait<PlayerResources>();
+			PlayerPower = playerActor.Trait<PowerManager>();
+			
 			var ttc = playerActor.Trait<TechTree>();
 			
 			foreach (var a in AllBuildables(Info.Type))
@@ -120,7 +123,7 @@ namespace OpenRA.Traits
 				FinishProduction();
 			}
 			if( Queue.Count > 0 )
-				Queue[ 0 ].Tick( self.Owner );
+				Queue[ 0 ].Tick( PlayerResources, PlayerPower );
 		}
 
 		public void ResolveOrder( Actor self, Order order )
@@ -219,8 +222,7 @@ namespace OpenRA.Traits
 
 		protected static bool IsDisabledBuilding(Actor a)
 		{
-			var building = a.TraitOrDefault<Building>();
-			return building != null && building.Disabled;
+			return a.TraitsImplementing<IDisable>().Any(d => d.Disabled);
 		}
 
 		protected virtual void BuildUnit( string name )
@@ -250,7 +252,6 @@ namespace OpenRA.Traits
 
 		public bool Paused = false, Done = false;
 		public Action OnComplete;
-
 		int slowdown = 0;
 
 		public ProductionItem(ProductionQueue queue, string item, int time, int cost, Action onComplete)
@@ -265,7 +266,7 @@ namespace OpenRA.Traits
 			Log.Write("debug", "new ProductionItem: {0} time={1} cost={2}", item, time, cost);
 		}
 
-		public void Tick(Player player)
+		public void Tick(PlayerResources pr, PowerManager pm)
 		{
 			if (Done)
 			{
@@ -275,7 +276,7 @@ namespace OpenRA.Traits
 
 			if (Paused) return;
 
-			if (player.PlayerActor.Trait<PlayerResources>().GetPowerState() != PowerState.Normal)
+			if (pm.PowerState != PowerState.Normal)
 			{
 				if (--slowdown <= 0)
 					slowdown = Queue.Info.LowPowerSlowdown; 
@@ -284,7 +285,7 @@ namespace OpenRA.Traits
 			}
 
 			var costThisFrame = RemainingCost / RemainingTime;
-			if (costThisFrame != 0 && !player.PlayerActor.Trait<PlayerResources>().TakeCash(costThisFrame)) return;
+			if (costThisFrame != 0 && !pr.TakeCash(costThisFrame)) return;
 			RemainingCost -= costThisFrame;
 			RemainingTime -= 1;
 			if (RemainingTime > 0) return;

OpenRA.Game/Traits/Player/TechTree.cs

@@ -11,16 +11,15 @@
 using System.Collections.Generic;
 using System.Linq;
 using OpenRA.FileFormats;
-using OpenRA.GameRules;
 
 namespace OpenRA.Traits
 {
-	class TechTreeInfo : ITraitInfo
+	public class TechTreeInfo : ITraitInfo
 	{
 		public object Create(ActorInitializer init) { return new TechTree(init);}
 	}
 
-	class TechTree
+	public class TechTree
 	{
 		readonly List<Watcher> watchers = new List<Watcher>();
 		readonly Player player;
@@ -43,10 +42,16 @@ namespace OpenRA.Traits
 			foreach(var w in watchers)
 				w.Update(buildings);
 		}
-
+		
 		public void Add(string key, List<string> prerequisites, ITechTreeElement tte)
 		{
-			watchers.Add(new Watcher( key, prerequisites, tte ));
+			Add(key, prerequisites, false, tte);
+		}
+		
+		// set requiresPowered = true to discard buildings that have an IDisabled active (eg manually powered down)
+		public void Add(string key, List<string> prerequisites, bool requiresPowered, ITechTreeElement tte)
+		{
+			watchers.Add(new Watcher( key, prerequisites, requiresPowered, tte ));
 		}
 
 		public void Remove(string key)
@@ -54,7 +59,7 @@ namespace OpenRA.Traits
 			watchers.RemoveAll(x => x.key == key);
 		}
 		
-		public static Cache<string, List<Actor>> GatherBuildings( Player player )
+		static Cache<string, List<Actor>> GatherBuildings( Player player )
 		{
 			var ret = new Cache<string, List<Actor>>( x => new List<Actor>() );
 			if (player == null)
@@ -78,25 +83,28 @@ namespace OpenRA.Traits
 			public readonly List<string> prerequisites;
 			public readonly ITechTreeElement watcher;
 			bool hasPrerequisites;
-
-			public Watcher(string key, List<string> prerequisites, ITechTreeElement watcher)
+			bool requiresPowered;
+			
+			public Watcher(string key, List<string> prerequisites, bool requiresPowered, ITechTreeElement watcher)
 			{
 				this.key = key;
 				this.prerequisites = prerequisites;
 				this.watcher = watcher;
 				this.hasPrerequisites = false;
+				this.requiresPowered = requiresPowered;
 			}
 
 			public void Update(Cache<string, List<Actor>> buildings)
-			{
+			{                   
 				var nowHasPrerequisites = true;
 				foreach (var p in prerequisites)
-					if (!buildings.Keys.Contains(p))
+					if (!buildings.Keys.Contains(p) || 
+					    (requiresPowered && buildings[p].All(b => b.TraitsImplementing<IDisable>().Any(d => d.Disabled))))
 					{
 						nowHasPrerequisites = false;
 						break;
 					}
-								
+				
 				if( nowHasPrerequisites && !hasPrerequisites )
 					watcher.PrerequisitesAvailable(key);
 
@@ -108,7 +116,7 @@ namespace OpenRA.Traits
 		}
 	}
 
-	interface ITechTreeElement
+	public interface ITechTreeElement
 	{
 		void PrerequisitesAvailable(string key);
 		void PrerequisitesUnavailable(string key);

OpenRA.Game/Traits/Production.cs

@@ -62,6 +62,8 @@ namespace OpenRA.Traits
 			var speed = move.MovementSpeedForCell(self, exit);
 			var length = speed > 0 ? (int)( ( to - spawn ).Length*3 / speed ) : 0;
 			newUnit.QueueActivity(new Activities.Drag(spawn, to, length));
+
+//			Log.Write("debug", "length={0} facing={1} exit={2} spawn={3}", length, facing.Facing, exit, spawn);
 			
 			// For the target line
 			var target = exit;

OpenRA.Game/Traits/ProvidesRadar.cs

@@ -23,8 +23,8 @@ namespace OpenRA.Traits
 		bool UpdateActive(Actor self)
 		{
 			// Check if powered
-			var b = self.Trait<Building>();
-			if (b.Disabled) return false;
+			if (self.TraitsImplementing<IDisable>().Any(d => d.Disabled))
+				return false;
 
 			var isJammed = self.World.Queries.WithTrait<JamsRadar>().Any(a => self.Owner != a.Actor.Owner
 				&& (self.Location - a.Actor.Location).Length < a.Actor.Info.Traits.Get<JamsRadarInfo>().Range);

OpenRA.Game/Traits/Render/RenderSimple.cs

@@ -62,16 +62,20 @@ namespace OpenRA.Traits
 				a.Animation.Tick();
 		}
 
-		protected virtual string GetPrefix(Actor self)
+		protected virtual string NormalizeSequence(Actor self, string baseSequence)
 		{
-			return self.GetDamageState() >= DamageState.Heavy ? "damaged-" : "";
+			string damageState = self.GetDamageState() >= DamageState.Heavy ? "damaged-" : "";
+			if (anim.HasSequence(damageState + baseSequence))
+				return damageState + baseSequence;
+			else
+				return baseSequence;
 		}
 
 		public void PlayCustomAnim(Actor self, string name)
 		{
 			if (anim.HasSequence(name))
-				anim.PlayThen(GetPrefix(self) + name,
-					() => anim.PlayRepeating(GetPrefix(self) + "idle"));
+				anim.PlayThen(NormalizeSequence(self, name),
+					() => anim.PlayRepeating(NormalizeSequence(self, "idle")));
 		}
 
 		public class AnimationWithOffset

OpenRA.Game/Traits/SupportPower.cs

@@ -12,7 +12,7 @@ using System.Linq;
 
 namespace OpenRA.Traits
 {
-	public abstract class SupportPowerInfo : ITraitInfo, ITraitPrerequisite<TechTreeInfo>
+	public abstract class SupportPowerInfo : ITraitInfo, ITraitPrerequisite<TechTreeInfo>, ITraitPrerequisite<PowerManagerInfo>
 	{
 		public readonly bool RequiresPower = true;
 		public readonly bool OneShot = false;
@@ -47,20 +47,18 @@ namespace OpenRA.Traits
 
 		protected readonly Actor Self;
 		protected readonly Player Owner;
-		string[] effectivePrereq = {};
 		
 		bool notifiedCharging;
 		bool notifiedReady;
 
+		readonly PowerManager PlayerPower;
 		public SupportPower(Actor self, SupportPowerInfo info)
 		{
 			Info = info;
 			RemainingTime = TotalTime;
 			Self = self;
 			Owner = self.Owner;
-
-			effectivePrereq = Info.Prerequisites
-				.Select(a => a.ToLowerInvariant()).ToArray();
+			PlayerPower = self.Trait<PowerManager>();
 			
 			self.Trait<TechTree>().Add( Info.OrderName, Info.Prerequisites.Select( a => a.ToLowerInvariant() ).ToList(), this );
 		}
@@ -72,8 +70,8 @@ namespace OpenRA.Traits
 			
 			if (Info.GivenAuto)
 				IsAvailable = hasPrerequisites;
-							
-			if (IsAvailable && (!Info.RequiresPower || IsPowered()))
+
+			if (IsAvailable && (!Info.RequiresPower || PlayerPower.PowerState == PowerState.Normal))
 			{
 				if (Game.LobbyInfo.GlobalSettings.AllowCheats && self.Trait<DeveloperMode>().FastCharge) RemainingTime = 0;
 
@@ -95,17 +93,6 @@ namespace OpenRA.Traits
 			}
 		}
 
-		bool IsPowered()
-		{
-			if (effectivePrereq.Count() == 0) 
-				return Owner.PlayerActor.Trait<PlayerResources>().GetPowerState() == PowerState.Normal;
-			
-			// Takes 0.3ms on pchote's machine -- calling it every tick for every active special power is retarded
-			var buildings = TechTree.GatherBuildings(Owner);
-			
-			return effectivePrereq.All(a => buildings[a].Any(b => !b.Trait<Building>().Disabled));
-		}
-
 		public void FinishActivate()
 		{
 			if (Info.OneShot)
@@ -134,7 +121,7 @@ namespace OpenRA.Traits
 			if (!IsAvailable || !IsReady)
 				return;
 
-			if (Info.RequiresPower && !IsPowered())
+			if (Info.RequiresPower && PlayerPower.PowerState != PowerState.Normal)
 			{
 				var eva = Owner.World.WorldActor.Info.Traits.Get<EvaAlertsInfo>();
 				Sound.Play(eva.AbilityInsufficientPower);

OpenRA.Game/Traits/TraitsInterfaces.cs

@@ -99,7 +99,6 @@ namespace OpenRA.Traits
 	public interface IRenderModifier { IEnumerable<Renderable> ModifyRender(Actor self, IEnumerable<Renderable> r); }
 	public interface IDamageModifier { float GetDamageModifier( WarheadInfo warhead ); }
 	public interface ISpeedModifier { float GetSpeedModifier(); }
-	public interface IPowerModifier { float GetPowerModifier(); }
 	public interface IFirepowerModifier { float GetFirepowerModifier(); }
 	public interface IPaletteModifier { void AdjustPalette(Dictionary<string,Palette> b); }
 	public interface IPips { IEnumerable<PipType> GetPips(Actor self); }

OpenRA.Game/Traits/World/BibLayer.cs

@@ -75,7 +75,8 @@ namespace OpenRA.Traits
 		{
 			var cliprect = Game.viewport.ShroudBounds().HasValue
 				? Rectangle.Intersect(Game.viewport.ShroudBounds().Value, world.Map.Bounds) : world.Map.Bounds;
-
+			
+			cliprect = Rectangle.Intersect(Game.viewport.ViewBounds(), cliprect);
 			foreach (var kv in tiles)
 			{
 				if (!cliprect.Contains(kv.Key.X, kv.Key.Y))

OpenRA.Game/Traits/World/ResourceLayer.cs

@@ -29,6 +29,8 @@ namespace OpenRA.Traits
 			var cliprect = Game.viewport.ShroudBounds().HasValue
 				? Rectangle.Intersect(Game.viewport.ShroudBounds().Value, world.Map.Bounds) : world.Map.Bounds;
 
+			cliprect = Rectangle.Intersect(Game.viewport.ViewBounds(), cliprect);
+			
 			var minx = cliprect.Left;
 			var maxx = cliprect.Right;
 

OpenRA.Game/Traits/World/SmudgeLayer.cs

@@ -76,7 +76,7 @@ namespace OpenRA.Traits
 		{
 			var cliprect = Game.viewport.ShroudBounds().HasValue 
 				? Rectangle.Intersect(Game.viewport.ShroudBounds().Value, world.Map.Bounds) : world.Map.Bounds;
-
+			cliprect = Rectangle.Intersect(Game.viewport.ViewBounds(), cliprect);
 			foreach (var kv in tiles)
 			{
 				if (!cliprect.Contains(kv.Key.X,kv.Key.Y))

OpenRA.Game/Widgets/Delegates/LobbyDelegate.cs

@@ -416,10 +416,9 @@ namespace OpenRA.Widgets.Delegates
 
 		bool CycleTeam(MouseInput mi)
 		{
-			var d = (mi.Button == MouseButton.Left) ? +1 : Game.world.Map.PlayerCount;
-
-			var newIndex = (Game.LocalClient.Team + d) % (Game.world.Map.PlayerCount + 1);
-
+			var d = (mi.Button == MouseButton.Left) ? +1 : Map.PlayerCount;
+			var newIndex = (Game.LocalClient.Team + d) % (Map.PlayerCount + 1);
+			
 			Game.IssueOrder(
 				Order.Command("team " + newIndex));
 			return true;

OpenRA.Game/World.cs

@@ -10,13 +10,11 @@
 
 using System;
 using System.Collections.Generic;
-using System.Linq;
 using OpenRA.Collections;
 using OpenRA.Effects;
 using OpenRA.FileFormats;
 using OpenRA.Graphics;
 using OpenRA.Orders;
-using OpenRA.Support;
 using OpenRA.Traits;
 
 using XRandom = OpenRA.Thirdparty.Random;
@@ -173,10 +171,20 @@ namespace OpenRA
 		{
 			//using (new PerfSample("synchash"))
 			{
+				int n = 0;
 				int ret = 0;
-				foreach (var a in Actors)
-					ret += (int)a.ActorID * Sync.CalculateSyncHash(a);
 
+				// hash all the actors
+				foreach (var a in Actors)
+					ret += n++ * (int)a.ActorID * Sync.CalculateSyncHash(a);
+
+				// hash all the traits that tick
+				foreach (var x in traitDict.ActorsWithTraitMultiple<object>(this))
+					ret += n++ * (int)x.Actor.ActorID * Sync.CalculateSyncHash(x.Trait);
+
+				// Hash the shared rng
+				ret += SharedRandom.Last;
+				
 				return ret;
 			}
 		}

OpenRA.Mods.RA/AttackTurreted.cs

@@ -11,6 +11,7 @@
 using System;
 using OpenRA.Mods.RA.Activities;
 using OpenRA.Traits;
+using System.Linq;
 
 namespace OpenRA.Mods.RA
 {
@@ -45,7 +46,7 @@ namespace OpenRA.Mods.RA
 
 		protected override void QueueAttack( Actor self, Order order )
 		{
-			if (self.HasTrait<Building>() && self.Trait<Building>().Disabled) 
+			if (self.TraitsImplementing<IDisable>().Any(d => d.Disabled))
 				return;
 			
 			const int RangeTolerance = 1;	/* how far inside our maximum range we should try to sit */

OpenRA.Mods.RA/CanPowerDown.cs

@@ -12,17 +12,27 @@ using OpenRA.Traits;
 
 namespace OpenRA.Mods.RA
 {
-	public class CanPowerDownInfo : TraitInfo<CanPowerDown> { }
+	public class CanPowerDownInfo : ITraitInfo
+	{
+		public object Create(ActorInitializer init) { return new CanPowerDown(init); }
+	}
 
-	public class CanPowerDown : IDisable, IPowerModifier, IResolveOrder
+	public class CanPowerDown : IResolveOrder, IDisable
 	{
 		[Sync]
 		bool disabled = false;
-
+		int normalPower = 0;
+		readonly PowerManager PowerManager;
+		readonly TechTree TechTree;
+		
+		public CanPowerDown(ActorInitializer init)
+		{
+			PowerManager = init.self.Owner.PlayerActor.Trait<PowerManager>();
+			TechTree = init.self.Owner.PlayerActor.Trait<TechTree>();
+			normalPower = init.self.Info.Traits.Get<BuildingInfo>().Power;
+		}
 		public bool Disabled { get { return disabled; } }
-		
-		public float GetPowerModifier() { return (disabled) ? 0.0f : 1.0f; }	
-		
+				
 		public void ResolveOrder(Actor self, Order order)
 		{
 			if (order.OrderString == "PowerDown")
@@ -30,6 +40,11 @@ namespace OpenRA.Mods.RA
 				disabled = !disabled;
 				var eva = self.World.WorldActor.Info.Traits.Get<EvaAlertsInfo>();
 				Sound.PlayToPlayer(self.Owner, disabled ? eva.EnablePower : eva.DisablePower);
+				
+				PowerManager.UpdateActor(self, disabled ? 0 : normalPower);
+				
+				// Rebuild the tech tree; some support powers require active buildings
+				TechTree.Update();
 			}
 		}
 	}

OpenRA.Mods.RA/HackyAI.cs

@@ -31,7 +31,8 @@ namespace OpenRA.Mods.RA
 		bool enabled;
 		int ticks;
 		Player p;
-		PlayerResources playerResources;
+		PowerManager playerPower;
+		
 		int2 baseCenter;
         XRandom random = new XRandom(); //we do not use the synced random number generator.
 
@@ -68,8 +69,7 @@ namespace OpenRA.Mods.RA
 		{
 			this.p = p;
 			enabled = true;
-		
-			playerResources = p.PlayerActor.Trait<PlayerResources>();
+			playerPower = p.PlayerActor.Trait<PowerManager>();
 		}
 
 		int GetPowerProvidedBy(ActorInfo building)
@@ -90,7 +90,7 @@ namespace OpenRA.Mods.RA
 		{
 			var buildableThings = queue.BuildableItems();
 
-			if (playerResources.PowerProvided <= playerResources.PowerDrained * 1.2)	/* try to maintain 20% excess power */
+			if (playerPower.PowerProvided <= playerPower.PowerDrained * 1.2)	/* 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/OreRefinery.cs

@@ -33,7 +33,8 @@ namespace OpenRA.Mods.RA
 	{
 		readonly Actor self;
 		readonly OreRefineryInfo Info;
-		readonly PlayerResources Player;
+		readonly PlayerResources PlayerResources;
+		readonly PowerManager PlayerPower;
 		List<Actor> LinkedHarv;
 
 		[Sync]
@@ -45,7 +46,9 @@ namespace OpenRA.Mods.RA
 		{
 			this.self = self;
 			Info = info;
-			Player = self.Owner.PlayerActor.Trait<PlayerResources> ();
+			PlayerResources = self.Owner.PlayerActor.Trait<PlayerResources>();
+			PlayerPower = self.Owner.PlayerActor.Trait<PowerManager>();
+
 			LinkedHarv = new List<Actor> ();
 		}
 
@@ -63,7 +66,7 @@ namespace OpenRA.Mods.RA
 		public void GiveOre (int amount)
 		{
 			if (!Info.LocalStorage)
-				Player.GiveOre(amount);
+				PlayerResources.GiveOre(amount);
 			else
 			{
 				Ore += amount;
@@ -80,14 +83,14 @@ namespace OpenRA.Mods.RA
 			if (--nextProcessTime <= 0) {
 				// Convert resources to cash
 				int amount = Math.Min (Ore, Info.ProcessAmount);
-				amount = Math.Min (amount, Player.OreCapacity - Player.Ore);
+				amount = Math.Min (amount, PlayerResources.OreCapacity - PlayerResources.Ore);
 				
 				if (amount > 0)
 				{
 					Ore -= amount;
-					Player.GiveOre (amount);
+					PlayerResources.GiveOre (amount);
 				}
-				nextProcessTime = (Player.GetPowerState() == PowerState.Normal)? 
+				nextProcessTime = (PlayerPower.PowerState == PowerState.Normal)? 
 					Info.ProcessTick : Info.LowPowerProcessTick ;
 			}
 		}

OpenRA.Mods.RA/Render/RenderBuilding.cs

@@ -36,7 +36,14 @@ namespace OpenRA.Mods.RA.Render
 
 		public IEnumerable<Renderable> ModifyRender(Actor self, IEnumerable<Renderable> r)
 		{
-			return r.Select(a => a.WithPos(a.Pos - Origin));
+			var disabled = self.TraitsImplementing<IDisable>().Any(d => d.Disabled);
+			foreach (var a in r)
+			{
+				var ret = a.WithPos(a.Pos - Origin);
+				yield return ret;
+				if (disabled)
+					yield return ret.WithPalette("disabled").WithZOffset(1);
+			}
 		}
 		
 		public RenderBuilding( ActorInitializer init, Func<int> baseFacing )
@@ -51,28 +58,28 @@ namespace OpenRA.Mods.RA.Render
 
 		void Complete( Actor self )
 		{
-			anim.PlayRepeating( GetPrefix(self) + "idle" );
+			anim.PlayRepeating( NormalizeSequence(self, "idle") );
 			foreach( var x in self.TraitsImplementing<INotifyBuildComplete>() )
 				x.BuildingComplete( self );
 		}
 
 		public void PlayCustomAnimThen(Actor self, string name, Action a)
 		{
-			anim.PlayThen(GetPrefix(self) + name,
-				() => { anim.PlayRepeating(GetPrefix(self) + "idle"); a(); });
+			anim.PlayThen(NormalizeSequence(self, name),
+				() => { anim.PlayRepeating(NormalizeSequence(self, "idle")); a(); });
 		}
 		
 		public void PlayCustomAnimRepeating(Actor self, string name)
 		{
-			anim.PlayThen(GetPrefix(self) + name,
+			anim.PlayThen(NormalizeSequence(self, name),
 				() => { PlayCustomAnimRepeating(self, name); });
 		}
 
 		public void PlayCustomAnimBackwards(Actor self, string name, Action a)
 		{
-			var hasSequence = anim.HasSequence(GetPrefix(self) + name);
-			anim.PlayBackwardsThen(hasSequence ? GetPrefix(self) + name : name,
-				() => { anim.PlayRepeating(GetPrefix(self) + "idle"); a(); });
+			var hasSequence = anim.HasSequence(NormalizeSequence(self, name));
+			anim.PlayBackwardsThen(NormalizeSequence(self, name),
+				() => { anim.PlayRepeating(NormalizeSequence(self, "idle")); a(); });
 		}
 
 		public virtual void Damaged(Actor self, AttackInfo e)
@@ -95,7 +102,7 @@ namespace OpenRA.Mods.RA.Render
 				anim.ReplaceAnim("idle");
 		}
 
-		public void Selling( Actor self )
+		public virtual void Selling( Actor self )
 		{
 			if( self.Info.Traits.Get<RenderBuildingInfo>().HasMakeAnimation )
 				anim.PlayBackwardsThen( "make", null );

OpenRA.Mods.RA/Render/RenderBuildingCharge.cs

@@ -16,7 +16,7 @@ namespace OpenRA.Mods.RA.Render
 		public override object Create(ActorInitializer init) { return new RenderBuildingCharge(init); }
 	}
 
-	/* used for tesla */
+	/* used for tesla */	
 	public class RenderBuildingCharge : RenderBuilding
 	{
 		public RenderBuildingCharge( ActorInitializer init )
@@ -27,8 +27,8 @@ namespace OpenRA.Mods.RA.Render
 		public void PlayCharge(Actor self)
 		{
 			Sound.Play(self.Info.Traits.Get<RenderBuildingChargeInfo>().ChargeAudio, self.CenterLocation);
-			anim.PlayThen(GetPrefix(self) + "active", 
-				() => anim.PlayRepeating(GetPrefix(self) + "idle"));
+			anim.PlayThen(NormalizeSequence(self, "active"), 
+				() => anim.PlayRepeating(NormalizeSequence(self, "idle")));
 		}
 	}
 }

OpenRA.Mods.RA/Render/RenderBuildingWarFactory.cs

@@ -14,46 +14,43 @@ using OpenRA.Traits;
 
 namespace OpenRA.Mods.RA.Render
 {
-	class RenderWarFactoryInfo : ITraitInfo, ITraitPrerequisite<RenderSimpleInfo>
+	class RenderWarFactoryInfo : RenderBuildingInfo
 	{
-		public object Create(ActorInitializer init) { return new RenderWarFactory(init.self); }
+		public override object Create(ActorInitializer init) { return new RenderWarFactory(init); }
 	}
 
-	class RenderWarFactory : INotifyBuildComplete, INotifyDamage, ITick, INotifyProduction, INotifySold
+	class RenderWarFactory : RenderBuilding, INotifyBuildComplete, INotifyDamage, ITick, INotifyProduction, INotifySold
 	{
 		public Animation roof;
 		[Sync]
 		bool isOpen;
 		[Sync]
 		int2 openExit;
-		
-		string GetPrefix(Actor self)
-		{
-			return self.GetDamageState() >= DamageState.Heavy ? "damaged-" : "";
-		}
 
-		public RenderWarFactory(Actor self)
+		public RenderWarFactory(ActorInitializer init)
+			: base(init)
 		{
-			roof = new Animation(self.Trait<RenderSimple>().GetImage(self));
+			roof = new Animation(GetImage(init.self));
 		}
 
 		public void BuildingComplete( Actor self )
 		{
-			roof.Play( GetPrefix(self) + "idle-top" );
+			roof.Play( NormalizeSequence(self, "idle-top") );
 			self.Trait<RenderSimple>().anims.Add( "roof", new RenderSimple.AnimationWithOffset( roof ) { ZOffset = 24 } );
 		}
 
-		public void Tick(Actor self)
+		public override void Tick(Actor self)
 		{
+			base.Tick(self);
 			if (isOpen && !self.World.WorldActor.Trait<UnitInfluence>()
 				.GetUnitsAt(openExit).Any())
 			{
 				isOpen = false;
-				roof.PlayBackwardsThen(GetPrefix(self) + "build-top", () => roof.Play(GetPrefix(self) + "idle-top"));
+				roof.PlayBackwardsThen(NormalizeSequence(self, "build-top"), () => roof.Play(NormalizeSequence(self, "idle-top")));
 			}
 		}
 
-		public void Damaged(Actor self, AttackInfo e)
+		public override void Damaged(Actor self, AttackInfo e)
 		{
 			if (!e.DamageStateChanged) return;
 			
@@ -65,14 +62,12 @@ namespace OpenRA.Mods.RA.Render
 
 		public void UnitProduced(Actor self, Actor other, int2 exit)
 		{
-			roof.PlayThen(GetPrefix(self) + "build-top", () => {isOpen = true; openExit = exit;});
+			roof.PlayThen(NormalizeSequence(self, "build-top"), () => { isOpen = true; openExit = exit; });
 		}
 
-		public void Selling( Actor self )
+		public override void Selling( Actor self )
 		{
 			self.Trait<RenderSimple>().anims.Remove( "roof" );
 		}
-
-		public void Sold( Actor self ) { }
 	}
 }

OpenRA.Mods.RA/RequiresPower.cs

@@ -19,15 +19,15 @@ namespace OpenRA.Mods.RA
 
 	class RequiresPower : IDisable
 	{
-		readonly Actor self;
+		readonly PowerManager power;
 		public RequiresPower( Actor self )
 		{
-			this.self = self;
+			power = self.Owner.PlayerActor.Trait<PowerManager>();
 		}
 
 		public bool Disabled
 		{
-			get { return (self.Owner.PlayerActor.Trait<PlayerResources>().GetPowerState() != PowerState.Normal); }
+			get { return power.PowerProvided < power.PowerDrained; }
 		}
 	}
 }

OpenRA.Mods.RA/Widgets/BuildPaletteWidget.cs

@@ -46,7 +46,7 @@ namespace OpenRA.Mods.RA.Widgets
 		public readonly string BuildPaletteOpen = "bleep13.aud";
 		public readonly string BuildPaletteClose = "bleep13.aud";
 		public readonly string TabClick = "ramenu1.aud";
-		
+
 		public BuildPaletteWidget() : base() { }
 		
 		public override void Initialize()
@@ -449,11 +449,12 @@ namespace OpenRA.Mods.RA.Widgets
 			                                       p.ToInt2() + new int2(5, 5), Color.White);
 
 			var resources = pl.PlayerActor.Trait<PlayerResources>();
+			var power = pl.PlayerActor.Trait<PowerManager>();
 
 			DrawRightAligned("${0}".F(cost), pos + new int2(-5, 5),
 				(resources.DisplayCash + resources.DisplayOre >= cost ? Color.White : Color.Red ));
 			
-			var lowpower = resources.GetPowerState() != PowerState.Normal;
+			var lowpower = power.PowerState != PowerState.Normal;
 			var time = CurrentQueue.GetBuildTime(info.Name) 
 				* ((lowpower)? CurrentQueue.Info.LowPowerSlowdown : 1);
 			DrawRightAligned(WorldUtils.FormatTime(time), pos + new int2(-5, 35), lowpower ? Color.Red: Color.White);
@@ -461,7 +462,7 @@ namespace OpenRA.Mods.RA.Widgets
 			var bi = info.Traits.GetOrDefault<BuildingInfo>();
 			if (bi != null)
 				DrawRightAligned("{1}{0}".F(bi.Power, bi.Power > 0 ? "+" : ""), pos + new int2(-5, 20),
-				                 ((resources.PowerProvided - resources.PowerDrained) >= -bi.Power || bi.Power > 0)? Color.White: Color.Red);
+				                 ((power.PowerProvided - power.PowerDrained) >= -bi.Power || bi.Power > 0)? Color.White: Color.Red);
 		
 			p += new int2(5, 35);
 			if (!canBuildThis)

OpenRA.Mods.RA/Widgets/Delegates/IngameChromeDelegate.cs

@@ -79,7 +79,5 @@ namespace OpenRA.Mods.RA.Widgets.Delegates
 								((state == WinState.Lost)? "YOU ARE DEFEATED" : "YOU ARE VICTORIOUS");
 			};
 		}
-		bool AreMutualAllies(Player a, Player b) { return a.Stances[b] == Stance.Ally && b.Stances[a] == Stance.Ally; }
-
 	}
 }

OpenRA.Mods.RA/Widgets/PowerBinWidget.cs

@@ -29,11 +29,11 @@ namespace OpenRA.Mods.RA.Widgets
 		{
 			powerCollection = "power-" + world.LocalPlayer.Country.Race;
 
-			var resources = world.LocalPlayer.PlayerActor.Trait<PlayerResources>();
+			var power = world.LocalPlayer.PlayerActor.Trait<PowerManager>();
 
 			// Nothing to draw
-			if (resources.PowerProvided == 0
-				&& resources.PowerDrained == 0)
+			if (power.PowerProvided == 0
+				&& power.PowerDrained == 0)
 				return;
 
 			// Draw bar horizontally
@@ -41,18 +41,18 @@ namespace OpenRA.Mods.RA.Widgets
 			var barEnd = barStart + new float2(powerSize.Width, 0);
 
 			float powerScaleBy = 100;
-			var maxPower = Math.Max(resources.PowerProvided, resources.PowerDrained);
+			var maxPower = Math.Max(power.PowerProvided, power.PowerDrained);
 			while (maxPower >= powerScaleBy) powerScaleBy *= 2;
 
 			// Current power supply
-			var powerLevelTemp = barStart.X + (barEnd.X - barStart.X) * (resources.PowerProvided / powerScaleBy);
+			var powerLevelTemp = barStart.X + (barEnd.X - barStart.X) * (power.PowerProvided / powerScaleBy);
 			lastPowerProvidedPos = float2.Lerp(lastPowerProvidedPos.GetValueOrDefault(powerLevelTemp), powerLevelTemp, .3f);
 			float2 powerLevel = new float2(lastPowerProvidedPos.Value, barStart.Y);
 
 			var color = Color.LimeGreen;
-			if (resources.GetPowerState() == PowerState.Low)
+			if (power.PowerState == PowerState.Low)
 				color = Color.Orange;
-			if (resources.GetPowerState() == PowerState.Critical)
+			if (power.PowerState == PowerState.Critical)
 				color = Color.Red;
 
 			var colorDark = Graphics.Util.Lerp(0.25f, color, Color.Black);
@@ -75,7 +75,7 @@ namespace OpenRA.Mods.RA.Widgets
 
 			// Power usage indicator
 			var indicator = ChromeProvider.GetImage( powerCollection, "power-indicator");
-			var powerDrainedTemp = barStart.X + (barEnd.X - barStart.X) * (resources.PowerDrained / powerScaleBy);
+			var powerDrainedTemp = barStart.X + (barEnd.X - barStart.X) * (power.PowerDrained / powerScaleBy);
 			lastPowerDrainedPos = float2.Lerp(lastPowerDrainedPos.GetValueOrDefault(powerDrainedTemp), powerDrainedTemp, .3f);
 			float2 powerDrainLevel = new float2(lastPowerDrainedPos.Value - indicator.size.X / 2, barStart.Y - 1);
 

OpenRA.Mods.RA/World/ChooseBuildTabOnSelect.cs

@@ -42,15 +42,17 @@ namespace OpenRA.Mods.RA.Widgets
 			}
 			
 			// Queue-per-player
-			var types = world.Selection.Actors.Where(a => a.IsInWorld)
+			var types = world.Selection.Actors.Where(a => a.IsInWorld && (a.World.LocalPlayer == a.Owner))
 											  .SelectMany(a => a.TraitsImplementing<Production>())
 											  .SelectMany(t => t.Info.Produces)
 											  .Distinct();
-			
+
 			if (types.Count() == 0)
 				return;	
 
+
 			Widget.RootWidget.GetWidget<BuildPaletteWidget>("INGAME_BUILD_PALETTE")
+			
 				.SetCurrentTab(world.LocalPlayer.PlayerActor.TraitsImplementing<ProductionQueue>().FirstOrDefault(t => types.Contains(t.Info.Type)));
 		}
 	}

mods/cnc/chrome/mainmenu.yaml

@@ -250,4 +250,4 @@ Background@MUSIC_MENU:
 			Y:140
 			Width:100
 			Height:20
-			Text:Repeat
+			Text:Loop

mods/cnc/chrome/settings.yaml

@@ -130,13 +130,6 @@ Background@SETTINGS_MENU:
 					Width:250
 					Height:20
 					Ticks:5
-				Checkbox@MUSICPLAYER_CHECKBOX:
-					Id:MUSICPLAYER_CHECKBOX
-					X:0
-					Y:70
-					Width:300
-					Height:20
-					Text:Show Music Player
 		Container@DISPLAY_PANE:
 			Id:DISPLAY_PANE
 			X:37

mods/cnc/rules/structures.yaml

@@ -260,6 +260,7 @@ WEAP:
 	RevealsShroud:
 		Range: 4
 	Bib:
+	-RenderBuilding:
 	RenderWarFactory:
 	RallyPoint:
 		RallyPoint: 0,3

mods/cnc/rules/system.yaml

@@ -31,6 +31,7 @@ Player:
 		SelectTargetSound: select1.aud
 		UnitType: a10
 	ConquestVictoryConditions:
+	PowerManager:
 	PlayerResources:
 		InitialCash: 5000
 	ActorGroupProxy:
@@ -135,11 +136,11 @@ World:
 	SpatialBins:
 		BinSize: 4
 	Shroud:
-	CrateSpawner:
-		Minimum: 1
-		Maximum: 3
-		SpawnInterval: 120
-		WaterChance: 0
+#	CrateSpawner:
+#		Minimum: 1
+#		Maximum: 3
+#		SpawnInterval: 120
+#		WaterChance: 0
 
 CRATE:
 	Tooltip:

mods/ra/chrome/ingame.yaml

@@ -60,8 +60,6 @@ Container@INGAME_ROOT:
 			Height:25
 			Text:Diplomacy
 			Bold:True
-		WorldTooltip@INGAME_WORLD_TOOLTIP:
-			Id:INGAME_WORLD_TOOLTIP
 		Button@INGAME_DEVELOPERMODE_BUTTON:
 			Id:INGAME_DEVELOPERMODE_BUTTON
 			X:324

mods/ra/chrome/mainmenu.yaml

@@ -250,4 +250,4 @@ Background@MUSIC_MENU:
 			Y:140
 			Width:100
 			Height:20
-			Text:Repeat
+			Text:Loop

mods/ra/rules/structures.yaml

@@ -529,6 +529,7 @@ WEAP:
 		Range: 4
 	Bib:
 	RenderWarFactory:
+	-RenderBuilding:
 	RallyPoint:
 	Exit@1:
 		SpawnOffset: 5,0
@@ -942,8 +943,8 @@ WEAF:
 		Range: 4
 	Bib:
 	RenderWarFactory:
-	RenderBuilding:
 		Image: WEAP
+	-RenderBuilding:
 	Fake:
 	IronCurtainable:
 	-EmitInfantryOnSell:

mods/ra/rules/system.yaml

@@ -92,6 +92,7 @@ Player:
 		SelectTargetSound: slcttgt1.aud
 		FlareType: flare
 	ConquestVictoryConditions:
+	PowerManager:
 	PlayerResources:
 		InitialCash: 5000
 	ActorGroupProxy:
@@ -111,11 +112,11 @@ World:
 	ChooseBuildTabOnSelect:
 	BridgeLayer:
 		Bridges: bridge1, bridge2, br1, br2, br3
-	CrateDrop:
-		Minimum: 1
-		Maximum: 3
-		SpawnInterval: 120
-		WaterChance: .2
+#	CrateDrop:
+#		Minimum: 1
+#		Maximum: 3
+#		SpawnInterval: 120
+#		WaterChance: .2
 	PaletteFromCurrentTheatre:
 		Name: terrain
 	PlayerColorPalette:

packaging/linux/rpm/openra.spec

@@ -42,7 +42,7 @@ do
             popd
             break;;
         n|N)
-            echo "The RA packages will need to be manually extracted from http://open-ra.org/get-dependency.php?file=ra-packages \
+            echo "The RA packages will need to be manually extracted from http://open-ra.org/get-dependency.php?file=ra-packages \
             to /usr/share/openra/mods/ra/packages before the RA mod will work." 
             break;;
         *) echo "Please enter y or n.";;
@@ -62,7 +62,7 @@ do
             popd
             break;;
         n|N)
-            echo "The C&C packages will need to be manually extracted from http://open-ra.org/get-dependency.php?file=cnc-packages \
+            echo "The C&C packages will need to be manually extracted from http://open-ra.org/get-dependency.php?file=cnc-packages \
             to /usr/share/openra/mods/cnc/packages before the C&C mod will work." 
             break;;
         *) echo "Please enter y or n.";;
@@ -84,3 +84,11 @@ gacutil -i $RPM_BUILD_ROOT/usr/share/openra/thirdparty/Tao/Tao.Sdl.dll
 /usr/share/openra/shaders/
 /usr/share/openra/mods/
 /usr/share/openra/thirdparty/
+/usr/share/applications/openra*
+/usr/share/menu/openra*
+/usr/share/pixmaps/openra.32.xpm
+/usr/share/icons/hicolor/16x16/apps/openra.png
+/usr/share/icons/hicolor/32x32/apps/openra.png
+/usr/share/icons/hicolor/48x48/apps/openra.png
+/usr/share/icons/hicolor/64x64/apps/openra.png
+/usr/share/icons/hicolor/128x128/apps/openra.png

packaging/osx/package-game.sh

@@ -8,7 +8,7 @@ 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"
+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

packaging/osx/package-local.sh

@@ -9,7 +9,7 @@ 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"
+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
@@ -27,7 +27,6 @@ for i in $EXCLUDE; do
 	find . -path "$i" -delete
 done
 
-git describe --tags > "VERSION"
 cd $PACKAGING_PATH
 zip OpenRA -r -9 OpenRA.app 
 echo "Done!"

web/footage.html

@@ -1,118 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
-        "http://www.w3.org/TR/html4/loose.dtd">
-<html>
-<head>
-	<title>OpenRA - Gameplay Footage</title>
-	<link rel="shortcut icon" type="image/x-icon" href="favicon.ico" />
-	<title>OpenRA</title>
-	<link rel="Stylesheet" type="text/css" href="openra.css" />
-	<!--[if IE 7]>
-			<link rel="stylesheet" type="text/css" href="ie7.css">
-		<![endif]-->
-
-	<script src="jquery-1.4.2.min.js" type="text/javascript"></script>
-
-	<script src="http://www.google.com/uds/api?file=uds.js&v=1.0&source=uds-vbw" type="text/javascript"></script>
-
-	<style type="text/css">
-		@import url("http://www.google.com/uds/css/gsearch.css");
-	</style>
-	<!-- Video Bar Code and Stylesheet -->
-
-	<script type="text/javascript">
-		window._uds_vbw_donotrepair = true;
-	</script>
-
-	<script src="http://www.google.com/uds/solutions/videobar/gsvideobar.js?mode=new"
-		type="text/javascript"></script>
-
-	<style type="text/css">
-		@import url("http://www.google.com/uds/solutions/videobar/gsvideobar.css");
-	</style>
-	<style type="text/css">
-		.playerInnerBox_gsvb .player_gsvb
-		{
-			width: 480px;
-			height: 380px;
-		}
-		
-		.playerBox_gsvb div.alldone_gsvb 
-		{
-			display: none;
-		}
-		
-		.playerBox_gsvb a.title_gsvb
-		{
-			color:White;
-		}
-		
-		.playerBox_gsvb a.title_gsvb:hover
-		{
-			color:White;
-			text-decoration:underline;
-		}
-	</style>
-
-	<script type="text/javascript">
-		function LoadVideoBar() {
-
-			var videoBar;
-			var options = {
-				largeResultSet: !true,
-				horizontal: true,
-				autoExecuteList: {
-					cycleTime: GSvideoBar.CYCLE_TIME_MEDIUM,
-					cycleMode: GSvideoBar.CYCLE_MODE_LINEAR,
-					executeList: ["ytchannel:ijwchrisf"]
-				},
-			}
-
-			videoBar = new GSvideoBar(document.getElementById("videoBar-bar"),
-                              document.getElementById("videoPlayer"),
-                              options);
-                              
-            videoBar.switchToListItem(0);
-		}
-		// arrange for this function to be called during body.onload
-		// event processing
-		GSearch.setOnLoadCallback(LoadVideoBar);
-	</script>
-
-</head>
-<body>
-	<div id="header" class="bar">
-		<h1>
-			<img src="soviet-logo.png" alt="Logo" />OpenRA</h1>
-	</div>
-	<div id="main">
-		<div id="menu">
-			<span class="links"><a href="index.html">Home</a></span> <span class="links"><a href="footage.html">
-				Gameplay Footage</a></span> 
-			<span class="links"><a href="mods.html">Mods</a></span> 
-			<span class="links"><a href="stats.html">Stats</a></span>
-			<span class="links"><a href="getinvolved.html">Get Involved</a></span>
-			<span class="links"><a href="http://www.sleipnirstuff.com/forum/viewforum.php?f=80">Forum</a></span>
-			<span class="links"><a href="irc://irc.freenode.net/openra">IRC</a></span>
-			<span class="links"><a href="http://twitter.com/openRA">Twitter</a></span>
-		</div>
-		<div style="margin-top: 20px">
-			<div id="videoPlayer" class="border"></div>
-			<div id="videoBar-bar">
-				<span style="color: #676767; font-size: 11px; margin: 10px; padding: 4px;">Loading...</span>
-			</div>
-		</div>
-	</div>
-	<div id="footer" class="bar">
-		<p id="trademarks">
-			<img src="soviet-logo.png" alt="OpenRA Logo" height="70px" style="float: right; margin-right: 10px" />
-			Command &amp; Conquer and Command &amp; Conquer Red Alert are trademarks or registered
-			trademarks of Electronic Arts Inc.in the U.S. and/or other countries.<br />
-			Windows is a registered trademark of Microsoft Corporation in the United States
-			and other countries.<br />
-			Mac OS X is a trademark of Apple Inc., registered in the U.S. and other countries.<br />
-			Linux is the registered trademark of Linus Torvalds in the U.S. and other countries.<br />
-			Mono is a registered trademark of Novell, Inc. in the United States and other countries.<br />
-		</p>
-	</div>
-</body>
-</html>

web/get-dependency.php

@@ -1,30 +0,0 @@
-<?php
-$mirrors_file = "";
-switch ($_GET["file"])
-{
-    case "ra-packages":
-        $mirrors_file = "packages/ra-mirrors.txt";
-        break;
-    case "cnc-packages":
-        $mirrors_file = "packages/cnc-mirrors.txt";
-        break;
-    case "osx-deps-v2":
-        $mirrors_file = "releases/mac/osx-dependencies-mirrors.txt";
-        break;
-    case "freetype":
-        $mirrors_file = "releases/windows/freetype-mirrors.txt";
-        break;
-    case "cg":
-        $mirrors_file = "releases/windows/cg-mirrors.txt";
-        break;
-    default:
-        break;
-}
-
-$mirrors = file_get_contents($mirrors_file);
-$mirrors_array = explode("\n", $mirrors);
-
-$mirror = $mirrors_array[array_rand($mirrors_array, 1)];
-
-header('Location: '. $mirror);
-?>

web/getinvolved.html

@@ -1,91 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
-        "http://www.w3.org/TR/html4/loose.dtd">
-<html>
-<head>
-	<link rel="shortcut icon" type="image/x-icon" href="favicon.ico" />
-	<title>OpenRA - Get Involved</title>
-	<link rel="Stylesheet" type="text/css" href="openra.css" />
-	<!--[if IE 7]>
-			<link rel="stylesheet" type="text/css" href="ie7.css">
-	<![endif]-->
-	<style type="text/css">
-	   pre { font-family: Consolas, Incosolata, Lucida Console, Monospace; margin-left: 40px; }
-	</style>
-</head>
-<body>
-	<div id="header" class="bar">
-		<h1>
-			<img src="soviet-logo.png" alt="Logo" />OpenRA</h1>
-	</div>
-	<div id="main">
-		<div id="menu">
-			<span class="links"><a href="index.html">Home</a></span> 
-			<span class="links"><a href="footage.html">Gameplay Footage</a></span> 
-			<span class="links"><a href="mods.html">Mods</a></span> 
-			<span class="links"><a href="stats.html">Stats</a></span>
-			<span class="links"><a href="getinvolved.html">Get Involved</a></span>
-			<span class="links"><a href="http://www.sleipnirstuff.com/forum/viewforum.php?f=80">Forum</a></span>
-			<span class="links"><a href="irc://irc.freenode.net/openra">IRC</a></span>
-			<span class="links"><a href="http://twitter.com/openRA">Twitter</a></span>
-		</div>
-		
-		<div style="width: 70%; margin: 0 auto;">
-			<h2>Getting Involved</h2>
-			<p>
-				As a small team developing OpenRA in our free time, your input is valuable to us. Anything from writing bug reports/feedback, to
-				contributing new features or fixing bugs is welcomed with open arms.
-			</p>
-			<h3>Contact Us</h3>
-			<p>
-				The developers can be found on our <a href="irc://irc.freenode.net/openra">IRC channel</a> most of the time so if you have any suggestions,
-				that is the best place to contact us.
-			</p>
-			<h3>Bug Tracker</h3>
-			<p>
-				If you wish to report a bug, our bug tracker can be found here: <br />
-				<a href="http://red-bull.ijw.co.nz:3690/OpenRA">http://red-bull.ijw.co.nz:3690/OpenRA</a>
-			</p>
-			<h3>Obtaining the Source Code</h3>
-			<p>
-				You'll need several things in order to checkout and build the source code:
-			</p>
-			<ul>
-				<li><a href="http://git-scm.com/">Git</a>, which can be downloaded for:
-					<ul>
-						<li><a href="http://code.google.com/p/git-osx-installer/">OS X</a></li>
-						<li><a href="http://msysgit.googlecode.com/files/Git-1.7.0.2-preview20100309.exe">Windows</a></li>
-						<li> or from your package manager on Linux.</a></li>
-					</ul>
-				</li>
-				<li><a href="http://www.microsoft.com/downloads/details.aspx?FamilyID=ab99342f-5d1a-413d-8319-81da479ab0d7&displaylang=en">
-				.NET Framework 3.5 SP1</a> or later, on Windows, or <a href="http://www.mono-project.com/">Mono 2.6.x</a> on other platforms</li>
-				<li>GNU Make, on non-Windows platforms</li>
-				<li>Visual Studio 2008 (or <a href="http://www.microsoft.com/express/downloads/#2008-Visual-CS">Visual C# Express</a>, free) if you like a nice IDE.</li>
-			</ul>
-			
-			<p>
-				Grab the sources by cloning our git repository:
-			</p>
-			<pre>
-$ git clone git://github.com/chrisforbes/OpenRA.git
-$ cd OpenRA</pre>
-			<p>
-				On Windows, open OpenRA.sln and build it. On other platforms, use 'make':
-			</p>
-			<pre>$ make all</pre>
-		</div>
-	</div>
-	<div id="footer" class="bar">
-		<p id="trademarks">
-			<img src="soviet-logo.png" alt="OpenRA Logo" height="70px" style="float: right; margin-right: 10px" />
-			Command &amp; Conquer and Command &amp; Conquer Red Alert are trademarks or registered
-			trademarks of Electronic Arts Inc.in the U.S. and/or other countries.<br />
-			Windows is a registered trademark of Microsoft Corporation in the United States
-			and other countries.<br />
-			Mac OS X is a trademark of Apple Inc., registered in the U.S. and other countries.<br />
-			Linux is the registered trademark of Linus Torvalds in the U.S. and other countries.<br />
-			Mono is a registered trademark of Novell, Inc. in the United States and other countries.<br />
-		</p>
-	</div>
-</body>
-</html>

web/ie7.css

@@ -1 +0,0 @@
-a:hover { text-decoration: underline }

web/jquery-1.4.2.min.js

@@ -1,154 +0,0 @@
-/*!
- * jQuery JavaScript Library v1.4.2
- * http://jquery.com/
- *
- * Copyright 2010, John Resig
- * Dual licensed under the MIT or GPL Version 2 licenses.
- * http://jquery.org/license
- *
- * Includes Sizzle.js
- * http://sizzlejs.com/
- * Copyright 2010, The Dojo Foundation
- * Released under the MIT, BSD, and GPL Licenses.
- *
- * Date: Sat Feb 13 22:33:48 2010 -0500
- */
-(function(A,w){function ma(){if(!c.isReady){try{s.documentElement.doScroll("left")}catch(a){setTimeout(ma,1);return}c.ready()}}function Qa(a,b){b.src?c.ajax({url:b.src,async:false,dataType:"script"}):c.globalEval(b.text||b.textContent||b.innerHTML||"");b.parentNode&&b.parentNode.removeChild(b)}function X(a,b,d,f,e,j){var i=a.length;if(typeof b==="object"){for(var o in b)X(a,o,b[o],f,e,d);return a}if(d!==w){f=!j&&f&&c.isFunction(d);for(o=0;o<i;o++)e(a[o],b,f?d.call(a[o],o,e(a[o],b)):d,j);return a}return i?
-e(a[0],b):w}function J(){return(new Date).getTime()}function Y(){return false}function Z(){return true}function na(a,b,d){d[0].type=a;return c.event.handle.apply(b,d)}function oa(a){var b,d=[],f=[],e=arguments,j,i,o,k,n,r;i=c.data(this,"events");if(!(a.liveFired===this||!i||!i.live||a.button&&a.type==="click")){a.liveFired=this;var u=i.live.slice(0);for(k=0;k<u.length;k++){i=u[k];i.origType.replace(O,"")===a.type?f.push(i.selector):u.splice(k--,1)}j=c(a.target).closest(f,a.currentTarget);n=0;for(r=
-j.length;n<r;n++)for(k=0;k<u.length;k++){i=u[k];if(j[n].selector===i.selector){o=j[n].elem;f=null;if(i.preType==="mouseenter"||i.preType==="mouseleave")f=c(a.relatedTarget).closest(i.selector)[0];if(!f||f!==o)d.push({elem:o,handleObj:i})}}n=0;for(r=d.length;n<r;n++){j=d[n];a.currentTarget=j.elem;a.data=j.handleObj.data;a.handleObj=j.handleObj;if(j.handleObj.origHandler.apply(j.elem,e)===false){b=false;break}}return b}}function pa(a,b){return"live."+(a&&a!=="*"?a+".":"")+b.replace(/\./g,"`").replace(/ /g,
-"&")}function qa(a){return!a||!a.parentNode||a.parentNode.nodeType===11}function ra(a,b){var d=0;b.each(function(){if(this.nodeName===(a[d]&&a[d].nodeName)){var f=c.data(a[d++]),e=c.data(this,f);if(f=f&&f.events){delete e.handle;e.events={};for(var j in f)for(var i in f[j])c.event.add(this,j,f[j][i],f[j][i].data)}}})}function sa(a,b,d){var f,e,j;b=b&&b[0]?b[0].ownerDocument||b[0]:s;if(a.length===1&&typeof a[0]==="string"&&a[0].length<512&&b===s&&!ta.test(a[0])&&(c.support.checkClone||!ua.test(a[0]))){e=
-true;if(j=c.fragments[a[0]])if(j!==1)f=j}if(!f){f=b.createDocumentFragment();c.clean(a,b,f,d)}if(e)c.fragments[a[0]]=j?f:1;return{fragment:f,cacheable:e}}function K(a,b){var d={};c.each(va.concat.apply([],va.slice(0,b)),function(){d[this]=a});return d}function wa(a){return"scrollTo"in a&&a.document?a:a.nodeType===9?a.defaultView||a.parentWindow:false}var c=function(a,b){return new c.fn.init(a,b)},Ra=A.jQuery,Sa=A.$,s=A.document,T,Ta=/^[^<]*(<[\w\W]+>)[^>]*$|^#([\w-]+)$/,Ua=/^.[^:#\[\.,]*$/,Va=/\S/,
-Wa=/^(\s|\u00A0)+|(\s|\u00A0)+$/g,Xa=/^<(\w+)\s*\/?>(?:<\/\1>)?$/,P=navigator.userAgent,xa=false,Q=[],L,$=Object.prototype.toString,aa=Object.prototype.hasOwnProperty,ba=Array.prototype.push,R=Array.prototype.slice,ya=Array.prototype.indexOf;c.fn=c.prototype={init:function(a,b){var d,f;if(!a)return this;if(a.nodeType){this.context=this[0]=a;this.length=1;return this}if(a==="body"&&!b){this.context=s;this[0]=s.body;this.selector="body";this.length=1;return this}if(typeof a==="string")if((d=Ta.exec(a))&&
-(d[1]||!b))if(d[1]){f=b?b.ownerDocument||b:s;if(a=Xa.exec(a))if(c.isPlainObject(b)){a=[s.createElement(a[1])];c.fn.attr.call(a,b,true)}else a=[f.createElement(a[1])];else{a=sa([d[1]],[f]);a=(a.cacheable?a.fragment.cloneNode(true):a.fragment).childNodes}return c.merge(this,a)}else{if(b=s.getElementById(d[2])){if(b.id!==d[2])return T.find(a);this.length=1;this[0]=b}this.context=s;this.selector=a;return this}else if(!b&&/^\w+$/.test(a)){this.selector=a;this.context=s;a=s.getElementsByTagName(a);return c.merge(this,
-a)}else return!b||b.jquery?(b||T).find(a):c(b).find(a);else if(c.isFunction(a))return T.ready(a);if(a.selector!==w){this.selector=a.selector;this.context=a.context}return c.makeArray(a,this)},selector:"",jquery:"1.4.2",length:0,size:function(){return this.length},toArray:function(){return R.call(this,0)},get:function(a){return a==null?this.toArray():a<0?this.slice(a)[0]:this[a]},pushStack:function(a,b,d){var f=c();c.isArray(a)?ba.apply(f,a):c.merge(f,a);f.prevObject=this;f.context=this.context;if(b===
-"find")f.selector=this.selector+(this.selector?" ":"")+d;else if(b)f.selector=this.selector+"."+b+"("+d+")";return f},each:function(a,b){return c.each(this,a,b)},ready:function(a){c.bindReady();if(c.isReady)a.call(s,c);else Q&&Q.push(a);return this},eq:function(a){return a===-1?this.slice(a):this.slice(a,+a+1)},first:function(){return this.eq(0)},last:function(){return this.eq(-1)},slice:function(){return this.pushStack(R.apply(this,arguments),"slice",R.call(arguments).join(","))},map:function(a){return this.pushStack(c.map(this,
-function(b,d){return a.call(b,d,b)}))},end:function(){return this.prevObject||c(null)},push:ba,sort:[].sort,splice:[].splice};c.fn.init.prototype=c.fn;c.extend=c.fn.extend=function(){var a=arguments[0]||{},b=1,d=arguments.length,f=false,e,j,i,o;if(typeof a==="boolean"){f=a;a=arguments[1]||{};b=2}if(typeof a!=="object"&&!c.isFunction(a))a={};if(d===b){a=this;--b}for(;b<d;b++)if((e=arguments[b])!=null)for(j in e){i=a[j];o=e[j];if(a!==o)if(f&&o&&(c.isPlainObject(o)||c.isArray(o))){i=i&&(c.isPlainObject(i)||
-c.isArray(i))?i:c.isArray(o)?[]:{};a[j]=c.extend(f,i,o)}else if(o!==w)a[j]=o}return a};c.extend({noConflict:function(a){A.$=Sa;if(a)A.jQuery=Ra;return c},isReady:false,ready:function(){if(!c.isReady){if(!s.body)return setTimeout(c.ready,13);c.isReady=true;if(Q){for(var a,b=0;a=Q[b++];)a.call(s,c);Q=null}c.fn.triggerHandler&&c(s).triggerHandler("ready")}},bindReady:function(){if(!xa){xa=true;if(s.readyState==="complete")return c.ready();if(s.addEventListener){s.addEventListener("DOMContentLoaded",
-L,false);A.addEventListener("load",c.ready,false)}else if(s.attachEvent){s.attachEvent("onreadystatechange",L);A.attachEvent("onload",c.ready);var a=false;try{a=A.frameElement==null}catch(b){}s.documentElement.doScroll&&a&&ma()}}},isFunction:function(a){return $.call(a)==="[object Function]"},isArray:function(a){return $.call(a)==="[object Array]"},isPlainObject:function(a){if(!a||$.call(a)!=="[object Object]"||a.nodeType||a.setInterval)return false;if(a.constructor&&!aa.call(a,"constructor")&&!aa.call(a.constructor.prototype,
-"isPrototypeOf"))return false;var b;for(b in a);return b===w||aa.call(a,b)},isEmptyObject:function(a){for(var b in a)return false;return true},error:function(a){throw a;},parseJSON:function(a){if(typeof a!=="string"||!a)return null;a=c.trim(a);if(/^[\],:{}\s]*$/.test(a.replace(/\\(?:["\\\/bfnrt]|u[0-9a-fA-F]{4})/g,"@").replace(/"[^"\\\n\r]*"|true|false|null|-?\d+(?:\.\d*)?(?:[eE][+\-]?\d+)?/g,"]").replace(/(?:^|:|,)(?:\s*\[)+/g,"")))return A.JSON&&A.JSON.parse?A.JSON.parse(a):(new Function("return "+
-a))();else c.error("Invalid JSON: "+a)},noop:function(){},globalEval:function(a){if(a&&Va.test(a)){var b=s.getElementsByTagName("head")[0]||s.documentElement,d=s.createElement("script");d.type="text/javascript";if(c.support.scriptEval)d.appendChild(s.createTextNode(a));else d.text=a;b.insertBefore(d,b.firstChild);b.removeChild(d)}},nodeName:function(a,b){return a.nodeName&&a.nodeName.toUpperCase()===b.toUpperCase()},each:function(a,b,d){var f,e=0,j=a.length,i=j===w||c.isFunction(a);if(d)if(i)for(f in a){if(b.apply(a[f],
-d)===false)break}else for(;e<j;){if(b.apply(a[e++],d)===false)break}else if(i)for(f in a){if(b.call(a[f],f,a[f])===false)break}else for(d=a[0];e<j&&b.call(d,e,d)!==false;d=a[++e]);return a},trim:function(a){return(a||"").replace(Wa,"")},makeArray:function(a,b){b=b||[];if(a!=null)a.length==null||typeof a==="string"||c.isFunction(a)||typeof a!=="function"&&a.setInterval?ba.call(b,a):c.merge(b,a);return b},inArray:function(a,b){if(b.indexOf)return b.indexOf(a);for(var d=0,f=b.length;d<f;d++)if(b[d]===
-a)return d;return-1},merge:function(a,b){var d=a.length,f=0;if(typeof b.length==="number")for(var e=b.length;f<e;f++)a[d++]=b[f];else for(;b[f]!==w;)a[d++]=b[f++];a.length=d;return a},grep:function(a,b,d){for(var f=[],e=0,j=a.length;e<j;e++)!d!==!b(a[e],e)&&f.push(a[e]);return f},map:function(a,b,d){for(var f=[],e,j=0,i=a.length;j<i;j++){e=b(a[j],j,d);if(e!=null)f[f.length]=e}return f.concat.apply([],f)},guid:1,proxy:function(a,b,d){if(arguments.length===2)if(typeof b==="string"){d=a;a=d[b];b=w}else if(b&&
-!c.isFunction(b)){d=b;b=w}if(!b&&a)b=function(){return a.apply(d||this,arguments)};if(a)b.guid=a.guid=a.guid||b.guid||c.guid++;return b},uaMatch:function(a){a=a.toLowerCase();a=/(webkit)[ \/]([\w.]+)/.exec(a)||/(opera)(?:.*version)?[ \/]([\w.]+)/.exec(a)||/(msie) ([\w.]+)/.exec(a)||!/compatible/.test(a)&&/(mozilla)(?:.*? rv:([\w.]+))?/.exec(a)||[];return{browser:a[1]||"",version:a[2]||"0"}},browser:{}});P=c.uaMatch(P);if(P.browser){c.browser[P.browser]=true;c.browser.version=P.version}if(c.browser.webkit)c.browser.safari=
-true;if(ya)c.inArray=function(a,b){return ya.call(b,a)};T=c(s);if(s.addEventListener)L=function(){s.removeEventListener("DOMContentLoaded",L,false);c.ready()};else if(s.attachEvent)L=function(){if(s.readyState==="complete"){s.detachEvent("onreadystatechange",L);c.ready()}};(function(){c.support={};var a=s.documentElement,b=s.createElement("script"),d=s.createElement("div"),f="script"+J();d.style.display="none";d.innerHTML="   <link/><table></table><a href='/a' style='color:red;float:left;opacity:.55;'>a</a><input type='checkbox'/>";
-var e=d.getElementsByTagName("*"),j=d.getElementsByTagName("a")[0];if(!(!e||!e.length||!j)){c.support={leadingWhitespace:d.firstChild.nodeType===3,tbody:!d.getElementsByTagName("tbody").length,htmlSerialize:!!d.getElementsByTagName("link").length,style:/red/.test(j.getAttribute("style")),hrefNormalized:j.getAttribute("href")==="/a",opacity:/^0.55$/.test(j.style.opacity),cssFloat:!!j.style.cssFloat,checkOn:d.getElementsByTagName("input")[0].value==="on",optSelected:s.createElement("select").appendChild(s.createElement("option")).selected,
-parentNode:d.removeChild(d.appendChild(s.createElement("div"))).parentNode===null,deleteExpando:true,checkClone:false,scriptEval:false,noCloneEvent:true,boxModel:null};b.type="text/javascript";try{b.appendChild(s.createTextNode("window."+f+"=1;"))}catch(i){}a.insertBefore(b,a.firstChild);if(A[f]){c.support.scriptEval=true;delete A[f]}try{delete b.test}catch(o){c.support.deleteExpando=false}a.removeChild(b);if(d.attachEvent&&d.fireEvent){d.attachEvent("onclick",function k(){c.support.noCloneEvent=
-false;d.detachEvent("onclick",k)});d.cloneNode(true).fireEvent("onclick")}d=s.createElement("div");d.innerHTML="<input type='radio' name='radiotest' checked='checked'/>";a=s.createDocumentFragment();a.appendChild(d.firstChild);c.support.checkClone=a.cloneNode(true).cloneNode(true).lastChild.checked;c(function(){var k=s.createElement("div");k.style.width=k.style.paddingLeft="1px";s.body.appendChild(k);c.boxModel=c.support.boxModel=k.offsetWidth===2;s.body.removeChild(k).style.display="none"});a=function(k){var n=
-s.createElement("div");k="on"+k;var r=k in n;if(!r){n.setAttribute(k,"return;");r=typeof n[k]==="function"}return r};c.support.submitBubbles=a("submit");c.support.changeBubbles=a("change");a=b=d=e=j=null}})();c.props={"for":"htmlFor","class":"className",readonly:"readOnly",maxlength:"maxLength",cellspacing:"cellSpacing",rowspan:"rowSpan",colspan:"colSpan",tabindex:"tabIndex",usemap:"useMap",frameborder:"frameBorder"};var G="jQuery"+J(),Ya=0,za={};c.extend({cache:{},expando:G,noData:{embed:true,object:true,
-applet:true},data:function(a,b,d){if(!(a.nodeName&&c.noData[a.nodeName.toLowerCase()])){a=a==A?za:a;var f=a[G],e=c.cache;if(!f&&typeof b==="string"&&d===w)return null;f||(f=++Ya);if(typeof b==="object"){a[G]=f;e[f]=c.extend(true,{},b)}else if(!e[f]){a[G]=f;e[f]={}}a=e[f];if(d!==w)a[b]=d;return typeof b==="string"?a[b]:a}},removeData:function(a,b){if(!(a.nodeName&&c.noData[a.nodeName.toLowerCase()])){a=a==A?za:a;var d=a[G],f=c.cache,e=f[d];if(b){if(e){delete e[b];c.isEmptyObject(e)&&c.removeData(a)}}else{if(c.support.deleteExpando)delete a[c.expando];
-else a.removeAttribute&&a.removeAttribute(c.expando);delete f[d]}}}});c.fn.extend({data:function(a,b){if(typeof a==="undefined"&&this.length)return c.data(this[0]);else if(typeof a==="object")return this.each(function(){c.data(this,a)});var d=a.split(".");d[1]=d[1]?"."+d[1]:"";if(b===w){var f=this.triggerHandler("getData"+d[1]+"!",[d[0]]);if(f===w&&this.length)f=c.data(this[0],a);return f===w&&d[1]?this.data(d[0]):f}else return this.trigger("setData"+d[1]+"!",[d[0],b]).each(function(){c.data(this,
-a,b)})},removeData:function(a){return this.each(function(){c.removeData(this,a)})}});c.extend({queue:function(a,b,d){if(a){b=(b||"fx")+"queue";var f=c.data(a,b);if(!d)return f||[];if(!f||c.isArray(d))f=c.data(a,b,c.makeArray(d));else f.push(d);return f}},dequeue:function(a,b){b=b||"fx";var d=c.queue(a,b),f=d.shift();if(f==="inprogress")f=d.shift();if(f){b==="fx"&&d.unshift("inprogress");f.call(a,function(){c.dequeue(a,b)})}}});c.fn.extend({queue:function(a,b){if(typeof a!=="string"){b=a;a="fx"}if(b===
-w)return c.queue(this[0],a);return this.each(function(){var d=c.queue(this,a,b);a==="fx"&&d[0]!=="inprogress"&&c.dequeue(this,a)})},dequeue:function(a){return this.each(function(){c.dequeue(this,a)})},delay:function(a,b){a=c.fx?c.fx.speeds[a]||a:a;b=b||"fx";return this.queue(b,function(){var d=this;setTimeout(function(){c.dequeue(d,b)},a)})},clearQueue:function(a){return this.queue(a||"fx",[])}});var Aa=/[\n\t]/g,ca=/\s+/,Za=/\r/g,$a=/href|src|style/,ab=/(button|input)/i,bb=/(button|input|object|select|textarea)/i,
-cb=/^(a|area)$/i,Ba=/radio|checkbox/;c.fn.extend({attr:function(a,b){return X(this,a,b,true,c.attr)},removeAttr:function(a){return this.each(function(){c.attr(this,a,"");this.nodeType===1&&this.removeAttribute(a)})},addClass:function(a){if(c.isFunction(a))return this.each(function(n){var r=c(this);r.addClass(a.call(this,n,r.attr("class")))});if(a&&typeof a==="string")for(var b=(a||"").split(ca),d=0,f=this.length;d<f;d++){var e=this[d];if(e.nodeType===1)if(e.className){for(var j=" "+e.className+" ",
-i=e.className,o=0,k=b.length;o<k;o++)if(j.indexOf(" "+b[o]+" ")<0)i+=" "+b[o];e.className=c.trim(i)}else e.className=a}return this},removeClass:function(a){if(c.isFunction(a))return this.each(function(k){var n=c(this);n.removeClass(a.call(this,k,n.attr("class")))});if(a&&typeof a==="string"||a===w)for(var b=(a||"").split(ca),d=0,f=this.length;d<f;d++){var e=this[d];if(e.nodeType===1&&e.className)if(a){for(var j=(" "+e.className+" ").replace(Aa," "),i=0,o=b.length;i<o;i++)j=j.replace(" "+b[i]+" ",
-" ");e.className=c.trim(j)}else e.className=""}return this},toggleClass:function(a,b){var d=typeof a,f=typeof b==="boolean";if(c.isFunction(a))return this.each(function(e){var j=c(this);j.toggleClass(a.call(this,e,j.attr("class"),b),b)});return this.each(function(){if(d==="string")for(var e,j=0,i=c(this),o=b,k=a.split(ca);e=k[j++];){o=f?o:!i.hasClass(e);i[o?"addClass":"removeClass"](e)}else if(d==="undefined"||d==="boolean"){this.className&&c.data(this,"__className__",this.className);this.className=
-this.className||a===false?"":c.data(this,"__className__")||""}})},hasClass:function(a){a=" "+a+" ";for(var b=0,d=this.length;b<d;b++)if((" "+this[b].className+" ").replace(Aa," ").indexOf(a)>-1)return true;return false},val:function(a){if(a===w){var b=this[0];if(b){if(c.nodeName(b,"option"))return(b.attributes.value||{}).specified?b.value:b.text;if(c.nodeName(b,"select")){var d=b.selectedIndex,f=[],e=b.options;b=b.type==="select-one";if(d<0)return null;var j=b?d:0;for(d=b?d+1:e.length;j<d;j++){var i=
-e[j];if(i.selected){a=c(i).val();if(b)return a;f.push(a)}}return f}if(Ba.test(b.type)&&!c.support.checkOn)return b.getAttribute("value")===null?"on":b.value;return(b.value||"").replace(Za,"")}return w}var o=c.isFunction(a);return this.each(function(k){var n=c(this),r=a;if(this.nodeType===1){if(o)r=a.call(this,k,n.val());if(typeof r==="number")r+="";if(c.isArray(r)&&Ba.test(this.type))this.checked=c.inArray(n.val(),r)>=0;else if(c.nodeName(this,"select")){var u=c.makeArray(r);c("option",this).each(function(){this.selected=
-c.inArray(c(this).val(),u)>=0});if(!u.length)this.selectedIndex=-1}else this.value=r}})}});c.extend({attrFn:{val:true,css:true,html:true,text:true,data:true,width:true,height:true,offset:true},attr:function(a,b,d,f){if(!a||a.nodeType===3||a.nodeType===8)return w;if(f&&b in c.attrFn)return c(a)[b](d);f=a.nodeType!==1||!c.isXMLDoc(a);var e=d!==w;b=f&&c.props[b]||b;if(a.nodeType===1){var j=$a.test(b);if(b in a&&f&&!j){if(e){b==="type"&&ab.test(a.nodeName)&&a.parentNode&&c.error("type property can't be changed");
-a[b]=d}if(c.nodeName(a,"form")&&a.getAttributeNode(b))return a.getAttributeNode(b).nodeValue;if(b==="tabIndex")return(b=a.getAttributeNode("tabIndex"))&&b.specified?b.value:bb.test(a.nodeName)||cb.test(a.nodeName)&&a.href?0:w;return a[b]}if(!c.support.style&&f&&b==="style"){if(e)a.style.cssText=""+d;return a.style.cssText}e&&a.setAttribute(b,""+d);a=!c.support.hrefNormalized&&f&&j?a.getAttribute(b,2):a.getAttribute(b);return a===null?w:a}return c.style(a,b,d)}});var O=/\.(.*)$/,db=function(a){return a.replace(/[^\w\s\.\|`]/g,
-function(b){return"\\"+b})};c.event={add:function(a,b,d,f){if(!(a.nodeType===3||a.nodeType===8)){if(a.setInterval&&a!==A&&!a.frameElement)a=A;var e,j;if(d.handler){e=d;d=e.handler}if(!d.guid)d.guid=c.guid++;if(j=c.data(a)){var i=j.events=j.events||{},o=j.handle;if(!o)j.handle=o=function(){return typeof c!=="undefined"&&!c.event.triggered?c.event.handle.apply(o.elem,arguments):w};o.elem=a;b=b.split(" ");for(var k,n=0,r;k=b[n++];){j=e?c.extend({},e):{handler:d,data:f};if(k.indexOf(".")>-1){r=k.split(".");
-k=r.shift();j.namespace=r.slice(0).sort().join(".")}else{r=[];j.namespace=""}j.type=k;j.guid=d.guid;var u=i[k],z=c.event.special[k]||{};if(!u){u=i[k]=[];if(!z.setup||z.setup.call(a,f,r,o)===false)if(a.addEventListener)a.addEventListener(k,o,false);else a.attachEvent&&a.attachEvent("on"+k,o)}if(z.add){z.add.call(a,j);if(!j.handler.guid)j.handler.guid=d.guid}u.push(j);c.event.global[k]=true}a=null}}},global:{},remove:function(a,b,d,f){if(!(a.nodeType===3||a.nodeType===8)){var e,j=0,i,o,k,n,r,u,z=c.data(a),
-C=z&&z.events;if(z&&C){if(b&&b.type){d=b.handler;b=b.type}if(!b||typeof b==="string"&&b.charAt(0)==="."){b=b||"";for(e in C)c.event.remove(a,e+b)}else{for(b=b.split(" ");e=b[j++];){n=e;i=e.indexOf(".")<0;o=[];if(!i){o=e.split(".");e=o.shift();k=new RegExp("(^|\\.)"+c.map(o.slice(0).sort(),db).join("\\.(?:.*\\.)?")+"(\\.|$)")}if(r=C[e])if(d){n=c.event.special[e]||{};for(B=f||0;B<r.length;B++){u=r[B];if(d.guid===u.guid){if(i||k.test(u.namespace)){f==null&&r.splice(B--,1);n.remove&&n.remove.call(a,u)}if(f!=
-null)break}}if(r.length===0||f!=null&&r.length===1){if(!n.teardown||n.teardown.call(a,o)===false)Ca(a,e,z.handle);delete C[e]}}else for(var B=0;B<r.length;B++){u=r[B];if(i||k.test(u.namespace)){c.event.remove(a,n,u.handler,B);r.splice(B--,1)}}}if(c.isEmptyObject(C)){if(b=z.handle)b.elem=null;delete z.events;delete z.handle;c.isEmptyObject(z)&&c.removeData(a)}}}}},trigger:function(a,b,d,f){var e=a.type||a;if(!f){a=typeof a==="object"?a[G]?a:c.extend(c.Event(e),a):c.Event(e);if(e.indexOf("!")>=0){a.type=
-e=e.slice(0,-1);a.exclusive=true}if(!d){a.stopPropagation();c.event.global[e]&&c.each(c.cache,function(){this.events&&this.events[e]&&c.event.trigger(a,b,this.handle.elem)})}if(!d||d.nodeType===3||d.nodeType===8)return w;a.result=w;a.target=d;b=c.makeArray(b);b.unshift(a)}a.currentTarget=d;(f=c.data(d,"handle"))&&f.apply(d,b);f=d.parentNode||d.ownerDocument;try{if(!(d&&d.nodeName&&c.noData[d.nodeName.toLowerCase()]))if(d["on"+e]&&d["on"+e].apply(d,b)===false)a.result=false}catch(j){}if(!a.isPropagationStopped()&&
-f)c.event.trigger(a,b,f,true);else if(!a.isDefaultPrevented()){f=a.target;var i,o=c.nodeName(f,"a")&&e==="click",k=c.event.special[e]||{};if((!k._default||k._default.call(d,a)===false)&&!o&&!(f&&f.nodeName&&c.noData[f.nodeName.toLowerCase()])){try{if(f[e]){if(i=f["on"+e])f["on"+e]=null;c.event.triggered=true;f[e]()}}catch(n){}if(i)f["on"+e]=i;c.event.triggered=false}}},handle:function(a){var b,d,f,e;a=arguments[0]=c.event.fix(a||A.event);a.currentTarget=this;b=a.type.indexOf(".")<0&&!a.exclusive;
-if(!b){d=a.type.split(".");a.type=d.shift();f=new RegExp("(^|\\.)"+d.slice(0).sort().join("\\.(?:.*\\.)?")+"(\\.|$)")}e=c.data(this,"events");d=e[a.type];if(e&&d){d=d.slice(0);e=0;for(var j=d.length;e<j;e++){var i=d[e];if(b||f.test(i.namespace)){a.handler=i.handler;a.data=i.data;a.handleObj=i;i=i.handler.apply(this,arguments);if(i!==w){a.result=i;if(i===false){a.preventDefault();a.stopPropagation()}}if(a.isImmediatePropagationStopped())break}}}return a.result},props:"altKey attrChange attrName bubbles button cancelable charCode clientX clientY ctrlKey currentTarget data detail eventPhase fromElement handler keyCode layerX layerY metaKey newValue offsetX offsetY originalTarget pageX pageY prevValue relatedNode relatedTarget screenX screenY shiftKey srcElement target toElement view wheelDelta which".split(" "),
-fix:function(a){if(a[G])return a;var b=a;a=c.Event(b);for(var d=this.props.length,f;d;){f=this.props[--d];a[f]=b[f]}if(!a.target)a.target=a.srcElement||s;if(a.target.nodeType===3)a.target=a.target.parentNode;if(!a.relatedTarget&&a.fromElement)a.relatedTarget=a.fromElement===a.target?a.toElement:a.fromElement;if(a.pageX==null&&a.clientX!=null){b=s.documentElement;d=s.body;a.pageX=a.clientX+(b&&b.scrollLeft||d&&d.scrollLeft||0)-(b&&b.clientLeft||d&&d.clientLeft||0);a.pageY=a.clientY+(b&&b.scrollTop||
-d&&d.scrollTop||0)-(b&&b.clientTop||d&&d.clientTop||0)}if(!a.which&&(a.charCode||a.charCode===0?a.charCode:a.keyCode))a.which=a.charCode||a.keyCode;if(!a.metaKey&&a.ctrlKey)a.metaKey=a.ctrlKey;if(!a.which&&a.button!==w)a.which=a.button&1?1:a.button&2?3:a.button&4?2:0;return a},guid:1E8,proxy:c.proxy,special:{ready:{setup:c.bindReady,teardown:c.noop},live:{add:function(a){c.event.add(this,a.origType,c.extend({},a,{handler:oa}))},remove:function(a){var b=true,d=a.origType.replace(O,"");c.each(c.data(this,
-"events").live||[],function(){if(d===this.origType.replace(O,""))return b=false});b&&c.event.remove(this,a.origType,oa)}},beforeunload:{setup:function(a,b,d){if(this.setInterval)this.onbeforeunload=d;return false},teardown:function(a,b){if(this.onbeforeunload===b)this.onbeforeunload=null}}}};var Ca=s.removeEventListener?function(a,b,d){a.removeEventListener(b,d,false)}:function(a,b,d){a.detachEvent("on"+b,d)};c.Event=function(a){if(!this.preventDefault)return new c.Event(a);if(a&&a.type){this.originalEvent=
-a;this.type=a.type}else this.type=a;this.timeStamp=J();this[G]=true};c.Event.prototype={preventDefault:function(){this.isDefaultPrevented=Z;var a=this.originalEvent;if(a){a.preventDefault&&a.preventDefault();a.returnValue=false}},stopPropagation:function(){this.isPropagationStopped=Z;var a=this.originalEvent;if(a){a.stopPropagation&&a.stopPropagation();a.cancelBubble=true}},stopImmediatePropagation:function(){this.isImmediatePropagationStopped=Z;this.stopPropagation()},isDefaultPrevented:Y,isPropagationStopped:Y,
-isImmediatePropagationStopped:Y};var Da=function(a){var b=a.relatedTarget;try{for(;b&&b!==this;)b=b.parentNode;if(b!==this){a.type=a.data;c.event.handle.apply(this,arguments)}}catch(d){}},Ea=function(a){a.type=a.data;c.event.handle.apply(this,arguments)};c.each({mouseenter:"mouseover",mouseleave:"mouseout"},function(a,b){c.event.special[a]={setup:function(d){c.event.add(this,b,d&&d.selector?Ea:Da,a)},teardown:function(d){c.event.remove(this,b,d&&d.selector?Ea:Da)}}});if(!c.support.submitBubbles)c.event.special.submit=
-{setup:function(){if(this.nodeName.toLowerCase()!=="form"){c.event.add(this,"click.specialSubmit",function(a){var b=a.target,d=b.type;if((d==="submit"||d==="image")&&c(b).closest("form").length)return na("submit",this,arguments)});c.event.add(this,"keypress.specialSubmit",function(a){var b=a.target,d=b.type;if((d==="text"||d==="password")&&c(b).closest("form").length&&a.keyCode===13)return na("submit",this,arguments)})}else return false},teardown:function(){c.event.remove(this,".specialSubmit")}};
-if(!c.support.changeBubbles){var da=/textarea|input|select/i,ea,Fa=function(a){var b=a.type,d=a.value;if(b==="radio"||b==="checkbox")d=a.checked;else if(b==="select-multiple")d=a.selectedIndex>-1?c.map(a.options,function(f){return f.selected}).join("-"):"";else if(a.nodeName.toLowerCase()==="select")d=a.selectedIndex;return d},fa=function(a,b){var d=a.target,f,e;if(!(!da.test(d.nodeName)||d.readOnly)){f=c.data(d,"_change_data");e=Fa(d);if(a.type!=="focusout"||d.type!=="radio")c.data(d,"_change_data",
-e);if(!(f===w||e===f))if(f!=null||e){a.type="change";return c.event.trigger(a,b,d)}}};c.event.special.change={filters:{focusout:fa,click:function(a){var b=a.target,d=b.type;if(d==="radio"||d==="checkbox"||b.nodeName.toLowerCase()==="select")return fa.call(this,a)},keydown:function(a){var b=a.target,d=b.type;if(a.keyCode===13&&b.nodeName.toLowerCase()!=="textarea"||a.keyCode===32&&(d==="checkbox"||d==="radio")||d==="select-multiple")return fa.call(this,a)},beforeactivate:function(a){a=a.target;c.data(a,
-"_change_data",Fa(a))}},setup:function(){if(this.type==="file")return false;for(var a in ea)c.event.add(this,a+".specialChange",ea[a]);return da.test(this.nodeName)},teardown:function(){c.event.remove(this,".specialChange");return da.test(this.nodeName)}};ea=c.event.special.change.filters}s.addEventListener&&c.each({focus:"focusin",blur:"focusout"},function(a,b){function d(f){f=c.event.fix(f);f.type=b;return c.event.handle.call(this,f)}c.event.special[b]={setup:function(){this.addEventListener(a,
-d,true)},teardown:function(){this.removeEventListener(a,d,true)}}});c.each(["bind","one"],function(a,b){c.fn[b]=function(d,f,e){if(typeof d==="object"){for(var j in d)this[b](j,f,d[j],e);return this}if(c.isFunction(f)){e=f;f=w}var i=b==="one"?c.proxy(e,function(k){c(this).unbind(k,i);return e.apply(this,arguments)}):e;if(d==="unload"&&b!=="one")this.one(d,f,e);else{j=0;for(var o=this.length;j<o;j++)c.event.add(this[j],d,i,f)}return this}});c.fn.extend({unbind:function(a,b){if(typeof a==="object"&&
-!a.preventDefault)for(var d in a)this.unbind(d,a[d]);else{d=0;for(var f=this.length;d<f;d++)c.event.remove(this[d],a,b)}return this},delegate:function(a,b,d,f){return this.live(b,d,f,a)},undelegate:function(a,b,d){return arguments.length===0?this.unbind("live"):this.die(b,null,d,a)},trigger:function(a,b){return this.each(function(){c.event.trigger(a,b,this)})},triggerHandler:function(a,b){if(this[0]){a=c.Event(a);a.preventDefault();a.stopPropagation();c.event.trigger(a,b,this[0]);return a.result}},
-toggle:function(a){for(var b=arguments,d=1;d<b.length;)c.proxy(a,b[d++]);return this.click(c.proxy(a,function(f){var e=(c.data(this,"lastToggle"+a.guid)||0)%d;c.data(this,"lastToggle"+a.guid,e+1);f.preventDefault();return b[e].apply(this,arguments)||false}))},hover:function(a,b){return this.mouseenter(a).mouseleave(b||a)}});var Ga={focus:"focusin",blur:"focusout",mouseenter:"mouseover",mouseleave:"mouseout"};c.each(["live","die"],function(a,b){c.fn[b]=function(d,f,e,j){var i,o=0,k,n,r=j||this.selector,
-u=j?this:c(this.context);if(c.isFunction(f)){e=f;f=w}for(d=(d||"").split(" ");(i=d[o++])!=null;){j=O.exec(i);k="";if(j){k=j[0];i=i.replace(O,"")}if(i==="hover")d.push("mouseenter"+k,"mouseleave"+k);else{n=i;if(i==="focus"||i==="blur"){d.push(Ga[i]+k);i+=k}else i=(Ga[i]||i)+k;b==="live"?u.each(function(){c.event.add(this,pa(i,r),{data:f,selector:r,handler:e,origType:i,origHandler:e,preType:n})}):u.unbind(pa(i,r),e)}}return this}});c.each("blur focus focusin focusout load resize scroll unload click dblclick mousedown mouseup mousemove mouseover mouseout mouseenter mouseleave change select submit keydown keypress keyup error".split(" "),
-function(a,b){c.fn[b]=function(d){return d?this.bind(b,d):this.trigger(b)};if(c.attrFn)c.attrFn[b]=true});A.attachEvent&&!A.addEventListener&&A.attachEvent("onunload",function(){for(var a in c.cache)if(c.cache[a].handle)try{c.event.remove(c.cache[a].handle.elem)}catch(b){}});(function(){function a(g){for(var h="",l,m=0;g[m];m++){l=g[m];if(l.nodeType===3||l.nodeType===4)h+=l.nodeValue;else if(l.nodeType!==8)h+=a(l.childNodes)}return h}function b(g,h,l,m,q,p){q=0;for(var v=m.length;q<v;q++){var t=m[q];
-if(t){t=t[g];for(var y=false;t;){if(t.sizcache===l){y=m[t.sizset];break}if(t.nodeType===1&&!p){t.sizcache=l;t.sizset=q}if(t.nodeName.toLowerCase()===h){y=t;break}t=t[g]}m[q]=y}}}function d(g,h,l,m,q,p){q=0;for(var v=m.length;q<v;q++){var t=m[q];if(t){t=t[g];for(var y=false;t;){if(t.sizcache===l){y=m[t.sizset];break}if(t.nodeType===1){if(!p){t.sizcache=l;t.sizset=q}if(typeof h!=="string"){if(t===h){y=true;break}}else if(k.filter(h,[t]).length>0){y=t;break}}t=t[g]}m[q]=y}}}var f=/((?:\((?:\([^()]+\)|[^()]+)+\)|\[(?:\[[^[\]]*\]|['"][^'"]*['"]|[^[\]'"]+)+\]|\\.|[^ >+~,(\[\\]+)+|[>+~])(\s*,\s*)?((?:.|\r|\n)*)/g,
-e=0,j=Object.prototype.toString,i=false,o=true;[0,0].sort(function(){o=false;return 0});var k=function(g,h,l,m){l=l||[];var q=h=h||s;if(h.nodeType!==1&&h.nodeType!==9)return[];if(!g||typeof g!=="string")return l;for(var p=[],v,t,y,S,H=true,M=x(h),I=g;(f.exec(""),v=f.exec(I))!==null;){I=v[3];p.push(v[1]);if(v[2]){S=v[3];break}}if(p.length>1&&r.exec(g))if(p.length===2&&n.relative[p[0]])t=ga(p[0]+p[1],h);else for(t=n.relative[p[0]]?[h]:k(p.shift(),h);p.length;){g=p.shift();if(n.relative[g])g+=p.shift();
-t=ga(g,t)}else{if(!m&&p.length>1&&h.nodeType===9&&!M&&n.match.ID.test(p[0])&&!n.match.ID.test(p[p.length-1])){v=k.find(p.shift(),h,M);h=v.expr?k.filter(v.expr,v.set)[0]:v.set[0]}if(h){v=m?{expr:p.pop(),set:z(m)}:k.find(p.pop(),p.length===1&&(p[0]==="~"||p[0]==="+")&&h.parentNode?h.parentNode:h,M);t=v.expr?k.filter(v.expr,v.set):v.set;if(p.length>0)y=z(t);else H=false;for(;p.length;){var D=p.pop();v=D;if(n.relative[D])v=p.pop();else D="";if(v==null)v=h;n.relative[D](y,v,M)}}else y=[]}y||(y=t);y||k.error(D||
-g);if(j.call(y)==="[object Array]")if(H)if(h&&h.nodeType===1)for(g=0;y[g]!=null;g++){if(y[g]&&(y[g]===true||y[g].nodeType===1&&E(h,y[g])))l.push(t[g])}else for(g=0;y[g]!=null;g++)y[g]&&y[g].nodeType===1&&l.push(t[g]);else l.push.apply(l,y);else z(y,l);if(S){k(S,q,l,m);k.uniqueSort(l)}return l};k.uniqueSort=function(g){if(B){i=o;g.sort(B);if(i)for(var h=1;h<g.length;h++)g[h]===g[h-1]&&g.splice(h--,1)}return g};k.matches=function(g,h){return k(g,null,null,h)};k.find=function(g,h,l){var m,q;if(!g)return[];
-for(var p=0,v=n.order.length;p<v;p++){var t=n.order[p];if(q=n.leftMatch[t].exec(g)){var y=q[1];q.splice(1,1);if(y.substr(y.length-1)!=="\\"){q[1]=(q[1]||"").replace(/\\/g,"");m=n.find[t](q,h,l);if(m!=null){g=g.replace(n.match[t],"");break}}}}m||(m=h.getElementsByTagName("*"));return{set:m,expr:g}};k.filter=function(g,h,l,m){for(var q=g,p=[],v=h,t,y,S=h&&h[0]&&x(h[0]);g&&h.length;){for(var H in n.filter)if((t=n.leftMatch[H].exec(g))!=null&&t[2]){var M=n.filter[H],I,D;D=t[1];y=false;t.splice(1,1);if(D.substr(D.length-
-1)!=="\\"){if(v===p)p=[];if(n.preFilter[H])if(t=n.preFilter[H](t,v,l,p,m,S)){if(t===true)continue}else y=I=true;if(t)for(var U=0;(D=v[U])!=null;U++)if(D){I=M(D,t,U,v);var Ha=m^!!I;if(l&&I!=null)if(Ha)y=true;else v[U]=false;else if(Ha){p.push(D);y=true}}if(I!==w){l||(v=p);g=g.replace(n.match[H],"");if(!y)return[];break}}}if(g===q)if(y==null)k.error(g);else break;q=g}return v};k.error=function(g){throw"Syntax error, unrecognized expression: "+g;};var n=k.selectors={order:["ID","NAME","TAG"],match:{ID:/#((?:[\w\u00c0-\uFFFF-]|\\.)+)/,
-CLASS:/\.((?:[\w\u00c0-\uFFFF-]|\\.)+)/,NAME:/\[name=['"]*((?:[\w\u00c0-\uFFFF-]|\\.)+)['"]*\]/,ATTR:/\[\s*((?:[\w\u00c0-\uFFFF-]|\\.)+)\s*(?:(\S?=)\s*(['"]*)(.*?)\3|)\s*\]/,TAG:/^((?:[\w\u00c0-\uFFFF\*-]|\\.)+)/,CHILD:/:(only|nth|last|first)-child(?:\((even|odd|[\dn+-]*)\))?/,POS:/:(nth|eq|gt|lt|first|last|even|odd)(?:\((\d*)\))?(?=[^-]|$)/,PSEUDO:/:((?:[\w\u00c0-\uFFFF-]|\\.)+)(?:\((['"]?)((?:\([^\)]+\)|[^\(\)]*)+)\2\))?/},leftMatch:{},attrMap:{"class":"className","for":"htmlFor"},attrHandle:{href:function(g){return g.getAttribute("href")}},
-relative:{"+":function(g,h){var l=typeof h==="string",m=l&&!/\W/.test(h);l=l&&!m;if(m)h=h.toLowerCase();m=0;for(var q=g.length,p;m<q;m++)if(p=g[m]){for(;(p=p.previousSibling)&&p.nodeType!==1;);g[m]=l||p&&p.nodeName.toLowerCase()===h?p||false:p===h}l&&k.filter(h,g,true)},">":function(g,h){var l=typeof h==="string";if(l&&!/\W/.test(h)){h=h.toLowerCase();for(var m=0,q=g.length;m<q;m++){var p=g[m];if(p){l=p.parentNode;g[m]=l.nodeName.toLowerCase()===h?l:false}}}else{m=0;for(q=g.length;m<q;m++)if(p=g[m])g[m]=
-l?p.parentNode:p.parentNode===h;l&&k.filter(h,g,true)}},"":function(g,h,l){var m=e++,q=d;if(typeof h==="string"&&!/\W/.test(h)){var p=h=h.toLowerCase();q=b}q("parentNode",h,m,g,p,l)},"~":function(g,h,l){var m=e++,q=d;if(typeof h==="string"&&!/\W/.test(h)){var p=h=h.toLowerCase();q=b}q("previousSibling",h,m,g,p,l)}},find:{ID:function(g,h,l){if(typeof h.getElementById!=="undefined"&&!l)return(g=h.getElementById(g[1]))?[g]:[]},NAME:function(g,h){if(typeof h.getElementsByName!=="undefined"){var l=[];
-h=h.getElementsByName(g[1]);for(var m=0,q=h.length;m<q;m++)h[m].getAttribute("name")===g[1]&&l.push(h[m]);return l.length===0?null:l}},TAG:function(g,h){return h.getElementsByTagName(g[1])}},preFilter:{CLASS:function(g,h,l,m,q,p){g=" "+g[1].replace(/\\/g,"")+" ";if(p)return g;p=0;for(var v;(v=h[p])!=null;p++)if(v)if(q^(v.className&&(" "+v.className+" ").replace(/[\t\n]/g," ").indexOf(g)>=0))l||m.push(v);else if(l)h[p]=false;return false},ID:function(g){return g[1].replace(/\\/g,"")},TAG:function(g){return g[1].toLowerCase()},
-CHILD:function(g){if(g[1]==="nth"){var h=/(-?)(\d*)n((?:\+|-)?\d*)/.exec(g[2]==="even"&&"2n"||g[2]==="odd"&&"2n+1"||!/\D/.test(g[2])&&"0n+"+g[2]||g[2]);g[2]=h[1]+(h[2]||1)-0;g[3]=h[3]-0}g[0]=e++;return g},ATTR:function(g,h,l,m,q,p){h=g[1].replace(/\\/g,"");if(!p&&n.attrMap[h])g[1]=n.attrMap[h];if(g[2]==="~=")g[4]=" "+g[4]+" ";return g},PSEUDO:function(g,h,l,m,q){if(g[1]==="not")if((f.exec(g[3])||"").length>1||/^\w/.test(g[3]))g[3]=k(g[3],null,null,h);else{g=k.filter(g[3],h,l,true^q);l||m.push.apply(m,
-g);return false}else if(n.match.POS.test(g[0])||n.match.CHILD.test(g[0]))return true;return g},POS:function(g){g.unshift(true);return g}},filters:{enabled:function(g){return g.disabled===false&&g.type!=="hidden"},disabled:function(g){return g.disabled===true},checked:function(g){return g.checked===true},selected:function(g){return g.selected===true},parent:function(g){return!!g.firstChild},empty:function(g){return!g.firstChild},has:function(g,h,l){return!!k(l[3],g).length},header:function(g){return/h\d/i.test(g.nodeName)},
-text:function(g){return"text"===g.type},radio:function(g){return"radio"===g.type},checkbox:function(g){return"checkbox"===g.type},file:function(g){return"file"===g.type},password:function(g){return"password"===g.type},submit:function(g){return"submit"===g.type},image:function(g){return"image"===g.type},reset:function(g){return"reset"===g.type},button:function(g){return"button"===g.type||g.nodeName.toLowerCase()==="button"},input:function(g){return/input|select|textarea|button/i.test(g.nodeName)}},
-setFilters:{first:function(g,h){return h===0},last:function(g,h,l,m){return h===m.length-1},even:function(g,h){return h%2===0},odd:function(g,h){return h%2===1},lt:function(g,h,l){return h<l[3]-0},gt:function(g,h,l){return h>l[3]-0},nth:function(g,h,l){return l[3]-0===h},eq:function(g,h,l){return l[3]-0===h}},filter:{PSEUDO:function(g,h,l,m){var q=h[1],p=n.filters[q];if(p)return p(g,l,h,m);else if(q==="contains")return(g.textContent||g.innerText||a([g])||"").indexOf(h[3])>=0;else if(q==="not"){h=
-h[3];l=0;for(m=h.length;l<m;l++)if(h[l]===g)return false;return true}else k.error("Syntax error, unrecognized expression: "+q)},CHILD:function(g,h){var l=h[1],m=g;switch(l){case "only":case "first":for(;m=m.previousSibling;)if(m.nodeType===1)return false;if(l==="first")return true;m=g;case "last":for(;m=m.nextSibling;)if(m.nodeType===1)return false;return true;case "nth":l=h[2];var q=h[3];if(l===1&&q===0)return true;h=h[0];var p=g.parentNode;if(p&&(p.sizcache!==h||!g.nodeIndex)){var v=0;for(m=p.firstChild;m;m=
-m.nextSibling)if(m.nodeType===1)m.nodeIndex=++v;p.sizcache=h}g=g.nodeIndex-q;return l===0?g===0:g%l===0&&g/l>=0}},ID:function(g,h){return g.nodeType===1&&g.getAttribute("id")===h},TAG:function(g,h){return h==="*"&&g.nodeType===1||g.nodeName.toLowerCase()===h},CLASS:function(g,h){return(" "+(g.className||g.getAttribute("class"))+" ").indexOf(h)>-1},ATTR:function(g,h){var l=h[1];g=n.attrHandle[l]?n.attrHandle[l](g):g[l]!=null?g[l]:g.getAttribute(l);l=g+"";var m=h[2];h=h[4];return g==null?m==="!=":m===
-"="?l===h:m==="*="?l.indexOf(h)>=0:m==="~="?(" "+l+" ").indexOf(h)>=0:!h?l&&g!==false:m==="!="?l!==h:m==="^="?l.indexOf(h)===0:m==="$="?l.substr(l.length-h.length)===h:m==="|="?l===h||l.substr(0,h.length+1)===h+"-":false},POS:function(g,h,l,m){var q=n.setFilters[h[2]];if(q)return q(g,l,h,m)}}},r=n.match.POS;for(var u in n.match){n.match[u]=new RegExp(n.match[u].source+/(?![^\[]*\])(?![^\(]*\))/.source);n.leftMatch[u]=new RegExp(/(^(?:.|\r|\n)*?)/.source+n.match[u].source.replace(/\\(\d+)/g,function(g,
-h){return"\\"+(h-0+1)}))}var z=function(g,h){g=Array.prototype.slice.call(g,0);if(h){h.push.apply(h,g);return h}return g};try{Array.prototype.slice.call(s.documentElement.childNodes,0)}catch(C){z=function(g,h){h=h||[];if(j.call(g)==="[object Array]")Array.prototype.push.apply(h,g);else if(typeof g.length==="number")for(var l=0,m=g.length;l<m;l++)h.push(g[l]);else for(l=0;g[l];l++)h.push(g[l]);return h}}var B;if(s.documentElement.compareDocumentPosition)B=function(g,h){if(!g.compareDocumentPosition||
-!h.compareDocumentPosition){if(g==h)i=true;return g.compareDocumentPosition?-1:1}g=g.compareDocumentPosition(h)&4?-1:g===h?0:1;if(g===0)i=true;return g};else if("sourceIndex"in s.documentElement)B=function(g,h){if(!g.sourceIndex||!h.sourceIndex){if(g==h)i=true;return g.sourceIndex?-1:1}g=g.sourceIndex-h.sourceIndex;if(g===0)i=true;return g};else if(s.createRange)B=function(g,h){if(!g.ownerDocument||!h.ownerDocument){if(g==h)i=true;return g.ownerDocument?-1:1}var l=g.ownerDocument.createRange(),m=
-h.ownerDocument.createRange();l.setStart(g,0);l.setEnd(g,0);m.setStart(h,0);m.setEnd(h,0);g=l.compareBoundaryPoints(Range.START_TO_END,m);if(g===0)i=true;return g};(function(){var g=s.createElement("div"),h="script"+(new Date).getTime();g.innerHTML="<a name='"+h+"'/>";var l=s.documentElement;l.insertBefore(g,l.firstChild);if(s.getElementById(h)){n.find.ID=function(m,q,p){if(typeof q.getElementById!=="undefined"&&!p)return(q=q.getElementById(m[1]))?q.id===m[1]||typeof q.getAttributeNode!=="undefined"&&
-q.getAttributeNode("id").nodeValue===m[1]?[q]:w:[]};n.filter.ID=function(m,q){var p=typeof m.getAttributeNode!=="undefined"&&m.getAttributeNode("id");return m.nodeType===1&&p&&p.nodeValue===q}}l.removeChild(g);l=g=null})();(function(){var g=s.createElement("div");g.appendChild(s.createComment(""));if(g.getElementsByTagName("*").length>0)n.find.TAG=function(h,l){l=l.getElementsByTagName(h[1]);if(h[1]==="*"){h=[];for(var m=0;l[m];m++)l[m].nodeType===1&&h.push(l[m]);l=h}return l};g.innerHTML="<a href='#'></a>";
-if(g.firstChild&&typeof g.firstChild.getAttribute!=="undefined"&&g.firstChild.getAttribute("href")!=="#")n.attrHandle.href=function(h){return h.getAttribute("href",2)};g=null})();s.querySelectorAll&&function(){var g=k,h=s.createElement("div");h.innerHTML="<p class='TEST'></p>";if(!(h.querySelectorAll&&h.querySelectorAll(".TEST").length===0)){k=function(m,q,p,v){q=q||s;if(!v&&q.nodeType===9&&!x(q))try{return z(q.querySelectorAll(m),p)}catch(t){}return g(m,q,p,v)};for(var l in g)k[l]=g[l];h=null}}();
-(function(){var g=s.createElement("div");g.innerHTML="<div class='test e'></div><div class='test'></div>";if(!(!g.getElementsByClassName||g.getElementsByClassName("e").length===0)){g.lastChild.className="e";if(g.getElementsByClassName("e").length!==1){n.order.splice(1,0,"CLASS");n.find.CLASS=function(h,l,m){if(typeof l.getElementsByClassName!=="undefined"&&!m)return l.getElementsByClassName(h[1])};g=null}}})();var E=s.compareDocumentPosition?function(g,h){return!!(g.compareDocumentPosition(h)&16)}:
-function(g,h){return g!==h&&(g.contains?g.contains(h):true)},x=function(g){return(g=(g?g.ownerDocument||g:0).documentElement)?g.nodeName!=="HTML":false},ga=function(g,h){var l=[],m="",q;for(h=h.nodeType?[h]:h;q=n.match.PSEUDO.exec(g);){m+=q[0];g=g.replace(n.match.PSEUDO,"")}g=n.relative[g]?g+"*":g;q=0;for(var p=h.length;q<p;q++)k(g,h[q],l);return k.filter(m,l)};c.find=k;c.expr=k.selectors;c.expr[":"]=c.expr.filters;c.unique=k.uniqueSort;c.text=a;c.isXMLDoc=x;c.contains=E})();var eb=/Until$/,fb=/^(?:parents|prevUntil|prevAll)/,
-gb=/,/;R=Array.prototype.slice;var Ia=function(a,b,d){if(c.isFunction(b))return c.grep(a,function(e,j){return!!b.call(e,j,e)===d});else if(b.nodeType)return c.grep(a,function(e){return e===b===d});else if(typeof b==="string"){var f=c.grep(a,function(e){return e.nodeType===1});if(Ua.test(b))return c.filter(b,f,!d);else b=c.filter(b,f)}return c.grep(a,function(e){return c.inArray(e,b)>=0===d})};c.fn.extend({find:function(a){for(var b=this.pushStack("","find",a),d=0,f=0,e=this.length;f<e;f++){d=b.length;
-c.find(a,this[f],b);if(f>0)for(var j=d;j<b.length;j++)for(var i=0;i<d;i++)if(b[i]===b[j]){b.splice(j--,1);break}}return b},has:function(a){var b=c(a);return this.filter(function(){for(var d=0,f=b.length;d<f;d++)if(c.contains(this,b[d]))return true})},not:function(a){return this.pushStack(Ia(this,a,false),"not",a)},filter:function(a){return this.pushStack(Ia(this,a,true),"filter",a)},is:function(a){return!!a&&c.filter(a,this).length>0},closest:function(a,b){if(c.isArray(a)){var d=[],f=this[0],e,j=
-{},i;if(f&&a.length){e=0;for(var o=a.length;e<o;e++){i=a[e];j[i]||(j[i]=c.expr.match.POS.test(i)?c(i,b||this.context):i)}for(;f&&f.ownerDocument&&f!==b;){for(i in j){e=j[i];if(e.jquery?e.index(f)>-1:c(f).is(e)){d.push({selector:i,elem:f});delete j[i]}}f=f.parentNode}}return d}var k=c.expr.match.POS.test(a)?c(a,b||this.context):null;return this.map(function(n,r){for(;r&&r.ownerDocument&&r!==b;){if(k?k.index(r)>-1:c(r).is(a))return r;r=r.parentNode}return null})},index:function(a){if(!a||typeof a===
-"string")return c.inArray(this[0],a?c(a):this.parent().children());return c.inArray(a.jquery?a[0]:a,this)},add:function(a,b){a=typeof a==="string"?c(a,b||this.context):c.makeArray(a);b=c.merge(this.get(),a);return this.pushStack(qa(a[0])||qa(b[0])?b:c.unique(b))},andSelf:function(){return this.add(this.prevObject)}});c.each({parent:function(a){return(a=a.parentNode)&&a.nodeType!==11?a:null},parents:function(a){return c.dir(a,"parentNode")},parentsUntil:function(a,b,d){return c.dir(a,"parentNode",
-d)},next:function(a){return c.nth(a,2,"nextSibling")},prev:function(a){return c.nth(a,2,"previousSibling")},nextAll:function(a){return c.dir(a,"nextSibling")},prevAll:function(a){return c.dir(a,"previousSibling")},nextUntil:function(a,b,d){return c.dir(a,"nextSibling",d)},prevUntil:function(a,b,d){return c.dir(a,"previousSibling",d)},siblings:function(a){return c.sibling(a.parentNode.firstChild,a)},children:function(a){return c.sibling(a.firstChild)},contents:function(a){return c.nodeName(a,"iframe")?
-a.contentDocument||a.contentWindow.document:c.makeArray(a.childNodes)}},function(a,b){c.fn[a]=function(d,f){var e=c.map(this,b,d);eb.test(a)||(f=d);if(f&&typeof f==="string")e=c.filter(f,e);e=this.length>1?c.unique(e):e;if((this.length>1||gb.test(f))&&fb.test(a))e=e.reverse();return this.pushStack(e,a,R.call(arguments).join(","))}});c.extend({filter:function(a,b,d){if(d)a=":not("+a+")";return c.find.matches(a,b)},dir:function(a,b,d){var f=[];for(a=a[b];a&&a.nodeType!==9&&(d===w||a.nodeType!==1||!c(a).is(d));){a.nodeType===
-1&&f.push(a);a=a[b]}return f},nth:function(a,b,d){b=b||1;for(var f=0;a;a=a[d])if(a.nodeType===1&&++f===b)break;return a},sibling:function(a,b){for(var d=[];a;a=a.nextSibling)a.nodeType===1&&a!==b&&d.push(a);return d}});var Ja=/ jQuery\d+="(?:\d+|null)"/g,V=/^\s+/,Ka=/(<([\w:]+)[^>]*?)\/>/g,hb=/^(?:area|br|col|embed|hr|img|input|link|meta|param)$/i,La=/<([\w:]+)/,ib=/<tbody/i,jb=/<|&#?\w+;/,ta=/<script|<object|<embed|<option|<style/i,ua=/checked\s*(?:[^=]|=\s*.checked.)/i,Ma=function(a,b,d){return hb.test(d)?
-a:b+"></"+d+">"},F={option:[1,"<select multiple='multiple'>","</select>"],legend:[1,"<fieldset>","</fieldset>"],thead:[1,"<table>","</table>"],tr:[2,"<table><tbody>","</tbody></table>"],td:[3,"<table><tbody><tr>","</tr></tbody></table>"],col:[2,"<table><tbody></tbody><colgroup>","</colgroup></table>"],area:[1,"<map>","</map>"],_default:[0,"",""]};F.optgroup=F.option;F.tbody=F.tfoot=F.colgroup=F.caption=F.thead;F.th=F.td;if(!c.support.htmlSerialize)F._default=[1,"div<div>","</div>"];c.fn.extend({text:function(a){if(c.isFunction(a))return this.each(function(b){var d=
-c(this);d.text(a.call(this,b,d.text()))});if(typeof a!=="object"&&a!==w)return this.empty().append((this[0]&&this[0].ownerDocument||s).createTextNode(a));return c.text(this)},wrapAll:function(a){if(c.isFunction(a))return this.each(function(d){c(this).wrapAll(a.call(this,d))});if(this[0]){var b=c(a,this[0].ownerDocument).eq(0).clone(true);this[0].parentNode&&b.insertBefore(this[0]);b.map(function(){for(var d=this;d.firstChild&&d.firstChild.nodeType===1;)d=d.firstChild;return d}).append(this)}return this},
-wrapInner:function(a){if(c.isFunction(a))return this.each(function(b){c(this).wrapInner(a.call(this,b))});return this.each(function(){var b=c(this),d=b.contents();d.length?d.wrapAll(a):b.append(a)})},wrap:function(a){return this.each(function(){c(this).wrapAll(a)})},unwrap:function(){return this.parent().each(function(){c.nodeName(this,"body")||c(this).replaceWith(this.childNodes)}).end()},append:function(){return this.domManip(arguments,true,function(a){this.nodeType===1&&this.appendChild(a)})},
-prepend:function(){return this.domManip(arguments,true,function(a){this.nodeType===1&&this.insertBefore(a,this.firstChild)})},before:function(){if(this[0]&&this[0].parentNode)return this.domManip(arguments,false,function(b){this.parentNode.insertBefore(b,this)});else if(arguments.length){var a=c(arguments[0]);a.push.apply(a,this.toArray());return this.pushStack(a,"before",arguments)}},after:function(){if(this[0]&&this[0].parentNode)return this.domManip(arguments,false,function(b){this.parentNode.insertBefore(b,
-this.nextSibling)});else if(arguments.length){var a=this.pushStack(this,"after",arguments);a.push.apply(a,c(arguments[0]).toArray());return a}},remove:function(a,b){for(var d=0,f;(f=this[d])!=null;d++)if(!a||c.filter(a,[f]).length){if(!b&&f.nodeType===1){c.cleanData(f.getElementsByTagName("*"));c.cleanData([f])}f.parentNode&&f.parentNode.removeChild(f)}return this},empty:function(){for(var a=0,b;(b=this[a])!=null;a++)for(b.nodeType===1&&c.cleanData(b.getElementsByTagName("*"));b.firstChild;)b.removeChild(b.firstChild);
-return this},clone:function(a){var b=this.map(function(){if(!c.support.noCloneEvent&&!c.isXMLDoc(this)){var d=this.outerHTML,f=this.ownerDocument;if(!d){d=f.createElement("div");d.appendChild(this.cloneNode(true));d=d.innerHTML}return c.clean([d.replace(Ja,"").replace(/=([^="'>\s]+\/)>/g,'="$1">').replace(V,"")],f)[0]}else return this.cloneNode(true)});if(a===true){ra(this,b);ra(this.find("*"),b.find("*"))}return b},html:function(a){if(a===w)return this[0]&&this[0].nodeType===1?this[0].innerHTML.replace(Ja,
-""):null;else if(typeof a==="string"&&!ta.test(a)&&(c.support.leadingWhitespace||!V.test(a))&&!F[(La.exec(a)||["",""])[1].toLowerCase()]){a=a.replace(Ka,Ma);try{for(var b=0,d=this.length;b<d;b++)if(this[b].nodeType===1){c.cleanData(this[b].getElementsByTagName("*"));this[b].innerHTML=a}}catch(f){this.empty().append(a)}}else c.isFunction(a)?this.each(function(e){var j=c(this),i=j.html();j.empty().append(function(){return a.call(this,e,i)})}):this.empty().append(a);return this},replaceWith:function(a){if(this[0]&&
-this[0].parentNode){if(c.isFunction(a))return this.each(function(b){var d=c(this),f=d.html();d.replaceWith(a.call(this,b,f))});if(typeof a!=="string")a=c(a).detach();return this.each(function(){var b=this.nextSibling,d=this.parentNode;c(this).remove();b?c(b).before(a):c(d).append(a)})}else return this.pushStack(c(c.isFunction(a)?a():a),"replaceWith",a)},detach:function(a){return this.remove(a,true)},domManip:function(a,b,d){function f(u){return c.nodeName(u,"table")?u.getElementsByTagName("tbody")[0]||
-u.appendChild(u.ownerDocument.createElement("tbody")):u}var e,j,i=a[0],o=[],k;if(!c.support.checkClone&&arguments.length===3&&typeof i==="string"&&ua.test(i))return this.each(function(){c(this).domManip(a,b,d,true)});if(c.isFunction(i))return this.each(function(u){var z=c(this);a[0]=i.call(this,u,b?z.html():w);z.domManip(a,b,d)});if(this[0]){e=i&&i.parentNode;e=c.support.parentNode&&e&&e.nodeType===11&&e.childNodes.length===this.length?{fragment:e}:sa(a,this,o);k=e.fragment;if(j=k.childNodes.length===
-1?(k=k.firstChild):k.firstChild){b=b&&c.nodeName(j,"tr");for(var n=0,r=this.length;n<r;n++)d.call(b?f(this[n],j):this[n],n>0||e.cacheable||this.length>1?k.cloneNode(true):k)}o.length&&c.each(o,Qa)}return this}});c.fragments={};c.each({appendTo:"append",prependTo:"prepend",insertBefore:"before",insertAfter:"after",replaceAll:"replaceWith"},function(a,b){c.fn[a]=function(d){var f=[];d=c(d);var e=this.length===1&&this[0].parentNode;if(e&&e.nodeType===11&&e.childNodes.length===1&&d.length===1){d[b](this[0]);
-return this}else{e=0;for(var j=d.length;e<j;e++){var i=(e>0?this.clone(true):this).get();c.fn[b].apply(c(d[e]),i);f=f.concat(i)}return this.pushStack(f,a,d.selector)}}});c.extend({clean:function(a,b,d,f){b=b||s;if(typeof b.createElement==="undefined")b=b.ownerDocument||b[0]&&b[0].ownerDocument||s;for(var e=[],j=0,i;(i=a[j])!=null;j++){if(typeof i==="number")i+="";if(i){if(typeof i==="string"&&!jb.test(i))i=b.createTextNode(i);else if(typeof i==="string"){i=i.replace(Ka,Ma);var o=(La.exec(i)||["",
-""])[1].toLowerCase(),k=F[o]||F._default,n=k[0],r=b.createElement("div");for(r.innerHTML=k[1]+i+k[2];n--;)r=r.lastChild;if(!c.support.tbody){n=ib.test(i);o=o==="table"&&!n?r.firstChild&&r.firstChild.childNodes:k[1]==="<table>"&&!n?r.childNodes:[];for(k=o.length-1;k>=0;--k)c.nodeName(o[k],"tbody")&&!o[k].childNodes.length&&o[k].parentNode.removeChild(o[k])}!c.support.leadingWhitespace&&V.test(i)&&r.insertBefore(b.createTextNode(V.exec(i)[0]),r.firstChild);i=r.childNodes}if(i.nodeType)e.push(i);else e=
-c.merge(e,i)}}if(d)for(j=0;e[j];j++)if(f&&c.nodeName(e[j],"script")&&(!e[j].type||e[j].type.toLowerCase()==="text/javascript"))f.push(e[j].parentNode?e[j].parentNode.removeChild(e[j]):e[j]);else{e[j].nodeType===1&&e.splice.apply(e,[j+1,0].concat(c.makeArray(e[j].getElementsByTagName("script"))));d.appendChild(e[j])}return e},cleanData:function(a){for(var b,d,f=c.cache,e=c.event.special,j=c.support.deleteExpando,i=0,o;(o=a[i])!=null;i++)if(d=o[c.expando]){b=f[d];if(b.events)for(var k in b.events)e[k]?
-c.event.remove(o,k):Ca(o,k,b.handle);if(j)delete o[c.expando];else o.removeAttribute&&o.removeAttribute(c.expando);delete f[d]}}});var kb=/z-?index|font-?weight|opacity|zoom|line-?height/i,Na=/alpha\([^)]*\)/,Oa=/opacity=([^)]*)/,ha=/float/i,ia=/-([a-z])/ig,lb=/([A-Z])/g,mb=/^-?\d+(?:px)?$/i,nb=/^-?\d/,ob={position:"absolute",visibility:"hidden",display:"block"},pb=["Left","Right"],qb=["Top","Bottom"],rb=s.defaultView&&s.defaultView.getComputedStyle,Pa=c.support.cssFloat?"cssFloat":"styleFloat",ja=
-function(a,b){return b.toUpperCase()};c.fn.css=function(a,b){return X(this,a,b,true,function(d,f,e){if(e===w)return c.curCSS(d,f);if(typeof e==="number"&&!kb.test(f))e+="px";c.style(d,f,e)})};c.extend({style:function(a,b,d){if(!a||a.nodeType===3||a.nodeType===8)return w;if((b==="width"||b==="height")&&parseFloat(d)<0)d=w;var f=a.style||a,e=d!==w;if(!c.support.opacity&&b==="opacity"){if(e){f.zoom=1;b=parseInt(d,10)+""==="NaN"?"":"alpha(opacity="+d*100+")";a=f.filter||c.curCSS(a,"filter")||"";f.filter=
-Na.test(a)?a.replace(Na,b):b}return f.filter&&f.filter.indexOf("opacity=")>=0?parseFloat(Oa.exec(f.filter)[1])/100+"":""}if(ha.test(b))b=Pa;b=b.replace(ia,ja);if(e)f[b]=d;return f[b]},css:function(a,b,d,f){if(b==="width"||b==="height"){var e,j=b==="width"?pb:qb;function i(){e=b==="width"?a.offsetWidth:a.offsetHeight;f!=="border"&&c.each(j,function(){f||(e-=parseFloat(c.curCSS(a,"padding"+this,true))||0);if(f==="margin")e+=parseFloat(c.curCSS(a,"margin"+this,true))||0;else e-=parseFloat(c.curCSS(a,
-"border"+this+"Width",true))||0})}a.offsetWidth!==0?i():c.swap(a,ob,i);return Math.max(0,Math.round(e))}return c.curCSS(a,b,d)},curCSS:function(a,b,d){var f,e=a.style;if(!c.support.opacity&&b==="opacity"&&a.currentStyle){f=Oa.test(a.currentStyle.filter||"")?parseFloat(RegExp.$1)/100+"":"";return f===""?"1":f}if(ha.test(b))b=Pa;if(!d&&e&&e[b])f=e[b];else if(rb){if(ha.test(b))b="float";b=b.replace(lb,"-$1").toLowerCase();e=a.ownerDocument.defaultView;if(!e)return null;if(a=e.getComputedStyle(a,null))f=
-a.getPropertyValue(b);if(b==="opacity"&&f==="")f="1"}else if(a.currentStyle){d=b.replace(ia,ja);f=a.currentStyle[b]||a.currentStyle[d];if(!mb.test(f)&&nb.test(f)){b=e.left;var j=a.runtimeStyle.left;a.runtimeStyle.left=a.currentStyle.left;e.left=d==="fontSize"?"1em":f||0;f=e.pixelLeft+"px";e.left=b;a.runtimeStyle.left=j}}return f},swap:function(a,b,d){var f={};for(var e in b){f[e]=a.style[e];a.style[e]=b[e]}d.call(a);for(e in b)a.style[e]=f[e]}});if(c.expr&&c.expr.filters){c.expr.filters.hidden=function(a){var b=
-a.offsetWidth,d=a.offsetHeight,f=a.nodeName.toLowerCase()==="tr";return b===0&&d===0&&!f?true:b>0&&d>0&&!f?false:c.curCSS(a,"display")==="none"};c.expr.filters.visible=function(a){return!c.expr.filters.hidden(a)}}var sb=J(),tb=/<script(.|\s)*?\/script>/gi,ub=/select|textarea/i,vb=/color|date|datetime|email|hidden|month|number|password|range|search|tel|text|time|url|week/i,N=/=\?(&|$)/,ka=/\?/,wb=/(\?|&)_=.*?(&|$)/,xb=/^(\w+:)?\/\/([^\/?#]+)/,yb=/%20/g,zb=c.fn.load;c.fn.extend({load:function(a,b,d){if(typeof a!==
-"string")return zb.call(this,a);else if(!this.length)return this;var f=a.indexOf(" ");if(f>=0){var e=a.slice(f,a.length);a=a.slice(0,f)}f="GET";if(b)if(c.isFunction(b)){d=b;b=null}else if(typeof b==="object"){b=c.param(b,c.ajaxSettings.traditional);f="POST"}var j=this;c.ajax({url:a,type:f,dataType:"html",data:b,complete:function(i,o){if(o==="success"||o==="notmodified")j.html(e?c("<div />").append(i.responseText.replace(tb,"")).find(e):i.responseText);d&&j.each(d,[i.responseText,o,i])}});return this},
-serialize:function(){return c.param(this.serializeArray())},serializeArray:function(){return this.map(function(){return this.elements?c.makeArray(this.elements):this}).filter(function(){return this.name&&!this.disabled&&(this.checked||ub.test(this.nodeName)||vb.test(this.type))}).map(function(a,b){a=c(this).val();return a==null?null:c.isArray(a)?c.map(a,function(d){return{name:b.name,value:d}}):{name:b.name,value:a}}).get()}});c.each("ajaxStart ajaxStop ajaxComplete ajaxError ajaxSuccess ajaxSend".split(" "),
-function(a,b){c.fn[b]=function(d){return this.bind(b,d)}});c.extend({get:function(a,b,d,f){if(c.isFunction(b)){f=f||d;d=b;b=null}return c.ajax({type:"GET",url:a,data:b,success:d,dataType:f})},getScript:function(a,b){return c.get(a,null,b,"script")},getJSON:function(a,b,d){return c.get(a,b,d,"json")},post:function(a,b,d,f){if(c.isFunction(b)){f=f||d;d=b;b={}}return c.ajax({type:"POST",url:a,data:b,success:d,dataType:f})},ajaxSetup:function(a){c.extend(c.ajaxSettings,a)},ajaxSettings:{url:location.href,
-global:true,type:"GET",contentType:"application/x-www-form-urlencoded",processData:true,async:true,xhr:A.XMLHttpRequest&&(A.location.protocol!=="file:"||!A.ActiveXObject)?function(){return new A.XMLHttpRequest}:function(){try{return new A.ActiveXObject("Microsoft.XMLHTTP")}catch(a){}},accepts:{xml:"application/xml, text/xml",html:"text/html",script:"text/javascript, application/javascript",json:"application/json, text/javascript",text:"text/plain",_default:"*/*"}},lastModified:{},etag:{},ajax:function(a){function b(){e.success&&
-e.success.call(k,o,i,x);e.global&&f("ajaxSuccess",[x,e])}function d(){e.complete&&e.complete.call(k,x,i);e.global&&f("ajaxComplete",[x,e]);e.global&&!--c.active&&c.event.trigger("ajaxStop")}function f(q,p){(e.context?c(e.context):c.event).trigger(q,p)}var e=c.extend(true,{},c.ajaxSettings,a),j,i,o,k=a&&a.context||e,n=e.type.toUpperCase();if(e.data&&e.processData&&typeof e.data!=="string")e.data=c.param(e.data,e.traditional);if(e.dataType==="jsonp"){if(n==="GET")N.test(e.url)||(e.url+=(ka.test(e.url)?
-"&":"?")+(e.jsonp||"callback")+"=?");else if(!e.data||!N.test(e.data))e.data=(e.data?e.data+"&":"")+(e.jsonp||"callback")+"=?";e.dataType="json"}if(e.dataType==="json"&&(e.data&&N.test(e.data)||N.test(e.url))){j=e.jsonpCallback||"jsonp"+sb++;if(e.data)e.data=(e.data+"").replace(N,"="+j+"$1");e.url=e.url.replace(N,"="+j+"$1");e.dataType="script";A[j]=A[j]||function(q){o=q;b();d();A[j]=w;try{delete A[j]}catch(p){}z&&z.removeChild(C)}}if(e.dataType==="script"&&e.cache===null)e.cache=false;if(e.cache===
-false&&n==="GET"){var r=J(),u=e.url.replace(wb,"$1_="+r+"$2");e.url=u+(u===e.url?(ka.test(e.url)?"&":"?")+"_="+r:"")}if(e.data&&n==="GET")e.url+=(ka.test(e.url)?"&":"?")+e.data;e.global&&!c.active++&&c.event.trigger("ajaxStart");r=(r=xb.exec(e.url))&&(r[1]&&r[1]!==location.protocol||r[2]!==location.host);if(e.dataType==="script"&&n==="GET"&&r){var z=s.getElementsByTagName("head")[0]||s.documentElement,C=s.createElement("script");C.src=e.url;if(e.scriptCharset)C.charset=e.scriptCharset;if(!j){var B=
-false;C.onload=C.onreadystatechange=function(){if(!B&&(!this.readyState||this.readyState==="loaded"||this.readyState==="complete")){B=true;b();d();C.onload=C.onreadystatechange=null;z&&C.parentNode&&z.removeChild(C)}}}z.insertBefore(C,z.firstChild);return w}var E=false,x=e.xhr();if(x){e.username?x.open(n,e.url,e.async,e.username,e.password):x.open(n,e.url,e.async);try{if(e.data||a&&a.contentType)x.setRequestHeader("Content-Type",e.contentType);if(e.ifModified){c.lastModified[e.url]&&x.setRequestHeader("If-Modified-Since",
-c.lastModified[e.url]);c.etag[e.url]&&x.setRequestHeader("If-None-Match",c.etag[e.url])}r||x.setRequestHeader("X-Requested-With","XMLHttpRequest");x.setRequestHeader("Accept",e.dataType&&e.accepts[e.dataType]?e.accepts[e.dataType]+", */*":e.accepts._default)}catch(ga){}if(e.beforeSend&&e.beforeSend.call(k,x,e)===false){e.global&&!--c.active&&c.event.trigger("ajaxStop");x.abort();return false}e.global&&f("ajaxSend",[x,e]);var g=x.onreadystatechange=function(q){if(!x||x.readyState===0||q==="abort"){E||
-d();E=true;if(x)x.onreadystatechange=c.noop}else if(!E&&x&&(x.readyState===4||q==="timeout")){E=true;x.onreadystatechange=c.noop;i=q==="timeout"?"timeout":!c.httpSuccess(x)?"error":e.ifModified&&c.httpNotModified(x,e.url)?"notmodified":"success";var p;if(i==="success")try{o=c.httpData(x,e.dataType,e)}catch(v){i="parsererror";p=v}if(i==="success"||i==="notmodified")j||b();else c.handleError(e,x,i,p);d();q==="timeout"&&x.abort();if(e.async)x=null}};try{var h=x.abort;x.abort=function(){x&&h.call(x);
-g("abort")}}catch(l){}e.async&&e.timeout>0&&setTimeout(function(){x&&!E&&g("timeout")},e.timeout);try{x.send(n==="POST"||n==="PUT"||n==="DELETE"?e.data:null)}catch(m){c.handleError(e,x,null,m);d()}e.async||g();return x}},handleError:function(a,b,d,f){if(a.error)a.error.call(a.context||a,b,d,f);if(a.global)(a.context?c(a.context):c.event).trigger("ajaxError",[b,a,f])},active:0,httpSuccess:function(a){try{return!a.status&&location.protocol==="file:"||a.status>=200&&a.status<300||a.status===304||a.status===
-1223||a.status===0}catch(b){}return false},httpNotModified:function(a,b){var d=a.getResponseHeader("Last-Modified"),f=a.getResponseHeader("Etag");if(d)c.lastModified[b]=d;if(f)c.etag[b]=f;return a.status===304||a.status===0},httpData:function(a,b,d){var f=a.getResponseHeader("content-type")||"",e=b==="xml"||!b&&f.indexOf("xml")>=0;a=e?a.responseXML:a.responseText;e&&a.documentElement.nodeName==="parsererror"&&c.error("parsererror");if(d&&d.dataFilter)a=d.dataFilter(a,b);if(typeof a==="string")if(b===
-"json"||!b&&f.indexOf("json")>=0)a=c.parseJSON(a);else if(b==="script"||!b&&f.indexOf("javascript")>=0)c.globalEval(a);return a},param:function(a,b){function d(i,o){if(c.isArray(o))c.each(o,function(k,n){b||/\[\]$/.test(i)?f(i,n):d(i+"["+(typeof n==="object"||c.isArray(n)?k:"")+"]",n)});else!b&&o!=null&&typeof o==="object"?c.each(o,function(k,n){d(i+"["+k+"]",n)}):f(i,o)}function f(i,o){o=c.isFunction(o)?o():o;e[e.length]=encodeURIComponent(i)+"="+encodeURIComponent(o)}var e=[];if(b===w)b=c.ajaxSettings.traditional;
-if(c.isArray(a)||a.jquery)c.each(a,function(){f(this.name,this.value)});else for(var j in a)d(j,a[j]);return e.join("&").replace(yb,"+")}});var la={},Ab=/toggle|show|hide/,Bb=/^([+-]=)?([\d+-.]+)(.*)$/,W,va=[["height","marginTop","marginBottom","paddingTop","paddingBottom"],["width","marginLeft","marginRight","paddingLeft","paddingRight"],["opacity"]];c.fn.extend({show:function(a,b){if(a||a===0)return this.animate(K("show",3),a,b);else{a=0;for(b=this.length;a<b;a++){var d=c.data(this[a],"olddisplay");
-this[a].style.display=d||"";if(c.css(this[a],"display")==="none"){d=this[a].nodeName;var f;if(la[d])f=la[d];else{var e=c("<"+d+" />").appendTo("body");f=e.css("display");if(f==="none")f="block";e.remove();la[d]=f}c.data(this[a],"olddisplay",f)}}a=0;for(b=this.length;a<b;a++)this[a].style.display=c.data(this[a],"olddisplay")||"";return this}},hide:function(a,b){if(a||a===0)return this.animate(K("hide",3),a,b);else{a=0;for(b=this.length;a<b;a++){var d=c.data(this[a],"olddisplay");!d&&d!=="none"&&c.data(this[a],
-"olddisplay",c.css(this[a],"display"))}a=0;for(b=this.length;a<b;a++)this[a].style.display="none";return this}},_toggle:c.fn.toggle,toggle:function(a,b){var d=typeof a==="boolean";if(c.isFunction(a)&&c.isFunction(b))this._toggle.apply(this,arguments);else a==null||d?this.each(function(){var f=d?a:c(this).is(":hidden");c(this)[f?"show":"hide"]()}):this.animate(K("toggle",3),a,b);return this},fadeTo:function(a,b,d){return this.filter(":hidden").css("opacity",0).show().end().animate({opacity:b},a,d)},
-animate:function(a,b,d,f){var e=c.speed(b,d,f);if(c.isEmptyObject(a))return this.each(e.complete);return this[e.queue===false?"each":"queue"](function(){var j=c.extend({},e),i,o=this.nodeType===1&&c(this).is(":hidden"),k=this;for(i in a){var n=i.replace(ia,ja);if(i!==n){a[n]=a[i];delete a[i];i=n}if(a[i]==="hide"&&o||a[i]==="show"&&!o)return j.complete.call(this);if((i==="height"||i==="width")&&this.style){j.display=c.css(this,"display");j.overflow=this.style.overflow}if(c.isArray(a[i])){(j.specialEasing=
-j.specialEasing||{})[i]=a[i][1];a[i]=a[i][0]}}if(j.overflow!=null)this.style.overflow="hidden";j.curAnim=c.extend({},a);c.each(a,function(r,u){var z=new c.fx(k,j,r);if(Ab.test(u))z[u==="toggle"?o?"show":"hide":u](a);else{var C=Bb.exec(u),B=z.cur(true)||0;if(C){u=parseFloat(C[2]);var E=C[3]||"px";if(E!=="px"){k.style[r]=(u||1)+E;B=(u||1)/z.cur(true)*B;k.style[r]=B+E}if(C[1])u=(C[1]==="-="?-1:1)*u+B;z.custom(B,u,E)}else z.custom(B,u,"")}});return true})},stop:function(a,b){var d=c.timers;a&&this.queue([]);
-this.each(function(){for(var f=d.length-1;f>=0;f--)if(d[f].elem===this){b&&d[f](true);d.splice(f,1)}});b||this.dequeue();return this}});c.each({slideDown:K("show",1),slideUp:K("hide",1),slideToggle:K("toggle",1),fadeIn:{opacity:"show"},fadeOut:{opacity:"hide"}},function(a,b){c.fn[a]=function(d,f){return this.animate(b,d,f)}});c.extend({speed:function(a,b,d){var f=a&&typeof a==="object"?a:{complete:d||!d&&b||c.isFunction(a)&&a,duration:a,easing:d&&b||b&&!c.isFunction(b)&&b};f.duration=c.fx.off?0:typeof f.duration===
-"number"?f.duration:c.fx.speeds[f.duration]||c.fx.speeds._default;f.old=f.complete;f.complete=function(){f.queue!==false&&c(this).dequeue();c.isFunction(f.old)&&f.old.call(this)};return f},easing:{linear:function(a,b,d,f){return d+f*a},swing:function(a,b,d,f){return(-Math.cos(a*Math.PI)/2+0.5)*f+d}},timers:[],fx:function(a,b,d){this.options=b;this.elem=a;this.prop=d;if(!b.orig)b.orig={}}});c.fx.prototype={update:function(){this.options.step&&this.options.step.call(this.elem,this.now,this);(c.fx.step[this.prop]||
-c.fx.step._default)(this);if((this.prop==="height"||this.prop==="width")&&this.elem.style)this.elem.style.display="block"},cur:function(a){if(this.elem[this.prop]!=null&&(!this.elem.style||this.elem.style[this.prop]==null))return this.elem[this.prop];return(a=parseFloat(c.css(this.elem,this.prop,a)))&&a>-10000?a:parseFloat(c.curCSS(this.elem,this.prop))||0},custom:function(a,b,d){function f(j){return e.step(j)}this.startTime=J();this.start=a;this.end=b;this.unit=d||this.unit||"px";this.now=this.start;
-this.pos=this.state=0;var e=this;f.elem=this.elem;if(f()&&c.timers.push(f)&&!W)W=setInterval(c.fx.tick,13)},show:function(){this.options.orig[this.prop]=c.style(this.elem,this.prop);this.options.show=true;this.custom(this.prop==="width"||this.prop==="height"?1:0,this.cur());c(this.elem).show()},hide:function(){this.options.orig[this.prop]=c.style(this.elem,this.prop);this.options.hide=true;this.custom(this.cur(),0)},step:function(a){var b=J(),d=true;if(a||b>=this.options.duration+this.startTime){this.now=
-this.end;this.pos=this.state=1;this.update();this.options.curAnim[this.prop]=true;for(var f in this.options.curAnim)if(this.options.curAnim[f]!==true)d=false;if(d){if(this.options.display!=null){this.elem.style.overflow=this.options.overflow;a=c.data(this.elem,"olddisplay");this.elem.style.display=a?a:this.options.display;if(c.css(this.elem,"display")==="none")this.elem.style.display="block"}this.options.hide&&c(this.elem).hide();if(this.options.hide||this.options.show)for(var e in this.options.curAnim)c.style(this.elem,
-e,this.options.orig[e]);this.options.complete.call(this.elem)}return false}else{e=b-this.startTime;this.state=e/this.options.duration;a=this.options.easing||(c.easing.swing?"swing":"linear");this.pos=c.easing[this.options.specialEasing&&this.options.specialEasing[this.prop]||a](this.state,e,0,1,this.options.duration);this.now=this.start+(this.end-this.start)*this.pos;this.update()}return true}};c.extend(c.fx,{tick:function(){for(var a=c.timers,b=0;b<a.length;b++)a[b]()||a.splice(b--,1);a.length||
-c.fx.stop()},stop:function(){clearInterval(W);W=null},speeds:{slow:600,fast:200,_default:400},step:{opacity:function(a){c.style(a.elem,"opacity",a.now)},_default:function(a){if(a.elem.style&&a.elem.style[a.prop]!=null)a.elem.style[a.prop]=(a.prop==="width"||a.prop==="height"?Math.max(0,a.now):a.now)+a.unit;else a.elem[a.prop]=a.now}}});if(c.expr&&c.expr.filters)c.expr.filters.animated=function(a){return c.grep(c.timers,function(b){return a===b.elem}).length};c.fn.offset="getBoundingClientRect"in s.documentElement?
-function(a){var b=this[0];if(a)return this.each(function(e){c.offset.setOffset(this,a,e)});if(!b||!b.ownerDocument)return null;if(b===b.ownerDocument.body)return c.offset.bodyOffset(b);var d=b.getBoundingClientRect(),f=b.ownerDocument;b=f.body;f=f.documentElement;return{top:d.top+(self.pageYOffset||c.support.boxModel&&f.scrollTop||b.scrollTop)-(f.clientTop||b.clientTop||0),left:d.left+(self.pageXOffset||c.support.boxModel&&f.scrollLeft||b.scrollLeft)-(f.clientLeft||b.clientLeft||0)}}:function(a){var b=
-this[0];if(a)return this.each(function(r){c.offset.setOffset(this,a,r)});if(!b||!b.ownerDocument)return null;if(b===b.ownerDocument.body)return c.offset.bodyOffset(b);c.offset.initialize();var d=b.offsetParent,f=b,e=b.ownerDocument,j,i=e.documentElement,o=e.body;f=(e=e.defaultView)?e.getComputedStyle(b,null):b.currentStyle;for(var k=b.offsetTop,n=b.offsetLeft;(b=b.parentNode)&&b!==o&&b!==i;){if(c.offset.supportsFixedPosition&&f.position==="fixed")break;j=e?e.getComputedStyle(b,null):b.currentStyle;
-k-=b.scrollTop;n-=b.scrollLeft;if(b===d){k+=b.offsetTop;n+=b.offsetLeft;if(c.offset.doesNotAddBorder&&!(c.offset.doesAddBorderForTableAndCells&&/^t(able|d|h)$/i.test(b.nodeName))){k+=parseFloat(j.borderTopWidth)||0;n+=parseFloat(j.borderLeftWidth)||0}f=d;d=b.offsetParent}if(c.offset.subtractsBorderForOverflowNotVisible&&j.overflow!=="visible"){k+=parseFloat(j.borderTopWidth)||0;n+=parseFloat(j.borderLeftWidth)||0}f=j}if(f.position==="relative"||f.position==="static"){k+=o.offsetTop;n+=o.offsetLeft}if(c.offset.supportsFixedPosition&&
-f.position==="fixed"){k+=Math.max(i.scrollTop,o.scrollTop);n+=Math.max(i.scrollLeft,o.scrollLeft)}return{top:k,left:n}};c.offset={initialize:function(){var a=s.body,b=s.createElement("div"),d,f,e,j=parseFloat(c.curCSS(a,"marginTop",true))||0;c.extend(b.style,{position:"absolute",top:0,left:0,margin:0,border:0,width:"1px",height:"1px",visibility:"hidden"});b.innerHTML="<div style='position:absolute;top:0;left:0;margin:0;border:5px solid #000;padding:0;width:1px;height:1px;'><div></div></div><table style='position:absolute;top:0;left:0;margin:0;border:5px solid #000;padding:0;width:1px;height:1px;' cellpadding='0' cellspacing='0'><tr><td></td></tr></table>";
-a.insertBefore(b,a.firstChild);d=b.firstChild;f=d.firstChild;e=d.nextSibling.firstChild.firstChild;this.doesNotAddBorder=f.offsetTop!==5;this.doesAddBorderForTableAndCells=e.offsetTop===5;f.style.position="fixed";f.style.top="20px";this.supportsFixedPosition=f.offsetTop===20||f.offsetTop===15;f.style.position=f.style.top="";d.style.overflow="hidden";d.style.position="relative";this.subtractsBorderForOverflowNotVisible=f.offsetTop===-5;this.doesNotIncludeMarginInBodyOffset=a.offsetTop!==j;a.removeChild(b);
-c.offset.initialize=c.noop},bodyOffset:function(a){var b=a.offsetTop,d=a.offsetLeft;c.offset.initialize();if(c.offset.doesNotIncludeMarginInBodyOffset){b+=parseFloat(c.curCSS(a,"marginTop",true))||0;d+=parseFloat(c.curCSS(a,"marginLeft",true))||0}return{top:b,left:d}},setOffset:function(a,b,d){if(/static/.test(c.curCSS(a,"position")))a.style.position="relative";var f=c(a),e=f.offset(),j=parseInt(c.curCSS(a,"top",true),10)||0,i=parseInt(c.curCSS(a,"left",true),10)||0;if(c.isFunction(b))b=b.call(a,
-d,e);d={top:b.top-e.top+j,left:b.left-e.left+i};"using"in b?b.using.call(a,d):f.css(d)}};c.fn.extend({position:function(){if(!this[0])return null;var a=this[0],b=this.offsetParent(),d=this.offset(),f=/^body|html$/i.test(b[0].nodeName)?{top:0,left:0}:b.offset();d.top-=parseFloat(c.curCSS(a,"marginTop",true))||0;d.left-=parseFloat(c.curCSS(a,"marginLeft",true))||0;f.top+=parseFloat(c.curCSS(b[0],"borderTopWidth",true))||0;f.left+=parseFloat(c.curCSS(b[0],"borderLeftWidth",true))||0;return{top:d.top-
-f.top,left:d.left-f.left}},offsetParent:function(){return this.map(function(){for(var a=this.offsetParent||s.body;a&&!/^body|html$/i.test(a.nodeName)&&c.css(a,"position")==="static";)a=a.offsetParent;return a})}});c.each(["Left","Top"],function(a,b){var d="scroll"+b;c.fn[d]=function(f){var e=this[0],j;if(!e)return null;if(f!==w)return this.each(function(){if(j=wa(this))j.scrollTo(!a?f:c(j).scrollLeft(),a?f:c(j).scrollTop());else this[d]=f});else return(j=wa(e))?"pageXOffset"in j?j[a?"pageYOffset":
-"pageXOffset"]:c.support.boxModel&&j.document.documentElement[d]||j.document.body[d]:e[d]}});c.each(["Height","Width"],function(a,b){var d=b.toLowerCase();c.fn["inner"+b]=function(){return this[0]?c.css(this[0],d,false,"padding"):null};c.fn["outer"+b]=function(f){return this[0]?c.css(this[0],d,false,f?"margin":"border"):null};c.fn[d]=function(f){var e=this[0];if(!e)return f==null?null:this;if(c.isFunction(f))return this.each(function(j){var i=c(this);i[d](f.call(this,j,i[d]()))});return"scrollTo"in
-e&&e.document?e.document.compatMode==="CSS1Compat"&&e.document.documentElement["client"+b]||e.document.body["client"+b]:e.nodeType===9?Math.max(e.documentElement["client"+b],e.body["scroll"+b],e.documentElement["scroll"+b],e.body["offset"+b],e.documentElement["offset"+b]):f===w?c.css(e,d):this.css(d,typeof f==="string"?f:f+"px")}});A.jQuery=A.$=c})(window);

web/license.html

@@ -1,636 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
-        "http://www.w3.org/TR/html4/loose.dtd">
-<html>
-<head>
-	<link rel="shortcut icon" type="image/x-icon" href="favicon.ico" />
-	<title>OpenRA - License</title>
-	<link rel="Stylesheet" type="text/css" href="openra.css" />
-	<!--[if IE 7]>
-			<link rel="stylesheet" type="text/css" href="ie7.css">
-		<![endif]-->
-</head>
-<body>
-	<div id="header" class="bar">
-		<h1>
-			<img src="soviet-logo.png" alt="Logo" />OpenRA</h1>
-	</div>
-	<div id="main">
-		<div id="menu">
-			<span class="links"><a href="index.html">Home</a></span> 
-			<span class="links"><a href="footage.html">Gameplay Footage</a></span> 
-			<span class="links"><a href="mods.html">Mods</a></span> 
-			<span class="links"><a href="stats.html">Stats</a></span>
-			<span class="links"><a href="getinvolved.html">Get Involved</a></span>
-			<span class="links"><a href="http://www.sleipnirstuff.com/forum/viewforum.php?f=80">Forum</a></span>
-			<span class="links"><a href="irc://irc.freenode.net/openra">IRC</a></span>
-			<span class="links"><a href="http://twitter.com/openRA">Twitter</a></span>
-		</div>
-		<h3 style="text-align: center;">
-			GNU GENERAL PUBLIC LICENSE</h3>
-		<p style="text-align: center;">
-			Version 3, 29 June 2007</p>
-		<p>
-			Copyright &copy; 2007 Free Software Foundation, Inc. &lt;<a href="http://fsf.org/">http://fsf.org/</a>&gt;</p>
-		<p>
-			Everyone is permitted to copy and distribute verbatim copies of this license document,
-			but changing it is not allowed.</p>
-		<h3>
-			<a name="preamble"></a>Preamble</h3>
-		<p>
-			The GNU General Public License is a free, copyleft license for software and other
-			kinds of works.</p>
-		<p>
-			The licenses for most software and other practical works are designed to take away
-			your freedom to share and change the works. By contrast, the GNU General Public
-			License is intended to guarantee your freedom to share and change all versions of
-			a program--to make sure it remains free software for all its users. We, the Free
-			Software Foundation, use the GNU General Public License for most of our software;
-			it applies also to any other work released this way by its authors. You can apply
-			it to your programs, too.</p>
-		<p>
-			When we speak of free software, we are referring to freedom, not price. Our General
-			Public Licenses are designed to make sure that you have the freedom to distribute
-			copies of free software (and charge for them if you wish), that you receive source
-			code or can get it if you want it, that you can change the software or use pieces
-			of it in new free programs, and that you know you can do these things.</p>
-		<p>
-			To protect your rights, we need to prevent others from denying you these rights
-			or asking you to surrender the rights. Therefore, you have certain responsibilities
-			if you distribute copies of the software, or if you modify it: responsibilities
-			to respect the freedom of others.</p>
-		<p>
-			For example, if you distribute copies of such a program, whether gratis or for a
-			fee, you must pass on to the recipients the same freedoms that you received. You
-			must make sure that they, too, receive or can get the source code. And you must
-			show them these terms so they know their rights.</p>
-		<p>
-			Developers that use the GNU GPL protect your rights with two steps: (1) assert copyright
-			on the software, and (2) offer you this License giving you legal permission to copy,
-			distribute and/or modify it.</p>
-		<p>
-			For the developers' and authors' protection, the GPL clearly explains that there
-			is no warranty for this free software. For both users' and authors' sake, the GPL
-			requires that modified versions be marked as changed, so that their problems will
-			not be attributed erroneously to authors of previous versions.</p>
-		<p>
-			Some devices are designed to deny users access to install or run modified versions
-			of the software inside them, although the manufacturer can do so. This is fundamentally
-			incompatible with the aim of protecting users' freedom to change the software. The
-			systematic pattern of such abuse occurs in the area of products for individuals
-			to use, which is precisely where it is most unacceptable. Therefore, we have designed
-			this version of the GPL to prohibit the practice for those products. If such problems
-			arise substantially in other domains, we stand ready to extend this provision to
-			those domains in future versions of the GPL, as needed to protect the freedom of
-			users.</p>
-		<p>
-			Finally, every program is threatened constantly by software patents. States should
-			not allow patents to restrict development and use of software on general-purpose
-			computers, but in those that do, we wish to avoid the special danger that patents
-			applied to a free program could make it effectively proprietary. To prevent this,
-			the GPL assures that patents cannot be used to render the program non-free.</p>
-		<p>
-			The precise terms and conditions for copying, distribution and modification follow.</p>
-		<h3>
-			<a name="terms"></a>TERMS AND CONDITIONS</h3>
-		<h4>
-			<a name="section0"></a>0. Definitions.</h4>
-		<p>
-			&ldquo;This License&rdquo; refers to version 3 of the GNU General Public License.</p>
-		<p>
-			&ldquo;Copyright&rdquo; also means copyright-like laws that apply to other kinds
-			of works, such as semiconductor masks.</p>
-		<p>
-			&ldquo;The Program&rdquo; refers to any copyrightable work licensed under this License.
-			Each licensee is addressed as &ldquo;you&rdquo;. &ldquo;Licensees&rdquo; and &ldquo;recipients&rdquo;
-			may be individuals or organizations.</p>
-		<p>
-			To &ldquo;modify&rdquo; a work means to copy from or adapt all or part of the work
-			in a fashion requiring copyright permission, other than the making of an exact copy.
-			The resulting work is called a &ldquo;modified version&rdquo; of the earlier work
-			or a work &ldquo;based on&rdquo; the earlier work.</p>
-		<p>
-			A &ldquo;covered work&rdquo; means either the unmodified Program or a work based
-			on the Program.</p>
-		<p>
-			To &ldquo;propagate&rdquo; a work means to do anything with it that, without permission,
-			would make you directly or secondarily liable for infringement under applicable
-			copyright law, except executing it on a computer or modifying a private copy. Propagation
-			includes copying, distribution (with or without modification), making available
-			to the public, and in some countries other activities as well.</p>
-		<p>
-			To &ldquo;convey&rdquo; a work means any kind of propagation that enables other
-			parties to make or receive copies. Mere interaction with a user through a computer
-			network, with no transfer of a copy, is not conveying.</p>
-		<p>
-			An interactive user interface displays &ldquo;Appropriate Legal Notices&rdquo; to
-			the extent that it includes a convenient and prominently visible feature that (1)
-			displays an appropriate copyright notice, and (2) tells the user that there is no
-			warranty for the work (except to the extent that warranties are provided), that
-			licensees may convey the work under this License, and how to view a copy of this
-			License. If the interface presents a list of user commands or options, such as a
-			menu, a prominent item in the list meets this criterion.</p>
-		<h4>
-			<a name="section1"></a>1. Source Code.</h4>
-		<p>
-			The &ldquo;source code&rdquo; for a work means the preferred form of the work for
-			making modifications to it. &ldquo;Object code&rdquo; means any non-source form
-			of a work.</p>
-		<p>
-			A &ldquo;Standard Interface&rdquo; means an interface that either is an official
-			standard defined by a recognized standards body, or, in the case of interfaces specified
-			for a particular programming language, one that is widely used among developers
-			working in that language.</p>
-		<p>
-			The &ldquo;System Libraries&rdquo; of an executable work include anything, other
-			than the work as a whole, that (a) is included in the normal form of packaging a
-			Major Component, but which is not part of that Major Component, and (b) serves only
-			to enable use of the work with that Major Component, or to implement a Standard
-			Interface for which an implementation is available to the public in source code
-			form. A &ldquo;Major Component&rdquo;, in this context, means a major essential
-			component (kernel, window system, and so on) of the specific operating system (if
-			any) on which the executable work runs, or a compiler used to produce the work,
-			or an object code interpreter used to run it.</p>
-		<p>
-			The &ldquo;Corresponding Source&rdquo; for a work in object code form means all
-			the source code needed to generate, install, and (for an executable work) run the
-			object code and to modify the work, including scripts to control those activities.
-			However, it does not include the work's System Libraries, or general-purpose tools
-			or generally available free programs which are used unmodified in performing those
-			activities but which are not part of the work. For example, Corresponding Source
-			includes interface definition files associated with source files for the work, and
-			the source code for shared libraries and dynamically linked subprograms that the
-			work is specifically designed to require, such as by intimate data communication
-			or control flow between those subprograms and other parts of the work.</p>
-		<p>
-			The Corresponding Source need not include anything that users can regenerate automatically
-			from other parts of the Corresponding Source.</p>
-		<p>
-			The Corresponding Source for a work in source code form is that same work.</p>
-		<h4>
-			<a name="section2"></a>2. Basic Permissions.</h4>
-		<p>
-			All rights granted under this License are granted for the term of copyright on the
-			Program, and are irrevocable provided the stated conditions are met. This License
-			explicitly affirms your unlimited permission to run the unmodified Program. The
-			output from running a covered work is covered by this License only if the output,
-			given its content, constitutes a covered work. This License acknowledges your rights
-			of fair use or other equivalent, as provided by copyright law.</p>
-		<p>
-			You may make, run and propagate covered works that you do not convey, without conditions
-			so long as your license otherwise remains in force. You may convey covered works
-			to others for the sole purpose of having them make modifications exclusively for
-			you, or provide you with facilities for running those works, provided that you comply
-			with the terms of this License in conveying all material for which you do not control
-			copyright. Those thus making or running the covered works for you must do so exclusively
-			on your behalf, under your direction and control, on terms that prohibit them from
-			making any copies of your copyrighted material outside their relationship with you.</p>
-		<p>
-			Conveying under any other circumstances is permitted solely under the conditions
-			stated below. Sublicensing is not allowed; section 10 makes it unnecessary.</p>
-		<h4>
-			<a name="section3"></a>3. Protecting Users' Legal Rights From Anti-Circumvention
-			Law.</h4>
-		<p>
-			No covered work shall be deemed part of an effective technological measure under
-			any applicable law fulfilling obligations under article 11 of the WIPO copyright
-			treaty adopted on 20 December 1996, or similar laws prohibiting or restricting circumvention
-			of such measures.</p>
-		<p>
-			When you convey a covered work, you waive any legal power to forbid circumvention
-			of technological measures to the extent such circumvention is effected by exercising
-			rights under this License with respect to the covered work, and you disclaim any
-			intention to limit operation or modification of the work as a means of enforcing,
-			against the work's users, your or third parties' legal rights to forbid circumvention
-			of technological measures.</p>
-		<h4>
-			<a name="section4"></a>4. Conveying Verbatim Copies.</h4>
-		<p>
-			You may convey verbatim copies of the Program's source code as you receive it, in
-			any medium, provided that you conspicuously and appropriately publish on each copy
-			an appropriate copyright notice; keep intact all notices stating that this License
-			and any non-permissive terms added in accord with section 7 apply to the code; keep
-			intact all notices of the absence of any warranty; and give all recipients a copy
-			of this License along with the Program.</p>
-		<p>
-			You may charge any price or no price for each copy that you convey, and you may
-			offer support or warranty protection for a fee.</p>
-		<h4>
-			<a name="section5"></a>5. Conveying Modified Source Versions.</h4>
-		<p>
-			You may convey a work based on the Program, or the modifications to produce it from
-			the Program, in the form of source code under the terms of section 4, provided that
-			you also meet all of these conditions:</p>
-		<ul>
-			<li>a) The work must carry prominent notices stating that you modified it, and giving
-				a relevant date.</li>
-			<li>b) The work must carry prominent notices stating that it is released under this
-				License and any conditions added under section 7. This requirement modifies the
-				requirement in section 4 to &ldquo;keep intact all notices&rdquo;.</li>
-			<li>c) You must license the entire work, as a whole, under this License to anyone who
-				comes into possession of a copy. This License will therefore apply, along with any
-				applicable section 7 additional terms, to the whole of the work, and all its parts,
-				regardless of how they are packaged. This License gives no permission to license
-				the work in any other way, but it does not invalidate such permission if you have
-				separately received it.</li>
-			<li>d) If the work has interactive user interfaces, each must display Appropriate Legal
-				Notices; however, if the Program has interactive interfaces that do not display
-				Appropriate Legal Notices, your work need not make them do so.</li>
-		</ul>
-		<p>
-			A compilation of a covered work with other separate and independent works, which
-			are not by their nature extensions of the covered work, and which are not combined
-			with it such as to form a larger program, in or on a volume of a storage or distribution
-			medium, is called an &ldquo;aggregate&rdquo; if the compilation and its resulting
-			copyright are not used to limit the access or legal rights of the compilation's
-			users beyond what the individual works permit. Inclusion of a covered work in an
-			aggregate does not cause this License to apply to the other parts of the aggregate.</p>
-		<h4>
-			<a name="section6"></a>6. Conveying Non-Source Forms.</h4>
-		<p>
-			You may convey a covered work in object code form under the terms of sections 4
-			and 5, provided that you also convey the machine-readable Corresponding Source under
-			the terms of this License, in one of these ways:</p>
-		<ul>
-			<li>a) Convey the object code in, or embodied in, a physical product (including a physical
-				distribution medium), accompanied by the Corresponding Source fixed on a durable
-				physical medium customarily used for software interchange.</li>
-			<li>b) Convey the object code in, or embodied in, a physical product (including a physical
-				distribution medium), accompanied by a written offer, valid for at least three years
-				and valid for as long as you offer spare parts or customer support for that product
-				model, to give anyone who possesses the object code either (1) a copy of the Corresponding
-				Source for all the software in the product that is covered by this License, on a
-				durable physical medium customarily used for software interchange, for a price no
-				more than your reasonable cost of physically performing this conveying of source,
-				or (2) access to copy the Corresponding Source from a network server at no charge.</li>
-			<li>c) Convey individual copies of the object code with a copy of the written offer
-				to provide the Corresponding Source. This alternative is allowed only occasionally
-				and noncommercially, and only if you received the object code with such an offer,
-				in accord with subsection 6b.</li>
-			<li>d) Convey the object code by offering access from a designated place (gratis or
-				for a charge), and offer equivalent access to the Corresponding Source in the same
-				way through the same place at no further charge. You need not require recipients
-				to copy the Corresponding Source along with the object code. If the place to copy
-				the object code is a network server, the Corresponding Source may be on a different
-				server (operated by you or a third party) that supports equivalent copying facilities,
-				provided you maintain clear directions next to the object code saying where to find
-				the Corresponding Source. Regardless of what server hosts the Corresponding Source,
-				you remain obligated to ensure that it is available for as long as needed to satisfy
-				these requirements.</li>
-			<li>e) Convey the object code using peer-to-peer transmission, provided you inform other
-				peers where the object code and Corresponding Source of the work are being offered
-				to the general public at no charge under subsection 6d.</li>
-		</ul>
-		<p>
-			A separable portion of the object code, whose source code is excluded from the Corresponding
-			Source as a System Library, need not be included in conveying the object code work.</p>
-		<p>
-			A &ldquo;User Product&rdquo; is either (1) a &ldquo;consumer product&rdquo;, which
-			means any tangible personal property which is normally used for personal, family,
-			or household purposes, or (2) anything designed or sold for incorporation into a
-			dwelling. In determining whether a product is a consumer product, doubtful cases
-			shall be resolved in favor of coverage. For a particular product received by a particular
-			user, &ldquo;normally used&rdquo; refers to a typical or common use of that class
-			of product, regardless of the status of the particular user or of the way in which
-			the particular user actually uses, or expects or is expected to use, the product.
-			A product is a consumer product regardless of whether the product has substantial
-			commercial, industrial or non-consumer uses, unless such uses represent the only
-			significant mode of use of the product.</p>
-		<p>
-			&ldquo;Installation Information&rdquo; for a User Product means any methods, procedures,
-			authorization keys, or other information required to install and execute modified
-			versions of a covered work in that User Product from a modified version of its Corresponding
-			Source. The information must suffice to ensure that the continued functioning of
-			the modified object code is in no case prevented or interfered with solely because
-			modification has been made.</p>
-		<p>
-			If you convey an object code work under this section in, or with, or specifically
-			for use in, a User Product, and the conveying occurs as part of a transaction in
-			which the right of possession and use of the User Product is transferred to the
-			recipient in perpetuity or for a fixed term (regardless of how the transaction is
-			characterized), the Corresponding Source conveyed under this section must be accompanied
-			by the Installation Information. But this requirement does not apply if neither
-			you nor any third party retains the ability to install modified object code on the
-			User Product (for example, the work has been installed in ROM).</p>
-		<p>
-			The requirement to provide Installation Information does not include a requirement
-			to continue to provide support service, warranty, or updates for a work that has
-			been modified or installed by the recipient, or for the User Product in which it
-			has been modified or installed. Access to a network may be denied when the modification
-			itself materially and adversely affects the operation of the network or violates
-			the rules and protocols for communication across the network.</p>
-		<p>
-			Corresponding Source conveyed, and Installation Information provided, in accord
-			with this section must be in a format that is publicly documented (and with an implementation
-			available to the public in source code form), and must require no special password
-			or key for unpacking, reading or copying.</p>
-		<h4>
-			<a name="section7"></a>7. Additional Terms.</h4>
-		<p>
-			&ldquo;Additional permissions&rdquo; are terms that supplement the terms of this
-			License by making exceptions from one or more of its conditions. Additional permissions
-			that are applicable to the entire Program shall be treated as though they were included
-			in this License, to the extent that they are valid under applicable law. If additional
-			permissions apply only to part of the Program, that part may be used separately
-			under those permissions, but the entire Program remains governed by this License
-			without regard to the additional permissions.</p>
-		<p>
-			When you convey a copy of a covered work, you may at your option remove any additional
-			permissions from that copy, or from any part of it. (Additional permissions may
-			be written to require their own removal in certain cases when you modify the work.)
-			You may place additional permissions on material, added by you to a covered work,
-			for which you have or can give appropriate copyright permission.</p>
-		<p>
-			Notwithstanding any other provision of this License, for material you add to a covered
-			work, you may (if authorized by the copyright holders of that material) supplement
-			the terms of this License with terms:</p>
-		<ul>
-			<li>a) Disclaiming warranty or limiting liability differently from the terms of sections
-				15 and 16 of this License; or</li>
-			<li>b) Requiring preservation of specified reasonable legal notices or author attributions
-				in that material or in the Appropriate Legal Notices displayed by works containing
-				it; or</li>
-			<li>c) Prohibiting misrepresentation of the origin of that material, or requiring that
-				modified versions of such material be marked in reasonable ways as different from
-				the original version; or</li>
-			<li>d) Limiting the use for publicity purposes of names of licensors or authors of the
-				material; or</li>
-			<li>e) Declining to grant rights under trademark law for use of some trade names, trademarks,
-				or service marks; or</li>
-			<li>f) Requiring indemnification of licensors and authors of that material by anyone
-				who conveys the material (or modified versions of it) with contractual assumptions
-				of liability to the recipient, for any liability that these contractual assumptions
-				directly impose on those licensors and authors.</li>
-		</ul>
-		<p>
-			All other non-permissive additional terms are considered &ldquo;further restrictions&rdquo;
-			within the meaning of section 10. If the Program as you received it, or any part
-			of it, contains a notice stating that it is governed by this License along with
-			a term that is a further restriction, you may remove that term. If a license document
-			contains a further restriction but permits relicensing or conveying under this License,
-			you may add to a covered work material governed by the terms of that license document,
-			provided that the further restriction does not survive such relicensing or conveying.</p>
-		<p>
-			If you add terms to a covered work in accord with this section, you must place,
-			in the relevant source files, a statement of the additional terms that apply to
-			those files, or a notice indicating where to find the applicable terms.</p>
-		<p>
-			Additional terms, permissive or non-permissive, may be stated in the form of a separately
-			written license, or stated as exceptions; the above requirements apply either way.</p>
-		<h4>
-			<a name="section8"></a>8. Termination.</h4>
-		<p>
-			You may not propagate or modify a covered work except as expressly provided under
-			this License. Any attempt otherwise to propagate or modify it is void, and will
-			automatically terminate your rights under this License (including any patent licenses
-			granted under the third paragraph of section 11).</p>
-		<p>
-			However, if you cease all violation of this License, then your license from a particular
-			copyright holder is reinstated (a) provisionally, unless and until the copyright
-			holder explicitly and finally terminates your license, and (b) permanently, if the
-			copyright holder fails to notify you of the violation by some reasonable means prior
-			to 60 days after the cessation.</p>
-		<p>
-			Moreover, your license from a particular copyright holder is reinstated permanently
-			if the copyright holder notifies you of the violation by some reasonable means,
-			this is the first time you have received notice of violation of this License (for
-			any work) from that copyright holder, and you cure the violation prior to 30 days
-			after your receipt of the notice.</p>
-		<p>
-			Termination of your rights under this section does not terminate the licenses of
-			parties who have received copies or rights from you under this License. If your
-			rights have been terminated and not permanently reinstated, you do not qualify to
-			receive new licenses for the same material under section 10.</p>
-		<h4>
-			<a name="section9"></a>9. Acceptance Not Required for Having Copies.</h4>
-		<p>
-			You are not required to accept this License in order to receive or run a copy of
-			the Program. Ancillary propagation of a covered work occurring solely as a consequence
-			of using peer-to-peer transmission to receive a copy likewise does not require acceptance.
-			However, nothing other than this License grants you permission to propagate or modify
-			any covered work. These actions infringe copyright if you do not accept this License.
-			Therefore, by modifying or propagating a covered work, you indicate your acceptance
-			of this License to do so.</p>
-		<h4>
-			<a name="section10"></a>10. Automatic Licensing of Downstream Recipients.</h4>
-		<p>
-			Each time you convey a covered work, the recipient automatically receives a license
-			from the original licensors, to run, modify and propagate that work, subject to
-			this License. You are not responsible for enforcing compliance by third parties
-			with this License.</p>
-		<p>
-			An &ldquo;entity transaction&rdquo; is a transaction transferring control of an
-			organization, or substantially all assets of one, or subdividing an organization,
-			or merging organizations. If propagation of a covered work results from an entity
-			transaction, each party to that transaction who receives a copy of the work also
-			receives whatever licenses to the work the party's predecessor in interest had or
-			could give under the previous paragraph, plus a right to possession of the Corresponding
-			Source of the work from the predecessor in interest, if the predecessor has it or
-			can get it with reasonable efforts.</p>
-		<p>
-			You may not impose any further restrictions on the exercise of the rights granted
-			or affirmed under this License. For example, you may not impose a license fee, royalty,
-			or other charge for exercise of rights granted under this License, and you may not
-			initiate litigation (including a cross-claim or counterclaim in a lawsuit) alleging
-			that any patent claim is infringed by making, using, selling, offering for sale,
-			or importing the Program or any portion of it.</p>
-		<h4>
-			<a name="section11"></a>11. Patents.</h4>
-		<p>
-			A &ldquo;contributor&rdquo; is a copyright holder who authorizes use under this
-			License of the Program or a work on which the Program is based. The work thus licensed
-			is called the contributor's &ldquo;contributor version&rdquo;.</p>
-		<p>
-			A contributor's &ldquo;essential patent claims&rdquo; are all patent claims owned
-			or controlled by the contributor, whether already acquired or hereafter acquired,
-			that would be infringed by some manner, permitted by this License, of making, using,
-			or selling its contributor version, but do not include claims that would be infringed
-			only as a consequence of further modification of the contributor version. For purposes
-			of this definition, &ldquo;control&rdquo; includes the right to grant patent sublicenses
-			in a manner consistent with the requirements of this License.</p>
-		<p>
-			Each contributor grants you a non-exclusive, worldwide, royalty-free patent license
-			under the contributor's essential patent claims, to make, use, sell, offer for sale,
-			import and otherwise run, modify and propagate the contents of its contributor version.</p>
-		<p>
-			In the following three paragraphs, a &ldquo;patent license&rdquo; is any express
-			agreement or commitment, however denominated, not to enforce a patent (such as an
-			express permission to practice a patent or covenant not to sue for patent infringement).
-			To &ldquo;grant&rdquo; such a patent license to a party means to make such an agreement
-			or commitment not to enforce a patent against the party.</p>
-		<p>
-			If you convey a covered work, knowingly relying on a patent license, and the Corresponding
-			Source of the work is not available for anyone to copy, free of charge and under
-			the terms of this License, through a publicly available network server or other
-			readily accessible means, then you must either (1) cause the Corresponding Source
-			to be so available, or (2) arrange to deprive yourself of the benefit of the patent
-			license for this particular work, or (3) arrange, in a manner consistent with the
-			requirements of this License, to extend the patent license to downstream recipients.
-			&ldquo;Knowingly relying&rdquo; means you have actual knowledge that, but for the
-			patent license, your conveying the covered work in a country, or your recipient's
-			use of the covered work in a country, would infringe one or more identifiable patents
-			in that country that you have reason to believe are valid.</p>
-		<p>
-			If, pursuant to or in connection with a single transaction or arrangement, you convey,
-			or propagate by procuring conveyance of, a covered work, and grant a patent license
-			to some of the parties receiving the covered work authorizing them to use, propagate,
-			modify or convey a specific copy of the covered work, then the patent license you
-			grant is automatically extended to all recipients of the covered work and works
-			based on it.</p>
-		<p>
-			A patent license is &ldquo;discriminatory&rdquo; if it does not include within the
-			scope of its coverage, prohibits the exercise of, or is conditioned on the non-exercise
-			of one or more of the rights that are specifically granted under this License. You
-			may not convey a covered work if you are a party to an arrangement with a third
-			party that is in the business of distributing software, under which you make payment
-			to the third party based on the extent of your activity of conveying the work, and
-			under which the third party grants, to any of the parties who would receive the
-			covered work from you, a discriminatory patent license (a) in connection with copies
-			of the covered work conveyed by you (or copies made from those copies), or (b) primarily
-			for and in connection with specific products or compilations that contain the covered
-			work, unless you entered into that arrangement, or that patent license was granted,
-			prior to 28 March 2007.</p>
-		<p>
-			Nothing in this License shall be construed as excluding or limiting any implied
-			license or other defenses to infringement that may otherwise be available to you
-			under applicable patent law.</p>
-		<h4>
-			<a name="section12"></a>12. No Surrender of Others' Freedom.</h4>
-		<p>
-			If conditions are imposed on you (whether by court order, agreement or otherwise)
-			that contradict the conditions of this License, they do not excuse you from the
-			conditions of this License. If you cannot convey a covered work so as to satisfy
-			simultaneously your obligations under this License and any other pertinent obligations,
-			then as a consequence you may not convey it at all. For example, if you agree to
-			terms that obligate you to collect a royalty for further conveying from those to
-			whom you convey the Program, the only way you could satisfy both those terms and
-			this License would be to refrain entirely from conveying the Program.</p>
-		<h4>
-			<a name="section13"></a>13. Use with the GNU Affero General Public License.</h4>
-		<p>
-			Notwithstanding any other provision of this License, you have permission to link
-			or combine any covered work with a work licensed under version 3 of the GNU Affero
-			General Public License into a single combined work, and to convey the resulting
-			work. The terms of this License will continue to apply to the part which is the
-			covered work, but the special requirements of the GNU Affero General Public License,
-			section 13, concerning interaction through a network will apply to the combination
-			as such.</p>
-		<h4>
-			<a name="section14"></a>14. Revised Versions of this License.</h4>
-		<p>
-			The Free Software Foundation may publish revised and/or new versions of the GNU
-			General Public License from time to time. Such new versions will be similar in spirit
-			to the present version, but may differ in detail to address new problems or concerns.</p>
-		<p>
-			Each version is given a distinguishing version number. If the Program specifies
-			that a certain numbered version of the GNU General Public License &ldquo;or any
-			later version&rdquo; applies to it, you have the option of following the terms and
-			conditions either of that numbered version or of any later version published by
-			the Free Software Foundation. If the Program does not specify a version number of
-			the GNU General Public License, you may choose any version ever published by the
-			Free Software Foundation.</p>
-		<p>
-			If the Program specifies that a proxy can decide which future versions of the GNU
-			General Public License can be used, that proxy's public statement of acceptance
-			of a version permanently authorizes you to choose that version for the Program.</p>
-		<p>
-			Later license versions may give you additional or different permissions. However,
-			no additional obligations are imposed on any author or copyright holder as a result
-			of your choosing to follow a later version.</p>
-		<h4>
-			<a name="section15"></a>15. Disclaimer of Warranty.</h4>
-		<p>
-			THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
-			EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
-			PROVIDE THE PROGRAM &ldquo;AS IS&rdquo; WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
-			OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
-			AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE
-			OF THE PROGRAM IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST
-			OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.</p>
-		<h4>
-			<a name="section16"></a>16. Limitation of Liability.</h4>
-		<p>
-			IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING WILL ANY COPYRIGHT
-			HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS THE PROGRAM AS PERMITTED
-			ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL
-			OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE PROGRAM
-			(INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR
-			LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE
-			WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF
-			THE POSSIBILITY OF SUCH DAMAGES.</p>
-		<h4>
-			<a name="section17"></a>17. Interpretation of Sections 15 and 16.</h4>
-		<p>
-			If the disclaimer of warranty and limitation of liability provided above cannot
-			be given local legal effect according to their terms, reviewing courts shall apply
-			local law that most closely approximates an absolute waiver of all civil liability
-			in connection with the Program, unless a warranty or assumption of liability accompanies
-			a copy of the Program in return for a fee.</p>
-		<p>
-			END OF TERMS AND CONDITIONS</p>
-		<h3>
-			<a name="howto"></a>How to Apply These Terms to Your New Programs</h3>
-		<p>
-			If you develop a new program, and you want it to be of the greatest possible use
-			to the public, the best way to achieve this is to make it free software which everyone
-			can redistribute and change under these terms.</p>
-		<p>
-			To do so, attach the following notices to the program. It is safest to attach them
-			to the start of each source file to most effectively state the exclusion of warranty;
-			and each file should have at least the &ldquo;copyright&rdquo; line and a pointer
-			to where the full notice is found.</p>
-		<pre>    &lt;one line to give the program's name and a brief idea of what it does.&gt;
-    Copyright (C) &lt;year&gt;  &lt;name of author&gt;
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see &lt;http://www.gnu.org/licenses/&gt;.
-</pre>
-		<p>
-			Also add information on how to contact you by electronic and paper mail.</p>
-		<p>
-			If the program does terminal interaction, make it output a short notice like this
-			when it starts in an interactive mode:</p>
-		<pre>    &lt;program&gt;  Copyright (C) &lt;year&gt;  &lt;name of author&gt;
-
-    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
-    This is free software, and you are welcome to redistribute it
-    under certain conditions; type `show c' for details.
-</pre>
-		<p>
-			The hypothetical commands `show w' and `show c' should show the appropriate parts
-			of the General Public License. Of course, your program's commands might be different;
-			for a GUI interface, you would use an &ldquo;about box&rdquo;.</p>
-		<p>
-			You should also get your employer (if you work as a programmer) or school, if any,
-			to sign a &ldquo;copyright disclaimer&rdquo; for the program, if necessary. For
-			more information on this, and how to apply and follow the GNU GPL, see &lt;<a href="http://www.gnu.org/licenses/">http://www.gnu.org/licenses/</a>&gt;.</p>
-		<p>
-			The GNU General Public License does not permit incorporating your program into proprietary
-			programs. If your program is a subroutine library, you may consider it more useful
-			to permit linking proprietary applications with the library. If this is what you
-			want to do, use the GNU Lesser General Public License instead of this License. But
-			first, please read &lt;<a href="http://www.gnu.org/philosophy/why-not-lgpl.html">http://www.gnu.org/philosophy/why-not-lgpl.html</a>&gt;.</p>
-	</div>
-	<div id="footer" class="bar">
-		<p id="trademarks">
-			<img src="soviet-logo.png" alt="OpenRA Logo" height="70px" style="float: right; margin-right: 10px" />
-			Command &amp; Conquer and Command &amp; Conquer Red Alert are trademarks or registered
-			trademarks of Electronic Arts Inc.in the U.S. and/or other countries.<br />
-			Windows is a registered trademark of Microsoft Corporation in the United States
-			and other countries.<br />
-			Mac OS X is a trademark of Apple Inc., registered in the U.S. and other countries.<br />
-			Linux is the registered trademark of Linus Torvalds in the U.S. and other countries.<br />
-			Mono is a registered trademark of Novell, Inc. in the United States and other countries.<br />
-		</p>
-	</div>
-</body>
-</html>

web/logs/upload.php

@@ -1,159 +0,0 @@
-<?php
-
-    /**
-        Diff implemented in pure php, written from scratch.
-        Copyright (C) 2003  Daniel Unterberger <diff.phpnet@holomind.de>
-        Copyright (C) 2005  Nils Knappmeier next version 
-        
-        This program is free software; you can redistribute it and/or
-        modify it under the terms of the GNU General Public License
-        as published by the Free Software Foundation; either version 2
-        of the License, or (at your option) any later version.
-        
-        This program is distributed in the hope that it will be useful,
-        but WITHOUT ANY WARRANTY; without even the implied warranty of
-        MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-        GNU General Public License for more details.
-        
-        You should have received a copy of the GNU General Public License
-        along with this program; if not, write to the Free Software
-        Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-        
-        http://www.gnu.org/licenses/gpl.html
-
-        About:
-        I searched a function to compare arrays and the array_diff()
-        was not specific enough. It ignores the order of the array-values.
-        So I reimplemented the diff-function which is found on unix-systems
-        but this you can use directly in your code and adopt for your needs.
-        Simply adopt the formatline-function. with the third-parameter of arr_diff()
-        you can hide matching lines. Hope someone has use for this.
-
-        Contact: d.u.diff@holomind.de <daniel unterberger>
-    **/
-
-    
-## PHPDiff returns the differences between $old and $new, formatted
-## in the standard diff(1) output format.
-function PHPDiff($old,$new) 
-{
-   # split the source text into arrays of lines
-   $t1 = explode("\n",$old);
-   $x=array_pop($t1); 
-   if ($x>'') $t1[]="$x\n\\ No newline at end of file";
-   $t2 = explode("\n",$new);
-   $x=array_pop($t2); 
-   if ($x>'') $t2[]="$x\n\\ No newline at end of file";
-
-   # build a reverse-index array using the line as key and line number as value
-   # don't store blank lines, so they won't be targets of the shortest distance
-   # search
-   foreach($t1 as $i=>$x) if ($x>'') $r1[$x][]=$i;
-   foreach($t2 as $i=>$x) if ($x>'') $r2[$x][]=$i;
-
-   $a1=0; $a2=0;   # start at beginning of each list
-   $actions=array();
-
-   # walk this loop until we reach the end of one of the lists
-   while ($a1<count($t1) && $a2<count($t2)) {
-     # if we have a common element, save it and go to the next
-     if ($t1[$a1]==$t2[$a2]) { $actions[]=4; $a1++; $a2++; continue; } 
-
-     # otherwise, find the shortest move (Manhattan-distance) from the
-     # current location
-     $best1=count($t1); $best2=count($t2);
-     $s1=$a1; $s2=$a2;
-     while(($s1+$s2-$a1-$a2) < ($best1+$best2-$a1-$a2)) {
-       $d=-1;
-       foreach((array)@$r1[$t2[$s2]] as $n) 
-         if ($n>=$s1) { $d=$n; break; }
-       if ($d>=$s1 && ($d+$s2-$a1-$a2)<($best1+$best2-$a1-$a2))
-         { $best1=$d; $best2=$s2; }
-       $d=-1;
-       foreach((array)@$r2[$t1[$s1]] as $n) 
-         if ($n>=$s2) { $d=$n; break; }
-       if ($d>=$s2 && ($s1+$d-$a1-$a2)<($best1+$best2-$a1-$a2))
-         { $best1=$s1; $best2=$d; }
-       $s1++; $s2++;
-     }
-     while ($a1<$best1) { $actions[]=1; $a1++; }  # deleted elements
-     while ($a2<$best2) { $actions[]=2; $a2++; }  # added elements
-  }
-
-  # we've reached the end of one list, now walk to the end of the other
-  while($a1<count($t1)) { $actions[]=1; $a1++; }  # deleted elements
-  while($a2<count($t2)) { $actions[]=2; $a2++; }  # added elements
-
-  # and this marks our ending point
-  $actions[]=8;
-
-  # now, let's follow the path we just took and report the added/deleted
-  # elements into $out.
-  $op = 0;
-  $x0=$x1=0; $y0=$y1=0;
-  $out = array();
-  foreach($actions as $act) {
-    if ($act==1) { $op|=$act; $x1++; continue; }
-    if ($act==2) { $op|=$act; $y1++; continue; }
-    if ($op>0) {
-      $xstr = ($x1==($x0+1)) ? $x1 : ($x0+1).",$x1";
-      $ystr = ($y1==($y0+1)) ? $y1 : ($y0+1).",$y1";
-      if ($op==1) $out[] = "{$xstr}d{$y1}";
-      elseif ($op==3) $out[] = "{$xstr}c{$ystr}";
-      while ($x0<$x1) { $out[] = '< '.$t1[$x0]; $x0++; }   # deleted elems
-      if ($op==2) $out[] = "{$x1}a{$ystr}";
-      elseif ($op==3) $out[] = '---';
-      while ($y0<$y1) { $out[] = '> '.$t2[$y0]; $y0++; }   # added elems
-    }
-    $x1++; $x0=$x1;
-    $y1++; $y0=$y1;
-    $op=0;
-  }
-  $out[] = '';
-  return join("\n",$out);
-}
-
-    
-?>
-
-<?php
-function sdir( $path='.', $mask='*', $nocache=0 ){
-    static $dir = array(); // cache result in memory
-    if ( !isset($dir[$path]) || $nocache) {
-        $dir[$path] = scandir($path);
-    }
-    foreach ($dir[$path] as $i=>$entry) {
-        if ($entry!='.' && $entry!='..' && fnmatch($mask, $entry) ) {
-            $sdir[] = $entry;
-        }
-    }
-    return ($sdir);
-}
-?>
-
-<?php 
-$post_file = fopen('compress.zlib://php://input', 'rb');
-
-$game_id = $_SERVER['HTTP_GAME_ID'];
-
-mkdir($game_id);
-
-$client_hash = md5($_SERVER['REMOTE_ADDR']);
-
-$post_data = '';
-
-while (!feof($post_file))
-    $post_data .= fread($post_file, 8192);
-
-if ($_SERVER['HTTP_DIFF']) {
-  foreach (sdir($game_id, '*.'.$_SERVER['HTTP_CHANNEL'].'.log') as $f) {
-    $hash = substr($f, 0, strpos($f, '.'));
-    $diff = PHPDiff(file_get_contents($game_id . '/' . $f), $post_data);
-    file_put_contents($game_id .'/'. $hash .'.'. $client_hash .'.'. $_SERVER['HTTP_CHANNEL'] . '.diff', $diff);
-  }
-}
-
-file_put_contents($game_id .'/'. $client_hash . '.' . $_SERVER['HTTP_CHANNEL'] . '.log',$post_data);
-
-fclose($post_file);
-?>

web/master/create.php

@@ -1,19 +0,0 @@
-<?php
-    header( 'Content-type: text/plain' );
-    try
-    {
-        $db = new PDO('sqlite:openra.db');
-        echo 'Connection to DB established.\n';
-        if ($db->query('DROP TABLE servers'))
-            echo 'Dropped table.\n';
-        $schema = 'CREATE TABLE servers (id INTEGER PRIMARY KEY AUTOINCREMENT, name varchar(255), 
-            address varchar(255) UNIQUE, players integer, state integer, ts integer, map varchar(255), mods varchar(255))';
-        if ($db->query($schema))
-            echo 'Created table.';
-        $db = null;
-    }
-    catch (PDOException $e)
-    {
-        echo $e->getMessage();
-    }
-?>

web/master/list.php

@@ -1,28 +0,0 @@
-<?php
-    header( 'Content-type: text/plain' );
-
-    try
-    {
-        $db = new PDO('sqlite:openra.db');
-        $stale = 60 * 5;
-        $result = $db->query('SELECT * FROM servers WHERE (' . time() . ' - ts < ' . $stale . ')');
-	$n = 0;
-        foreach ( $result as $row )
-        {
-            echo "Game@" . $n++ . ":\n";
-            echo "\tId: " . $row['id'] . "\n";
-            echo "\tName: " . $row['name'] . "\n";
-            echo "\tAddress: " . $row['address'] . "\n";
-            echo "\tState: " . $row['state'] . "\n";
-            echo "\tPlayers: " . $row['players'] . "\n";
-            echo "\tMap: " . $row['map'] . "\n";
-            echo "\tMods: " . $row['mods'] . "\n";
-            echo "\tTTL: " . ($stale - (time() - $row['ts'])) . "\n";
-        }
-        $db = null;
-    }
-    catch (PDOException $e)
-    {
-        echo $e->getMessage();
-    }
-?>

web/master/ping.php

@@ -1,40 +0,0 @@
-<?php
-    header( 'Content-type: text/plain' );
-    try 
-    {
-        $db = new PDO('sqlite:openra.db');
-        $addr = $_SERVER['REMOTE_ADDR'] . ':' . $_REQUEST['port'];
-        
-        $insert = $db->prepare('INSERT OR REPLACE INTO servers 
-            (name, address, players, state, ts, map, mods) 
-            VALUES (:name, :addr, :players, :state, :time, :map, :mods)');
-        $insert->bindValue(':name', $_REQUEST['name'], PDO::PARAM_STR);
-        $insert->bindValue(':addr', $addr, PDO::PARAM_STR);
-        $insert->bindValue(':players', $_REQUEST['players'], PDO::PARAM_INT);
-        $insert->bindValue(':state', $_REQUEST['state'], PDO::PARAM_INT);
-        $insert->bindValue(':time', time(), PDO::PARAM_INT);
-        $insert->bindValue(':map', $_REQUEST['map'], PDO::PARAM_STR);
-        $insert->bindValue(':mods', $_REQUEST['mods'], PDO::PARAM_STR);
-        
-        $insert->execute();
-
-        if (isset( $_REQUEST['new']))
-        {
-            $select = $db->prepare('SELECT id FROM servers WHERE address = :addr');
-            $select->bindValue(':addr', $addr, PDO::PARAM_STR);
-
-            $select->execute();
-
-            echo (int)$select->fetchColumn();
-    
-            $games = file_get_contents("../games.txt");
-            file_put_contents("../games.txt", $games + 1);
-        }
-
-        $db = null;
-    }
-    catch (PDOException $e)
-    {
-        echo $e->getMessage();
-    }
-?>

web/mods.html

@@ -1,70 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
-        "http://www.w3.org/TR/html4/loose.dtd">
-<html>
-<head>
-	<link rel="shortcut icon" type="image/x-icon" href="favicon.ico" />
-	<title>OpenRA - Mods</title>
-	<link rel="Stylesheet" type="text/css" href="openra.css" />
-	<!--[if IE 7]>
-			<link rel="stylesheet" type="text/css" href="ie7.css">
-	<![endif]-->
-</head>
-<body>
-	<div id="header" class="bar">
-		<h1>
-			<img src="soviet-logo.png" alt="Logo" />OpenRA</h1>
-	</div>
-	<div id="main">
-		<div id="menu">
-			<span class="links"><a href="index.html">Home</a></span> 
-			<span class="links"><a href="footage.html">Gameplay Footage</a></span> 
-			<span class="links"><a href="mods.html">Mods</a></span> 
-			<span class="links"><a href="stats.html">Stats</a></span>
-			<span class="links"><a href="getinvolved.html">Get Involved</a></span>
-			<span class="links"><a href="http://www.sleipnirstuff.com/forum/viewforum.php?f=80">Forum</a></span>
-			<span class="links"><a href="irc://irc.freenode.net/openra">IRC</a></span>
-			<span class="links"><a href="http://twitter.com/openRA">Twitter</a></span>
-		</div>
-		
-		<div style="width: 70%; margin: 0 auto">
-			<h2>Built-In Mods</h2>
-			<p>
-				OpenRA is a highly moddable RTS game engine, in fact both Red Alert and Command &amp; Conquer are implemented purely as
-				mods on it.
-			</p>
-			<h3 style="clear: both">Red Alert</h3>
-			<div style="float: left; height: 120px"><img src="mod_ra.png" alt="RA"/></div>
-			<p>
-				The RA mod for OpenRA is a reimagining of Command &amp; Conquer Red Alert. It is not just a clone of the original
-				but has improved and rebalanced gameplay. It has fully working multiplayer support for both internet and local play 
-				(via direct connect).
-			</p>
-			<p>
-				It can be run with the provided shortcuts on Windows and OS X or the command line option "<code>Game.Mods=ra</code>".
-			</p>
-			<h3 style="clear: both">Command &amp; Conquer</h3>
-			<div style="float: left; height: 120px"><img src="mod_cnc.png" alt="CNC"/></div>
-			<p>
-				The CNC mod for OpenRA is a reimagining of the original Command &amp; Conquer game. It has fully working
-				multiplayer support for both internet and local play (via direct connect). A single player campaign is currently
-				being worked on.
-			</p>
-			<p>
-				It can be run with the provided shortcuts on Windows and OS X or the command line option "<code>Game.Mods=cnc</code>".
-			</p>
-		</div>
-	</div>
-	<div id="footer" class="bar">
-		<p id="trademarks">
-			<img src="soviet-logo.png" alt="OpenRA Logo" height="70px" style="float: right; margin-right: 10px" />
-			Command &amp; Conquer and Command &amp; Conquer Red Alert are trademarks or registered
-			trademarks of Electronic Arts Inc.in the U.S. and/or other countries.<br />
-			Windows is a registered trademark of Microsoft Corporation in the United States
-			and other countries.<br />
-			Mac OS X is a trademark of Apple Inc., registered in the U.S. and other countries.<br />
-			Linux is the registered trademark of Linus Torvalds in the U.S. and other countries.<br />
-			Mono is a registered trademark of Novell, Inc. in the United States and other countries.<br />
-		</p>
-	</div>
-</body>
-</html>

web/openra.css

@@ -1,185 +0,0 @@
-body { background-color: black; margin: 0px; color: White; font-family: Cambria, Georgia, Times New Roman, Serif; font-size: 12pt }
-h1 { font-family: Cambria, Georgia, Times New Roman, Serif }
-h2, h3 { font-family: Helvetica, Arial, Sans-Serif }
-
-a { color: White }
-a:visited { color: White }
-
-div#main 
-{	
-	width: 1024px; 
-	background-image: url("background.png");
-	background-repeat: no-repeat; 
-	margin: 0 auto;
-	padding: 20px 0px;
-}
-
-div#header
-{
-	margin-top: 30px;
-	height: 66px
-}
-
-div.bar
-{
-	border-top: solid 3px #650b03;
-	border-bottom: solid 3px #650b03;
-	background-color: #272d2c;
-	width: 100%;
-}
-
-div#header h1
-{
-	margin: 0 auto;
-	width:280px;
-}
-
-div#header img
-{
-	vertical-align: middle; 
-	margin: -30px 0px
-}
-
-div#content
-{
-	text-align: justify;
-	width:50%;
-	padding-left:50px;
-}
-div#menu
-{
-	margin-top: 10px; 
-	margin-left: auto;
-	margin-right:auto;
-	width:90%;
-	text-align:center;
-}
-div#menu a { text-decoration: none; color: White }
-div#menu a:visited { text-decoration: none; color: White }
-div#menu a:hover { text-decoration: none; color: White }
-
-/* Sidebar */
-div#sidebar
-{
-	margin-top: 19px;
-	float: right; 
-	width: 450px;
-	text-align: center
-}
-div#sidebar strong
-{
-	font-size: 2.3em;
-	display: block
-}
-div#sidebar .stats
-{
-	display: inline-block;
-	margin-right: 10px;
-}
-div#sidebar .desc
-{
-	font-size: 0.8em
-}
-
-div#sidebar a.desc
-{
-	font-size: 0.7em
-}
-
-div.download
-{
-	border: solid 3px #bd0000;
-	background-color: #272d2c;
-	margin: 20px auto; 
-	width: 280px; 
-	height: 40px; 
-	padding: 12px 10px 10px 10px;
-	display: none;
-}
-
-div.download:hover
-{
-	border-color: white;
-	background-color: #3f4544;
-	cursor: pointer
-}
-
-p.download
-{
-	display: none;
-	font-size: 0.8em;
-}
-
-div#screenshots
-{
-	width: 506px; 
-	margin: 0 auto; 
-	height: 316px;
-}
-
-div#footer
-{
-	font-size: 0.7em; 
-	margin-bottom: 10px;
-	text-align: center;
-}
-
-p#trademarks
-{
-	margin-top: 10px; margin-bottom: 10px
-}
-
-span.links
-{
-	border: none;
-	margin: 0px 10px;
-	font-size: 1.2em;
-}
-span.links:hover
-{
-	border-bottom: solid 3px #bd0000;
-}
-
-div.rounded
-{
-	border-radius: 10px; 
-	-moz-border-radius: 10px;
-	-webkit-border-radius: 10px;
-	-khtml-border-radius: 10px;
-}
-
-#nav li
-{
-	list-style-type: none;
-	display: block; 
-	height: 15px; 
-	width: 20px; 
-	background-color: white; 
-	margin-right: 10px; 
-	float: left;
-	cursor: pointer;
-}
-
-#nav li.activeSlide
-{
-	background-color: #650b03;
-}
-
-#videoPlayer
-{
-	padding-top: 5px; 
-	height:410px; 
-	width: 500px; 
-	margin: 20px auto; 
-	background-color: Black; 
-}
-
-.border
-{
-	border: solid 3px #650b03
-}
-
-pre, code
-{
-	font-family: Consolas, Incosolata, Lucida Console, Monospace;
-}

web/packages/cnc-mirrors.txt

@@ -1,5 +0,0 @@
-http://metahash.com/packages/cnc-packages.zip
-http://openra.res0l.net/packages/cnc-packages.zip
-http://mirumu.jp/pub/packages/cnc-packages.zip
-http://alzeih.github.com/www/packages/cnc-packages.zip
-http://www.sleipnirstuff.com/openra/cnc-packages.zip

web/packages/ra-mirrors.txt

@@ -1,5 +0,0 @@
-http://metahash.com/packages/ra-packages.zip
-http://openra.res0l.net/packages/ra-packages.zip
-http://mirumu.jp/pub/packages/ra-packages.zip
-http://alzeih.github.com/www/packages/ra-packages.zip
-http://www.sleipnirstuff.com/openra/ra-packages.zip

web/releases/linux/download.php

@@ -1,76 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
-        "http://www.w3.org/TR/html4/loose.dtd">
-<html>
-<head>
-	<link rel="shortcut icon" type="image/x-icon" href="/favicon.ico" />
-	<title>OpenRA - Download for Linux</title>
-	<link rel="Stylesheet" type="text/css" href="/openra.css" />
-	<!--[if IE 7]>
-			<link rel="stylesheet" type="text/css" href="/ie7.css">
-	<![endif]-->
-</head>
-<body>
-	<div id="header" class="bar">
-		<h1>
-			<img src="/soviet-logo.png" alt="Logo" />OpenRA</h1>
-	</div>
-	<div id="main">
-		<div id="menu">
-			<span class="links"><a href="/index.html">Home</a></span> 
-			<span class="links"><a href="/footage.html">Gameplay Footage</a></span> 
-			<span class="links"><a href="/mods.html">Mods</a></span> 
-			<span class="links"><a href="/stats.html">Stats</a></span>
-			<span class="links"><a href="/getinvolved.html">Get Involved</a></span>
-			<span class="links"><a href="irc://irc.freenode.net/openra">IRC</a></span>
-			<span class="links"><a href="http://twitter.com/openRA">Twitter</a></span>
-		</div>
-		<div>
-		    <?php
-		        function generateDownloadButton($target, $text, $desc)
-		        {
-		            echo "<div class=\"rounded download\" style=\"display: block; text-align: center; width: 320px\" onclick=\"document.location='".$target."'\">\n";
-		            echo "\t<img src=\"/arrow.png\" alt=\"Download Arrow\" style=\"float: left; margin-top: 3px\" />\n";
-		            echo "\t". $text ."<br />\n";
-		            echo "\t<span class=\"desc\">". $desc ."</span>\n";
-		            echo "</div>";
-		        }
-		        
-		        $archTarget = file_get_contents("archlatest.txt");
-		        list($version,$size,$target) = explode(",", $archTarget);
-		        $desc = sprintf("version: %s size: %.2fMB", $version, $size/1048576);
-		        
-		        generateDownloadButton(trim($target), "Download for Arch Linux", $desc);
-		        
-		        $rpmTarget = file_get_contents("rpmlatest.txt");
-		        list($version,$size,$target) = explode(",", $rpmTarget);
-		        $desc = sprintf("version: %s size: %.2fMB", $version, $size/1048576);
-		        
-		        generateDownloadButton(trim($target), "Download for RPM based systems", $desc);
-		        
-		        $debTarget = file_get_contents("deblatest.txt");
-		        list($version,$size,$target) = explode(",", $debTarget);
-		        $desc = sprintf("version: %s size: %.2fMB", $version, $size/1048576);
-		        
-		        generateDownloadButton(trim($target), "Download for deb based systems", $desc);
-		        
-		        $version = file_get_contents("srclatest.txt");
-		        $target = "http://github.com/chrisforbes/OpenRA/tarball/playtest-".trim($version);
-		        
-		        generateDownloadButton($target, "Download for other systems", "(source package)");
-		    ?>
-		</div>
-	</div>
-	<div id="footer" class="bar">
-		<p id="trademarks">
-			<img src="/soviet-logo.png" alt="OpenRA Logo" height="70px" style="float: right; margin-right: 10px" />
-			Command &amp; Conquer and Command &amp; Conquer Red Alert are trademarks or registered
-			trademarks of Electronic Arts Inc.in the U.S. and/or other countries.<br />
-			Windows is a registered trademark of Microsoft Corporation in the United States
-			and other countries.<br />
-			Mac OS X is a trademark of Apple Inc., registered in the U.S. and other countries.<br />
-			Linux is the registered trademark of Linus Torvalds in the U.S. and other countries.<br />
-			Mono is a registered trademark of Novell, Inc. in the United States and other countries.<br />
-		</p>
-	</div>
-</body>
-</html>

web/releases/mac/osx-dependencies-mirrors.txt

@@ -1,4 +0,0 @@
-http://open-ra.org/releases/mac/osx-deps-v2.zip
-http://openra.res0l.net/releases/mac/osx-deps-v2.zip
-http://metahash.com/releases/mac/osx-deps-v2.zip
-http://mirumu.jp/pub/releases/mac/osx-deps-v2.zip

web/releases/windows/cg-mirrors.txt

@@ -1,4 +0,0 @@
-http://open-ra.org/releases/windows/cg-win32.zip
-http://openra.res0l.net/releases/windows/cg-win32.zip
-http://metahash.com/releases/windows/cg-win32.zip
-http://mirumu.jp/pub/releases/windows/cg-win32.zip

web/releases/windows/freetype-mirrors.txt

@@ -1,4 +0,0 @@
-http://open-ra.org/releases/windows/freetype-zlib.zip
-http://openra.res0l.net/releases/windows/freetype-zlib.zip
-http://metahash.com/releases/windows/freetype-zlib.zip
-http://mirumu.jp/pub/releases/windows/freetype-zlib.zip

web/releases/windows/latest.php

@@ -1,7 +0,0 @@
-<?php
-$latest = "OpenRA-20100425.exe";
-header("Location: $latest");
-$file = file_get_contents("../../downloads.txt");
-$new_downloads = $file + 1;
-file_put_contents("../../downloads.txt", $new_downloads);
-?>

web/stats.html

@@ -1,42 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
-        "http://www.w3.org/TR/html4/loose.dtd">
-<html>
-<head>
-	<link rel="shortcut icon" type="image/x-icon" href="favicon.ico" />
-	<title>OpenRA - Stats</title>
-	<link rel="Stylesheet" type="text/css" href="openra.css" />
-	<!--[if IE 7]>
-			<link rel="stylesheet" type="text/css" href="ie7.css">
-	<![endif]-->
-</head>
-<body>
-	<div id="header" class="bar">
-		<h1>
-			<img src="soviet-logo.png" alt="Logo" />OpenRA</h1>
-	</div>
-	<div id="main">
-		<div id="menu">
-			<span class="links"><a href="index.html">Home</a></span> 
-			<span class="links"><a href="footage.html">Gameplay Footage</a></span> 
-			<span class="links"><a href="mods.html">Mods</a></span> 
-			<span class="links"><a href="stats.html">Stats</a></span>
-			<span class="links"><a href="getinvolved.html">Get Involved</a></span>
-			<span class="links"><a href="http://www.sleipnirstuff.com/forum/viewforum.php?f=80">Forum</a></span>
-			<span class="links"><a href="irc://irc.freenode.net/openra">IRC</a></span>
-			<span class="links"><a href="http://twitter.com/openRA">Twitter</a></span>
-		</div>
-	</div>
-	<div id="footer" class="bar">
-		<p id="trademarks">
-			<img src="soviet-logo.png" alt="OpenRA Logo" height="70px" style="float: right; margin-right: 10px" />
-			Command &amp; Conquer and Command &amp; Conquer Red Alert are trademarks or registered
-			trademarks of Electronic Arts Inc.in the U.S. and/or other countries.<br />
-			Windows is a registered trademark of Microsoft Corporation in the United States
-			and other countries.<br />
-			Mac OS X is a trademark of Apple Inc., registered in the U.S. and other countries.<br />
-			Linux is the registered trademark of Linus Torvalds in the U.S. and other countries.<br />
-			Mono is a registered trademark of Novell, Inc. in the United States and other countries.<br />
-		</p>
-	</div>
-</body>
-</html>