Forráskód Böngészése

Merge pull request #15 from urkle/Linux-SampleFixes

A bunch of linux fixes to the samples - THANKS
Dominique Louis 13 éve
szülő
commit
354804365d

+ 6 - 2
BookSourceCode/XNAGameDevelopmentbyExampleCode/AsteroidBeltAssault/Program.cs

@@ -1,12 +1,14 @@
 using System;
 using System;
 
 
+#if MONOMAC
 using MonoMac.Foundation;
 using MonoMac.Foundation;
 using MonoMac.AppKit;
 using MonoMac.AppKit;
 using MonoMac.ObjCRuntime;
 using MonoMac.ObjCRuntime;
+#endif
 
 
 namespace Asteroid_Belt_Assault
 namespace Asteroid_Belt_Assault
 {
 {
-#if WINDOWS || XBOX
+#if WINDOWS || XBOX || LINUX
     static class Program
     static class Program
     {
     {
         /// <summary>
         /// <summary>
@@ -20,7 +22,7 @@ namespace Asteroid_Belt_Assault
             }
             }
         }
         }
     }
     }
-#else
+#elif MONOMAC
 	static class Program
 	static class Program
 	{
 	{
 		/// <summary>
 		/// <summary>
@@ -51,6 +53,8 @@ namespace Asteroid_Belt_Assault
 			return true;
 			return true;
 		}
 		}
 	}		
 	}		
+#else
+#error Unknown platform
 #endif
 #endif
 }
 }
 
 

+ 6 - 2
BookSourceCode/XNAGameDevelopmentbyExampleCode/FloodControl/Program.cs

@@ -1,12 +1,14 @@
 using System;
 using System;
 
 
+#if MONOMAC
 using MonoMac.Foundation;
 using MonoMac.Foundation;
 using MonoMac.AppKit;
 using MonoMac.AppKit;
 using MonoMac.ObjCRuntime;
 using MonoMac.ObjCRuntime;
+#endif
 
 
 namespace Flood_Control
 namespace Flood_Control
 {
 {
-#if WINDOWS || XBOX
+#if WINDOWS || XBOX || LINUX
 	static class Program
 	static class Program
 	{
 	{
 	/// <summary>
 	/// <summary>
@@ -20,7 +22,7 @@ namespace Flood_Control
 		}
 		}
 	}
 	}
 	}
 	}
-#else
+#elif MONOMAC
 	static class Program
 	static class Program
 	{
 	{
 		/// <summary>
 		/// <summary>
@@ -51,6 +53,8 @@ namespace Flood_Control
 			return true;
 			return true;
 		}
 		}
 	}		
 	}		
+#else
+#error Unknown platform
 #endif
 #endif
 }
 }
 
 

+ 4 - 0
BookSourceCode/XNAGameDevelopmentbyExampleCode/GemstoneHunter/GemstoneHunter.Linux.csproj

@@ -45,6 +45,10 @@
       <Project>{35253CE1-C864-4CD3-8249-4D1319748E8F}</Project>
       <Project>{35253CE1-C864-4CD3-8249-4D1319748E8F}</Project>
       <Name>MonoGame.Framework.Linux</Name>
       <Name>MonoGame.Framework.Linux</Name>
     </ProjectReference>
     </ProjectReference>
+    <ProjectReference Include="TileEngine\Tile Engine.Linux.csproj">
+      <Project>{521972FD-1A9B-4CFD-A435-EB2224985131}</Project>
+      <Name>Tile Engine.Linux</Name>
+    </ProjectReference>
   </ItemGroup>
   </ItemGroup>
   <ItemGroup>
   <ItemGroup>
     <Compile Include="Program.cs" />
     <Compile Include="Program.cs" />

+ 7 - 3
BookSourceCode/XNAGameDevelopmentbyExampleCode/GemstoneHunter/Program.cs

@@ -1,12 +1,14 @@
 using System;
 using System;
 
 
+#if MONOMAC
 using MonoMac.Foundation;
 using MonoMac.Foundation;
 using MonoMac.AppKit;
 using MonoMac.AppKit;
 using MonoMac.ObjCRuntime;
 using MonoMac.ObjCRuntime;
+#endif
 
 
 namespace Gemstone_Hunter
 namespace Gemstone_Hunter
 {
 {
-#if WINDOWS || XBOX
+#if WINDOWS || XBOX || LINUX
     static class Program
     static class Program
     {
     {
         /// <summary>
         /// <summary>
@@ -20,7 +22,7 @@ namespace Gemstone_Hunter
             }
             }
         }
         }
     }
     }
-#else
+#elif MONOMAC
 	static class Program
 	static class Program
 	{
 	{
 		/// <summary>
 		/// <summary>
@@ -50,7 +52,9 @@ namespace Gemstone_Hunter
 		{
 		{
 			return true;
 			return true;
 		}
 		}
-	}			
+	}
+#else
+#error Unknown platform
 #endif
 #endif
 }
 }
 
 

+ 4 - 4
BookSourceCode/XNAGameDevelopmentbyExampleCode/GemstoneHunter/TileEngine/Tile Engine.Linux.csproj

@@ -35,16 +35,16 @@
   </ItemGroup>
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <ItemGroup>
   <ItemGroup>
-    <Compile Include="..\Camera.cs">
+    <Compile Include="Camera.cs">
       <Link>Camera.cs</Link>
       <Link>Camera.cs</Link>
     </Compile>
     </Compile>
-    <Compile Include="..\MapSquare.cs">
+    <Compile Include="MapSquare.cs">
       <Link>MapSquare.cs</Link>
       <Link>MapSquare.cs</Link>
     </Compile>
     </Compile>
-    <Compile Include="..\MyClass.cs">
+    <Compile Include="MyClass.cs">
       <Link>MyClass.cs</Link>
       <Link>MyClass.cs</Link>
     </Compile>
     </Compile>
-    <Compile Include="..\TileMap.cs">
+    <Compile Include="TileMap.cs">
       <Link>TileMap.cs</Link>
       <Link>TileMap.cs</Link>
     </Compile>
     </Compile>
   </ItemGroup>
   </ItemGroup>

+ 6 - 2
BookSourceCode/XNAGameDevelopmentbyExampleCode/RobotRampage/Program.cs

@@ -1,12 +1,14 @@
 using System;
 using System;
 
 
+#if MONOMAC
 using MonoMac.Foundation;
 using MonoMac.Foundation;
 using MonoMac.AppKit;
 using MonoMac.AppKit;
 using MonoMac.ObjCRuntime;
 using MonoMac.ObjCRuntime;
+#endif
 
 
 namespace Robot_Rampage
 namespace Robot_Rampage
 {
 {
-#if WINDOWS || XBOX
+#if WINDOWS || XBOX || LINUX
     static class Program
     static class Program
     {
     {
         /// <summary>
         /// <summary>
@@ -20,7 +22,7 @@ namespace Robot_Rampage
             }
             }
         }
         }
     }
     }
-#else
+#elif MONOMAC
 	static class Program
 	static class Program
 	{
 	{
 		/// <summary>
 		/// <summary>
@@ -52,6 +54,8 @@ namespace Robot_Rampage
 			return true;
 			return true;
 		}
 		}
 	}		
 	}		
+#else
+#error Unknown platform
 #endif
 #endif
 }
 }
 
 

+ 1 - 1
CatapultNetWars/Catapult/Catapult.cs

@@ -446,7 +446,7 @@ namespace CatapultGame
             var aimAnimation = animations["Aim"];
             var aimAnimation = animations["Aim"];
             int frameToDisplay =
             int frameToDisplay =
                 Convert.ToInt32(aimAnimation.FrameCount * ShotStrength);
                 Convert.ToInt32(aimAnimation.FrameCount * ShotStrength);
-            aimAnimation.FrameIndex = frameToDisplay;
+            aimAnimation.FrameIndex = Math.Min(aimAnimation.FrameCount, frameToDisplay);
         }
         }
 
 
         /// <summary>
         /// <summary>

+ 94 - 59
CatapultNetWars/CatapaultNetWars.Linux.csproj → CatapultNetWars/CatapultNetWars.Linux.csproj

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -8,10 +8,8 @@
     <ProjectGuid>{0BCF8950-A28D-4688-BA92-85BD49637ED0}</ProjectGuid>
     <ProjectGuid>{0BCF8950-A28D-4688-BA92-85BD49637ED0}</ProjectGuid>
     <OutputType>Exe</OutputType>
     <OutputType>Exe</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>CatapaultNetWars</RootNamespace>
-    <AssemblyName>CatapaultNetWars</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <TargetFrameworkProfile>Client</TargetFrameworkProfile>
+    <RootNamespace>CatapultNetWars</RootNamespace>
+    <AssemblyName>CatapultNetWars</AssemblyName>
     <FileAlignment>512</FileAlignment>
     <FileAlignment>512</FileAlignment>
   </PropertyGroup>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
@@ -152,129 +150,146 @@
   </ItemGroup>
   </ItemGroup>
   <ItemGroup>
   <ItemGroup>
     <Content Include="Content\Fonts\HUDFont.xnb">
     <Content Include="Content\Fonts\HUDFont.xnb">
-      <Link>Content\Fonts\HUDFont.xnb</Link><CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      <Link>Content\Fonts\HUDFont.xnb</Link>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
     </Content>
     <Content Include="Content\Fonts\MenuFont.xnb">
     <Content Include="Content\Fonts\MenuFont.xnb">
-      <Link>Content\Fonts\MenuFont.xnb</Link><CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="Content\Sounds\BoulderHit.wav">
-      <Link>Content\Sounds\BoulderHit.wav</Link><CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="Content\Sounds\CatapultExplosion.wav">
-      <Link>Content\Sounds\CatapultExplosion.wav</Link><CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="Content\Sounds\CatapultFire.wav">
-      <Link>Content\Sounds\CatapultFire.wav</Link><CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="Content\Sounds\Lose.wav">
-      <Link>Content\Sounds\Lose.wav</Link><CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="Content\Sounds\RopeStretch.wav">
-      <Link>Content\Sounds\RopeStretch.wav</Link><CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="Content\Sounds\Win.wav">
-      <Link>Content\Sounds\Win.wav</Link><CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      <Link>Content\Fonts\MenuFont.xnb</Link>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
     </Content>
     <Content Include="Content\Textures\Ammo\rock_ammo.xnb">
     <Content Include="Content\Textures\Ammo\rock_ammo.xnb">
-      <Link>Content\Textures\Ammo\rock_ammo.xnb</Link><CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      <Link>Content\Textures\Ammo\rock_ammo.xnb</Link>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
     </Content>
     <Content Include="Content\Textures\Backgrounds\blank.xnb">
     <Content Include="Content\Textures\Backgrounds\blank.xnb">
-      <Link>Content\Textures\Backgrounds\blank.xnb</Link><CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      <Link>Content\Textures\Backgrounds\blank.xnb</Link>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
     </Content>
     <Content Include="Content\Textures\Backgrounds\cloud1.xnb">
     <Content Include="Content\Textures\Backgrounds\cloud1.xnb">
-      <Link>Content\Textures\Backgrounds\cloud1.xnb</Link><CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      <Link>Content\Textures\Backgrounds\cloud1.xnb</Link>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
     </Content>
     <Content Include="Content\Textures\Backgrounds\cloud2.xnb">
     <Content Include="Content\Textures\Backgrounds\cloud2.xnb">
-      <Link>Content\Textures\Backgrounds\cloud2.xnb</Link><CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      <Link>Content\Textures\Backgrounds\cloud2.xnb</Link>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
     </Content>
     <Content Include="Content\Textures\Backgrounds\defeat.xnb">
     <Content Include="Content\Textures\Backgrounds\defeat.xnb">
-      <Link>Content\Textures\Backgrounds\defeat.xnb</Link><CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      <Link>Content\Textures\Backgrounds\defeat.xnb</Link>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
     </Content>
     <Content Include="Content\Textures\Backgrounds\gameplay_screen.xnb">
     <Content Include="Content\Textures\Backgrounds\gameplay_screen.xnb">
-      <Link>Content\Textures\Backgrounds\gameplay_screen.xnb</Link><CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      <Link>Content\Textures\Backgrounds\gameplay_screen.xnb</Link>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
     </Content>
     <Content Include="Content\Textures\Backgrounds\instructions.xnb">
     <Content Include="Content\Textures\Backgrounds\instructions.xnb">
-      <Link>Content\Textures\Backgrounds\instructions.xnb</Link><CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      <Link>Content\Textures\Backgrounds\instructions.xnb</Link>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
     </Content>
     <Content Include="Content\Textures\Backgrounds\mountain.xnb">
     <Content Include="Content\Textures\Backgrounds\mountain.xnb">
-      <Link>Content\Textures\Backgrounds\mountain.xnb</Link><CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      <Link>Content\Textures\Backgrounds\mountain.xnb</Link>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
     </Content>
     <Content Include="Content\Textures\Backgrounds\sky.xnb">
     <Content Include="Content\Textures\Backgrounds\sky.xnb">
-      <Link>Content\Textures\Backgrounds\sky.xnb</Link><CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      <Link>Content\Textures\Backgrounds\sky.xnb</Link>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
     </Content>
     <Content Include="Content\Textures\Backgrounds\title_screen.xnb">
     <Content Include="Content\Textures\Backgrounds\title_screen.xnb">
-      <Link>Content\Textures\Backgrounds\title_screen.xnb</Link><CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      <Link>Content\Textures\Backgrounds\title_screen.xnb</Link>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
     </Content>
     <Content Include="Content\Textures\Backgrounds\victory.xnb">
     <Content Include="Content\Textures\Backgrounds\victory.xnb">
-      <Link>Content\Textures\Backgrounds\victory.xnb</Link><CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      <Link>Content\Textures\Backgrounds\victory.xnb</Link>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
     </Content>
     <Content Include="Content\Textures\HUD\ammoType.xnb">
     <Content Include="Content\Textures\HUD\ammoType.xnb">
-      <Link>Content\Textures\HUD\ammoType.xnb</Link><CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      <Link>Content\Textures\HUD\ammoType.xnb</Link>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
     </Content>
     <Content Include="Content\Textures\HUD\Arrow.xnb">
     <Content Include="Content\Textures\HUD\Arrow.xnb">
-      <Link>Content\Textures\HUD\Arrow.xnb</Link><CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      <Link>Content\Textures\HUD\Arrow.xnb</Link>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
     </Content>
     <Content Include="Content\Textures\HUD\hudBackground.xnb">
     <Content Include="Content\Textures\HUD\hudBackground.xnb">
-      <Link>Content\Textures\HUD\hudBackground.xnb</Link><CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      <Link>Content\Textures\HUD\hudBackground.xnb</Link>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
     </Content>
     <Content Include="Content\Textures\HUD\windArrow.xnb">
     <Content Include="Content\Textures\HUD\windArrow.xnb">
-      <Link>Content\Textures\HUD\windArrow.xnb</Link><CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      <Link>Content\Textures\HUD\windArrow.xnb</Link>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
     </Content>
     <Content Include="Content\Textures\Catapults\AnimationsDef.xml">
     <Content Include="Content\Textures\Catapults\AnimationsDef.xml">
-      <Link>Content\Textures\Catapults\AnimationsDef.xml</Link><CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      <Link>Content\Textures\Catapults\AnimationsDef.xml</Link>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
     </Content>
     <Content Include="Content\Textures\Catapults\Fire_Miss\fire_miss.xnb">
     <Content Include="Content\Textures\Catapults\Fire_Miss\fire_miss.xnb">
-      <Link>Content\Textures\Catapults\Fire_Miss\fire_miss.xnb</Link><CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      <Link>Content\Textures\Catapults\Fire_Miss\fire_miss.xnb</Link>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
     </Content>
     <Content Include="Content\Textures\Catapults\Hit_Smoke\smoke.xnb">
     <Content Include="Content\Textures\Catapults\Hit_Smoke\smoke.xnb">
-      <Link>Content\Textures\Catapults\Hit_Smoke\smoke.xnb</Link><CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      <Link>Content\Textures\Catapults\Hit_Smoke\smoke.xnb</Link>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
     </Content>
     <Content Include="Content\Textures\Catapults\Blue\blueDestroyed\blueCatapult_destroyed.xnb">
     <Content Include="Content\Textures\Catapults\Blue\blueDestroyed\blueCatapult_destroyed.xnb">
-      <Link>Content\Textures\Catapults\Blue\blueDestroyed\blueCatapult_destroyed.xnb</Link><CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      <Link>Content\Textures\Catapults\Blue\blueDestroyed\blueCatapult_destroyed.xnb</Link>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
     </Content>
     <Content Include="Content\Textures\Catapults\Blue\blueFire\blueCatapult_fire.xnb">
     <Content Include="Content\Textures\Catapults\Blue\blueFire\blueCatapult_fire.xnb">
-      <Link>Content\Textures\Catapults\Blue\blueFire\blueCatapult_fire.xnb</Link><CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      <Link>Content\Textures\Catapults\Blue\blueFire\blueCatapult_fire.xnb</Link>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
     </Content>
     <Content Include="Content\Textures\Catapults\Blue\blueIdle\blueIdle.xnb">
     <Content Include="Content\Textures\Catapults\Blue\blueIdle\blueIdle.xnb">
-      <Link>Content\Textures\Catapults\Blue\blueIdle\blueIdle.xnb</Link><CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      <Link>Content\Textures\Catapults\Blue\blueIdle\blueIdle.xnb</Link>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
     </Content>
     <Content Include="Content\Textures\Catapults\Blue\bluePullback\blueCatapult_Pullback.xnb">
     <Content Include="Content\Textures\Catapults\Blue\bluePullback\blueCatapult_Pullback.xnb">
-      <Link>Content\Textures\Catapults\Blue\bluePullback\blueCatapult_Pullback.xnb</Link><CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      <Link>Content\Textures\Catapults\Blue\bluePullback\blueCatapult_Pullback.xnb</Link>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
     </Content>
     <Content Include="Content\Textures\Catapults\Red\redDestroyed\redCatapult_destroyed.xnb">
     <Content Include="Content\Textures\Catapults\Red\redDestroyed\redCatapult_destroyed.xnb">
-      <Link>Content\Textures\Catapults\Red\redDestroyed\redCatapult_destroyed.xnb</Link><CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      <Link>Content\Textures\Catapults\Red\redDestroyed\redCatapult_destroyed.xnb</Link>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
     </Content>
     <Content Include="Content\Textures\Catapults\Red\redFire\redCatapult_fire.xnb">
     <Content Include="Content\Textures\Catapults\Red\redFire\redCatapult_fire.xnb">
-      <Link>Content\Textures\Catapults\Red\redFire\redCatapult_fire.xnb</Link><CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      <Link>Content\Textures\Catapults\Red\redFire\redCatapult_fire.xnb</Link>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
     </Content>
     <Content Include="Content\Textures\Catapults\Red\redIdle\redIdle.xnb">
     <Content Include="Content\Textures\Catapults\Red\redIdle\redIdle.xnb">
-      <Link>Content\Textures\Catapults\Red\redIdle\redIdle.xnb</Link><CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      <Link>Content\Textures\Catapults\Red\redIdle\redIdle.xnb</Link>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
     </Content>
     <Content Include="Content\Textures\Catapults\Red\redPullback\redCatapult_Pullback.xnb">
     <Content Include="Content\Textures\Catapults\Red\redPullback\redCatapult_Pullback.xnb">
-      <Link>Content\Textures\Catapults\Red\redPullback\redCatapult_Pullback.xnb</Link><CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      <Link>Content\Textures\Catapults\Red\redPullback\redCatapult_Pullback.xnb</Link>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
     </Content>
     <Content Include="Content\cat.xnb">
     <Content Include="Content\cat.xnb">
-      <Link>Content\cat.xnb</Link><CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      <Link>Content\cat.xnb</Link>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
     </Content>
     <Content Include="Content\chat_able.xnb">
     <Content Include="Content\chat_able.xnb">
-      <Link>Content\chat_able.xnb</Link><CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      <Link>Content\chat_able.xnb</Link>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
     </Content>
     <Content Include="Content\chat_mute.xnb">
     <Content Include="Content\chat_mute.xnb">
-      <Link>Content\chat_mute.xnb</Link><CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      <Link>Content\chat_mute.xnb</Link>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
     </Content>
     <Content Include="Content\chat_ready.xnb">
     <Content Include="Content\chat_ready.xnb">
-      <Link>Content\chat_ready.xnb</Link><CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      <Link>Content\chat_ready.xnb</Link>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
     </Content>
     <Content Include="Content\chat_talking.xnb">
     <Content Include="Content\chat_talking.xnb">
-      <Link>Content\chat_talking.xnb</Link><CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      <Link>Content\chat_talking.xnb</Link>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
     </Content>
     <Content Include="Content\gradient.xnb">
     <Content Include="Content\gradient.xnb">
-      <Link>Content\gradient.xnb</Link><CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      <Link>Content\gradient.xnb</Link>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
     </Content>
   </ItemGroup>
   </ItemGroup>
   <ItemGroup>
   <ItemGroup>
     <Content Include="Content\Textures\Catapults\AnimationsDef.xml">
     <Content Include="Content\Textures\Catapults\AnimationsDef.xml">
-      <Link>Content\Textures\Catapults\AnimationsDef.xml</Link><CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      <Link>Content\Textures\Catapults\AnimationsDef.xml</Link>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
     </Content>
   </ItemGroup>
   </ItemGroup>
   <ItemGroup>
   <ItemGroup>
@@ -288,7 +303,7 @@
       <Project>{35253CE1-C864-4CD3-8249-4D1319748E8F}</Project>
       <Project>{35253CE1-C864-4CD3-8249-4D1319748E8F}</Project>
       <Name>MonoGame.Framework.Linux</Name>
       <Name>MonoGame.Framework.Linux</Name>
     </ProjectReference>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\ThirdParty\Lidgren.Network\Lidgren.Network.Linux.csproj">
+    <ProjectReference Include="..\..\ThirdParty\Lidgren.Network\Lidgren.Network.Linux.csproj">
       <Project>{AE483C29-042E-4226-BA52-D247CE7676DA}</Project>
       <Project>{AE483C29-042E-4226-BA52-D247CE7676DA}</Project>
       <Name>Lidgren.Network.Linux</Name>
       <Name>Lidgren.Network.Linux</Name>
     </ProjectReference>
     </ProjectReference>
@@ -301,4 +316,24 @@
   <Target Name="AfterBuild">
   <Target Name="AfterBuild">
   </Target>
   </Target>
   -->
   -->
+  <ItemGroup>
+    <None Include="Content\Sounds\BoulderHit.xnb">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Include="Content\Sounds\CatapultExplosion.xnb">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Include="Content\Sounds\CatapultFire.xnb">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Include="Content\Sounds\Lose.xnb">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Include="Content\Sounds\RopeStretch.xnb">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Include="Content\Sounds\Win.xnb">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+  </ItemGroup>
 </Project>
 </Project>

+ 1 - 1
CatapultNetWars/Players/Human.cs

@@ -79,7 +79,7 @@ namespace CatapultGame
 
 
 		public override void Initialize ()
 		public override void Initialize ()
 		{
 		{
-			arrow = curGame.Content.Load<Texture2D> ("Textures/HUD/arrow");
+			arrow = curGame.Content.Load<Texture2D> ("Textures/HUD/Arrow");
 
 
 			Catapult.Initialize ();
 			Catapult.Initialize ();
 
 

+ 1 - 1
CatapultNetWars/Program.cs

@@ -19,7 +19,7 @@ using MonoTouch.UIKit;
 
 
 namespace CatapultGame
 namespace CatapultGame
 {
 {
-#if WINDOWS || XBOX
+#if WINDOWS || XBOX || LINUX
     static class Program
     static class Program
     {
     {
         /// <summary>
         /// <summary>

+ 22 - 0
MonoGame.Samples.Linux.sln

@@ -43,6 +43,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MonoGame.Samples.FloodContr
 EndProject
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "StarWarrior.Linux", "StarWarrior\StarWarrior.Linux.csproj", "{2012F252-E53A-4900-A2C5-9550D008DF8B}"
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "StarWarrior.Linux", "StarWarrior\StarWarrior.Linux.csproj", "{2012F252-E53A-4900-A2C5-9550D008DF8B}"
 EndProject
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CatapultNetWars.Linux", "CatapultNetWars\CatapultNetWars.Linux.csproj", "{0BCF8950-A28D-4688-BA92-85BD49637ED0}"
+EndProject
 Global
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
 		Debug|Any CPU = Debug|Any CPU
@@ -57,6 +59,26 @@ Global
 		Release|x86 = Release|x86
 		Release|x86 = Release|x86
 	EndGlobalSection
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{0BCF8950-A28D-4688-BA92-85BD49637ED0}.Debug|Any CPU.ActiveCfg = Debug|x86
+		{0BCF8950-A28D-4688-BA92-85BD49637ED0}.Debug|Any CPU.Build.0 = Debug|x86
+		{0BCF8950-A28D-4688-BA92-85BD49637ED0}.Debug|iPhone.ActiveCfg = Debug|x86
+		{0BCF8950-A28D-4688-BA92-85BD49637ED0}.Debug|iPhone.Build.0 = Debug|x86
+		{0BCF8950-A28D-4688-BA92-85BD49637ED0}.Debug|iPhoneSimulator.ActiveCfg = Debug|x86
+		{0BCF8950-A28D-4688-BA92-85BD49637ED0}.Debug|iPhoneSimulator.Build.0 = Debug|x86
+		{0BCF8950-A28D-4688-BA92-85BD49637ED0}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
+		{0BCF8950-A28D-4688-BA92-85BD49637ED0}.Debug|Mixed Platforms.Build.0 = Debug|x86
+		{0BCF8950-A28D-4688-BA92-85BD49637ED0}.Debug|x86.ActiveCfg = Debug|x86
+		{0BCF8950-A28D-4688-BA92-85BD49637ED0}.Debug|x86.Build.0 = Debug|x86
+		{0BCF8950-A28D-4688-BA92-85BD49637ED0}.Release|Any CPU.ActiveCfg = Release|x86
+		{0BCF8950-A28D-4688-BA92-85BD49637ED0}.Release|Any CPU.Build.0 = Release|x86
+		{0BCF8950-A28D-4688-BA92-85BD49637ED0}.Release|iPhone.ActiveCfg = Release|x86
+		{0BCF8950-A28D-4688-BA92-85BD49637ED0}.Release|iPhone.Build.0 = Release|x86
+		{0BCF8950-A28D-4688-BA92-85BD49637ED0}.Release|iPhoneSimulator.ActiveCfg = Release|x86
+		{0BCF8950-A28D-4688-BA92-85BD49637ED0}.Release|iPhoneSimulator.Build.0 = Release|x86
+		{0BCF8950-A28D-4688-BA92-85BD49637ED0}.Release|Mixed Platforms.ActiveCfg = Release|x86
+		{0BCF8950-A28D-4688-BA92-85BD49637ED0}.Release|Mixed Platforms.Build.0 = Release|x86
+		{0BCF8950-A28D-4688-BA92-85BD49637ED0}.Release|x86.ActiveCfg = Release|x86
+		{0BCF8950-A28D-4688-BA92-85BD49637ED0}.Release|x86.Build.0 = Release|x86
 		{2012F252-E53A-4900-A2C5-9550D008DF8B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{2012F252-E53A-4900-A2C5-9550D008DF8B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{2012F252-E53A-4900-A2C5-9550D008DF8B}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{2012F252-E53A-4900-A2C5-9550D008DF8B}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{2012F252-E53A-4900-A2C5-9550D008DF8B}.Debug|iPhone.ActiveCfg = Debug|Any CPU
 		{2012F252-E53A-4900-A2C5-9550D008DF8B}.Debug|iPhone.ActiveCfg = Debug|Any CPU

+ 0 - 2
Peer2PeerSample/MonoGame.Samples.Peer2PeerSample.Linux.csproj

@@ -46,7 +46,6 @@
       <Link>Tank.cs</Link>
       <Link>Tank.cs</Link>
     </Compile>
     </Compile>
     <Compile Include="Program.cs" />
     <Compile Include="Program.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   </ItemGroup>
   <ItemGroup>
   <ItemGroup>
     <Content Include="Content\Font.spritefont">
     <Content Include="Content\Font.spritefont">
@@ -65,7 +64,6 @@
       <Link>Content\Turret.xnb</Link>
       <Link>Content\Turret.xnb</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
     </Content>
-    <None Include="app.config" />
   </ItemGroup>
   </ItemGroup>
   <ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\MonoGame.Framework\MonoGame.Framework.Linux.csproj">
     <ProjectReference Include="..\..\MonoGame.Framework\MonoGame.Framework.Linux.csproj">

BIN
StarWarrior/Content/player.png