Переглянути джерело

Great samples reorganizing, part 2

espes 13 роки тому
батько
коміт
c48aa268a5
100 змінених файлів з 1389 додано та 1444 видалено
  1. 1 1
      AdMob/MonoGame.Samples.AdMob.Android.csproj
  2. 0 0
      Aiming/Info.iOS.plist
  3. 2 2
      Aiming/MonoGame.Samples.Aiming.iOS.csproj
  4. 1 1
      BackgroundThreadTester/BackgroundThreadTester.MacOS.csproj
  5. 2 2
      BatteryStatus/MonoGame.Samples.BatteryStatus.iOS.csproj
  6. 1 1
      BookSourceCode/XNAGameDevelopmentbyExampleCode/AsteroidBeltAssault/AsteroidBeltAssault.MacOS.csproj
  7. 24 24
      BookSourceCode/XNAGameDevelopmentbyExampleCode/AsteroidBeltAssault/MonoGame.Samples.AsteroidBeltAssault.Linux.csproj
  8. 1 1
      BookSourceCode/XNAGameDevelopmentbyExampleCode/FloodControl/FloodControl.MacOS.csproj
  9. 14 14
      BookSourceCode/XNAGameDevelopmentbyExampleCode/FloodControl/MonoGame.Samples.FloodControl.Linux.csproj
  10. 35 35
      BookSourceCode/XNAGameDevelopmentbyExampleCode/GemstoneHunter/GemstoneHunter.Linux.csproj
  11. 1 1
      BookSourceCode/XNAGameDevelopmentbyExampleCode/GemstoneHunter/GemstoneHunter.MacOS.csproj
  12. 4 4
      BookSourceCode/XNAGameDevelopmentbyExampleCode/GemstoneHunter/TileEngine/Tile Engine.Linux.csproj
  13. 22 22
      BookSourceCode/XNAGameDevelopmentbyExampleCode/RobotRampage/MonoGame.Samples.RobotRampage.Linux.csproj
  14. 1 1
      BookSourceCode/XNAGameDevelopmentbyExampleCode/RobotRampage/RobotRampage.MacOS.csproj
  15. 0 0
      BouncingBox/Info.plist
  16. 5 5
      BouncingBox/MonoGame.Samples.BouncingBox.MacOS.csproj
  17. 2 2
      BouncingBox/MonoGame.Samples.BouncingBox.iOS.csproj
  18. 1 1
      CatapaultWars/CatapaultGame.MacOS.csproj
  19. 0 0
      CatapaultWars/Info.plist
  20. 55 55
      CatapaultWars/MonoGame.Samples.CatapultWars.Android.csproj
  21. 57 57
      CatapaultWars/MonoGame.Samples.CatapultWars.iOS.csproj
  22. 1 1
      CatapaultWars/Players/Human.cs
  23. 75 75
      CatapultNetWars/CatapaultNetWars.Linux.csproj
  24. 74 74
      CatapultNetWars/CatapaultNetWars.Windows.csproj
  25. 76 76
      CatapultNetWars/CatapultNetWars.Android.csproj
  26. 1 1
      CatapultNetWars/CatapultNetWars.MacOS.csproj
  27. 0 0
      CatapultNetWars/Info.plist
  28. 78 78
      CatapultNetWars/MonoGame.Samples.CatapultNetWars.iOS.csproj
  29. 0 0
      ChaseAndEvade/Info.plist
  30. 6 6
      ChaseAndEvade/MonoGame.Samples.ChaseAndEvade.Android.csproj
  31. 6 6
      ChaseAndEvade/MonoGame.Samples.ChaseAndEvade.Linux.csproj
  32. 6 6
      ChaseAndEvade/MonoGame.Samples.ChaseAndEvade.MacOS.csproj
  33. 2 2
      ChaseAndEvade/MonoGame.Samples.ChaseAndEvade.iOS.csproj
  34. 1 1
      CollisionSample/CollisionSample.csproj
  35. 1 1
      Colored3DCube/Colored3DCube.MacOS.csproj
  36. 4 0
      Draw2D/Game1.cs
  37. 0 0
      Draw2D/Info.plist
  38. 13 13
      Draw2D/MonoGame.Samples.Draw2D.Android.csproj
  39. 7 7
      Draw2D/MonoGame.Samples.Draw2D.Linux.csproj
  40. 2 2
      Draw2D/MonoGame.Samples.Draw2D.MacOS.csproj
  41. 8 8
      Draw2D/MonoGame.Samples.Draw2D.Windows.csproj
  42. 5 4
      Draw2D/MonoGame.Samples.Draw2D.iOS.csproj
  43. 26 1
      Draw2D/main.cs
  44. 2 2
      GameComponents/MonoGame.Samples.GameComponents.iOS.csproj
  45. 70 122
      GameStateManagement/Game.cs
  46. 1 1
      GameStateManagement/GameStateManagement.MacOS.csproj
  47. 25 0
      GameStateManagement/Info.iOS.plist
  48. 0 0
      GameStateManagement/Info.plist
  49. 147 0
      GameStateManagement/MonoGame.Samples.GameStateManagement.iOS.csproj
  50. 10 10
      GooCursor/GooCursor.Linux.csproj
  51. 1 1
      GooCursor/GooCursor.MacOS.csproj
  52. 1 1
      HoneycombRush/HoneycombRush.MacOS.csproj
  53. 2 2
      Input/MonoGame.Samples.Input.Android.csproj
  54. 3 4
      Input/MonoGame.Samples.Input.iOS.csproj
  55. 1 1
      InputReporter/InputReporter.MacOS.csproj
  56. 1 1
      MonoGame.Samples.MacOS.sln
  57. 25 25
      MonoGame.Samples.iOS.sln
  58. 2 2
      MultiTouch/MonoGame.Samples.MultiTouch.iOS.csproj
  59. 1 1
      NetRumble/AudioManager.cs
  60. 0 49
      NetRumble/Effects/BloomCombineEffect.cs
  61. 0 49
      NetRumble/Effects/BloomExtractEffect.cs
  62. 0 49
      NetRumble/Effects/CloudsEffect.cs
  63. 0 49
      NetRumble/Effects/GaussianBlurEffect.cs
  64. 172 172
      NetRumble/MonoGame.Samples.NetRumble.Linux.csproj
  65. 3 9
      NetRumble/NetRumble.MacOS.csproj
  66. 111 111
      NetRumble/NetRumble.Windows.csproj
  67. 2 2
      NetRumble/Rendering/Starfield.cs
  68. 1 1
      NetworkPrediction/NetworkPrediction.MacOS.csproj
  69. 7 7
      NetworkPrediction/NetworkPrediction.Windows.csproj
  70. 35 35
      NetworkStateManagement/NetworkStateManagement.Linux.csproj
  71. 1 1
      NetworkStateManagement/NetworkStateManagement.MacOS.csproj
  72. 35 35
      NetworkStateManagement/NetworkStateManagement.Windows.csproj
  73. 6 8
      Orientation/MonoGame.Samples.Orientation.iOS.csproj
  74. 1 1
      Orientation/Orientation.Android.csproj
  75. 1 1
      Particle3DSample/Particle3DSample.MacOS.csproj
  76. 1 1
      Particle3DSample/ParticleSettings/ParticleSettings.csproj
  77. 0 0
      ParticleSample/Info.plist
  78. 2 2
      ParticleSample/MonoGame.Samples.ParticleSample.iOS.csproj
  79. 16 16
      ParticleSample/ParticleSample.Linux.csproj
  80. 1 1
      ParticleSample/ParticleSample.MacOS.csproj
  81. 0 0
      Peer2PeerSample/Info.plist
  82. 7 7
      Peer2PeerSample/MonoGame.Samples.Peer2Peer.Android.csproj
  83. 7 7
      Peer2PeerSample/MonoGame.Samples.Peer2Peer.iOS.csproj
  84. 7 7
      Peer2PeerSample/MonoGame.Samples.Peer2PeerSample.Linux.csproj
  85. 1 1
      Peer2PeerSample/Peer2PeerSample.MacOS.csproj
  86. 7 7
      Peer2PeerSample/Peer2PeerSample.Windows.csproj
  87. 0 0
      PerPixelCollisionSample/Info.plist
  88. 8 8
      PerPixelCollisionSample/MonoGame.Samples.PerPixelCollision.iOS.csproj
  89. 1 1
      PerPixelCollisionSample/PerPixelCollisionSample.MacOS.csproj
  90. 0 16
      Primitives/Info.MacOS.plist
  91. 12 0
      Primitives/Info.iOS.plist
  92. 10 6
      Primitives/Info.plist
  93. 1 1
      Primitives/MonoGame.Samples.Primitives.Android.csproj
  94. 6 6
      Primitives/MonoGame.Samples.Primitives.iOS.csproj
  95. 1 1
      Primitives/Primitives.MacOS.csproj
  96. 0 0
      RectangleCollisionSample/Info.plist
  97. 8 8
      RectangleCollisionSample/MonoGame.Samples.RectangleCollision.iOS.csproj
  98. 1 1
      RectangleCollisionSample/RectangleCollisionSample.MacOS.csproj
  99. 0 0
      RenderTarget2DSample/Info.plist
  100. 4 4
      RenderTarget2DSample/MonoGame.Samples.RenderTarget2D.Android.csproj

+ 1 - 1
AdMob/MonoGame.Samples.AdMob.Android.csproj

@@ -66,7 +66,7 @@
   </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath)\Novell\Novell.MonoDroid.CSharp.targets" />
   <ItemGroup>
-    <ProjectReference Include="..\..\..\MonoGame.Framework\MonoGame.Framework.Android.csproj">
+    <ProjectReference Include="..\..\MonoGame.Framework\MonoGame.Framework.Android.csproj">
       <Project>{BA9476CF-99BA-4D03-92F2-73D2C5E58883}</Project>
       <Name>MonoGame.Framework.Android</Name>
     </ProjectReference>

+ 0 - 0
Aiming/Info.plist → Aiming/Info.iOS.plist


+ 2 - 2
Aiming/MonoGame.Samples.Aiming.iOS.csproj

@@ -114,10 +114,10 @@
   </ItemGroup>
   <ItemGroup>
     <None Include="GameThumbnail.png" />
-    <None Include="Info.plist" />
+    <None Include="Info.iOS.plist"><Link>Info.plist</Link></None>
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\..\MonoGame.Framework\MonoGame.Framework.iOS.csproj">
+    <ProjectReference Include="..\..\MonoGame.Framework\MonoGame.Framework.iOS.csproj">
       <Project>{DB8508BB-9849-4CC2-BC0F-8EB5DACB3C47}</Project>
       <Name>MonoGame.Framework.iOS</Name>
     </ProjectReference>

+ 1 - 1
BackgroundThreadTester/BackgroundThreadTester.MacOS.csproj

@@ -41,7 +41,7 @@
     <Reference Include="System.Windows.Forms" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="Info.plist" />
+    <None Include="Info.plist"></None>
     <None Include="Content\beehive.png" />
     <None Include="README.md" />
   </ItemGroup>

+ 2 - 2
BatteryStatus/MonoGame.Samples.BatteryStatus.iOS.csproj

@@ -100,10 +100,10 @@
     </Content>
   </ItemGroup>
   <ItemGroup>
-    <None Include="Info.plist" />
+    <None Include="Info.iOS.plist"><Link>Info.plist</Link></None>
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\..\MonoGame.Framework\MonoGame.Framework.iOS.csproj">
+    <ProjectReference Include="..\..\MonoGame.Framework\MonoGame.Framework.iOS.csproj">
       <Project>{DB8508BB-9849-4CC2-BC0F-8EB5DACB3C47}</Project>
       <Name>MonoGame.Framework.iOS</Name>
     </ProjectReference>

+ 1 - 1
BookSourceCode/XNAGameDevelopmentbyExampleCode/AsteroidBeltAssault/AsteroidBeltAssault.MacOS.csproj

@@ -38,7 +38,7 @@
     <Reference Include="MonoMac" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="Info.plist" />
+    <None Include="Info.plist"></None>
     <None Include="Game.ico" />
     <None Include="GameThumbnail.png" />
     <None Include="README.md" />

+ 24 - 24
BookSourceCode/XNAGameDevelopmentbyExampleCode/AsteroidBeltAssault/MonoGame.Samples.AsteroidBeltAssault.Linux.csproj

@@ -45,13 +45,13 @@
     <Reference Include="System.Drawing" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="..\..\..\..\MacOS\BookSourceCode\XNAGameDevelopmentbyExampleCode\AsteroidBeltAssault\Game.ico">
+    <None Include="Game.ico">
       <Link>Game.ico</Link>
     </None>
-    <None Include="..\..\..\..\MacOS\BookSourceCode\XNAGameDevelopmentbyExampleCode\AsteroidBeltAssault\GameThumbnail.png">
+    <None Include="GameThumbnail.png">
       <Link>GameThumbnail.png</Link>
     </None>
-    <None Include="..\..\..\..\MacOS\BookSourceCode\XNAGameDevelopmentbyExampleCode\AsteroidBeltAssault\README.md">
+    <None Include="README.md">
       <Link>README.md</Link>
     </None>
   </ItemGroup>
@@ -60,40 +60,40 @@
     <Folder Include="Content\Fonts\" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="..\..\..\..\MacOS\BookSourceCode\XNAGameDevelopmentbyExampleCode\AsteroidBeltAssault\AsteroidManager.cs">
+    <Compile Include="AsteroidManager.cs">
       <Link>AsteroidManager.cs</Link>
     </Compile>
-    <Compile Include="..\..\..\..\MacOS\BookSourceCode\XNAGameDevelopmentbyExampleCode\AsteroidBeltAssault\CollisionManager.cs">
+    <Compile Include="CollisionManager.cs">
       <Link>CollisionManager.cs</Link>
     </Compile>
-    <Compile Include="..\..\..\..\MacOS\BookSourceCode\XNAGameDevelopmentbyExampleCode\AsteroidBeltAssault\Enemy.cs">
+    <Compile Include="Enemy.cs">
       <Link>Enemy.cs</Link>
     </Compile>
-    <Compile Include="..\..\..\..\MacOS\BookSourceCode\XNAGameDevelopmentbyExampleCode\AsteroidBeltAssault\EnemyManager.cs">
+    <Compile Include="EnemyManager.cs">
       <Link>EnemyManager.cs</Link>
     </Compile>
-    <Compile Include="..\..\..\..\MacOS\BookSourceCode\XNAGameDevelopmentbyExampleCode\AsteroidBeltAssault\ExplosionManager.cs">
+    <Compile Include="ExplosionManager.cs">
       <Link>ExplosionManager.cs</Link>
     </Compile>
-    <Compile Include="..\..\..\..\MacOS\BookSourceCode\XNAGameDevelopmentbyExampleCode\AsteroidBeltAssault\Game1.cs">
+    <Compile Include="Game1.cs">
       <Link>Game1.cs</Link>
     </Compile>
-    <Compile Include="..\..\..\..\MacOS\BookSourceCode\XNAGameDevelopmentbyExampleCode\AsteroidBeltAssault\Particle.cs">
+    <Compile Include="Particle.cs">
       <Link>Particle.cs</Link>
     </Compile>
-    <Compile Include="..\..\..\..\MacOS\BookSourceCode\XNAGameDevelopmentbyExampleCode\AsteroidBeltAssault\PlayerManager.cs">
+    <Compile Include="PlayerManager.cs">
       <Link>PlayerManager.cs</Link>
     </Compile>
-    <Compile Include="..\..\..\..\MacOS\BookSourceCode\XNAGameDevelopmentbyExampleCode\AsteroidBeltAssault\ShotManager.cs">
+    <Compile Include="ShotManager.cs">
       <Link>ShotManager.cs</Link>
     </Compile>
-    <Compile Include="..\..\..\..\MacOS\BookSourceCode\XNAGameDevelopmentbyExampleCode\AsteroidBeltAssault\SoundManager.cs">
+    <Compile Include="SoundManager.cs">
       <Link>SoundManager.cs</Link>
     </Compile>
-    <Compile Include="..\..\..\..\MacOS\BookSourceCode\XNAGameDevelopmentbyExampleCode\AsteroidBeltAssault\Sprite.cs">
+    <Compile Include="Sprite.cs">
       <Link>Sprite.cs</Link>
     </Compile>
-    <Compile Include="..\..\..\..\MacOS\BookSourceCode\XNAGameDevelopmentbyExampleCode\AsteroidBeltAssault\StarField.cs">
+    <Compile Include="StarField.cs">
       <Link>StarField.cs</Link>
     </Compile>
     <Compile Include="Program.cs" />
@@ -105,41 +105,41 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <Content Include="..\..\..\..\MacOS\BookSourceCode\XNAGameDevelopmentbyExampleCode\AsteroidBeltAssault\Content\Fonts\Pericles14.xnb">
+    <Content Include="Content\Fonts\Pericles14.xnb">
       <Link>Content\Fonts\Pericles14.xnb</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="..\..\..\..\MacOS\BookSourceCode\XNAGameDevelopmentbyExampleCode\AsteroidBeltAssault\Content\Sounds\Explosion1.xnb">
+    <Content Include="Content\Sounds\Explosion1.xnb">
       <Link>Content\Sounds\Explosion1.xnb</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="..\..\..\..\MacOS\BookSourceCode\XNAGameDevelopmentbyExampleCode\AsteroidBeltAssault\Content\Sounds\Explosion2.xnb">
+    <Content Include="Content\Sounds\Explosion2.xnb">
       <Link>Content\Sounds\Explosion2.xnb</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="..\..\..\..\MacOS\BookSourceCode\XNAGameDevelopmentbyExampleCode\AsteroidBeltAssault\Content\Sounds\Explosion3.xnb">
+    <Content Include="Content\Sounds\Explosion3.xnb">
       <Link>Content\Sounds\Explosion3.xnb</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="..\..\..\..\MacOS\BookSourceCode\XNAGameDevelopmentbyExampleCode\AsteroidBeltAssault\Content\Sounds\Explosion4.xnb">
+    <Content Include="Content\Sounds\Explosion4.xnb">
       <Link>Content\Sounds\Explosion4.xnb</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="..\..\..\..\MacOS\BookSourceCode\XNAGameDevelopmentbyExampleCode\AsteroidBeltAssault\Content\Sounds\Shot1.xnb">
+    <Content Include="Content\Sounds\Shot1.xnb">
       <Link>Content\Sounds\Shot1.xnb</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="..\..\..\..\MacOS\BookSourceCode\XNAGameDevelopmentbyExampleCode\AsteroidBeltAssault\Content\Sounds\Shot2.xnb">
+    <Content Include="Content\Sounds\Shot2.xnb">
       <Link>Content\Sounds\Shot2.xnb</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="..\..\..\..\MacOS\BookSourceCode\XNAGameDevelopmentbyExampleCode\AsteroidBeltAssault\Content\Textures\SpriteSheet.xnb">
+    <Content Include="Content\Textures\SpriteSheet.xnb">
       <Link>Content\Textures\SpriteSheet.xnb</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
   </ItemGroup>
   <ItemGroup>
-    <Resource Include="..\..\..\..\MacOS\BookSourceCode\XNAGameDevelopmentbyExampleCode\AsteroidBeltAssault\Content\Textures\TitleScreen.xnb">
+    <Resource Include="Content\Textures\TitleScreen.xnb">
       <Link>Content\Textures\TitleScreen.xnb</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Resource>

+ 1 - 1
BookSourceCode/XNAGameDevelopmentbyExampleCode/FloodControl/FloodControl.MacOS.csproj

@@ -38,7 +38,7 @@
     <Reference Include="MonoMac" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="Info.plist" />
+    <None Include="Info.plist"></None>
     <None Include="Game.ico" />
     <None Include="GameThumbnail.png" />
     <None Include="README.md" />

+ 14 - 14
BookSourceCode/XNAGameDevelopmentbyExampleCode/FloodControl/MonoGame.Samples.FloodControl.Linux.csproj

@@ -45,25 +45,25 @@
   </ItemGroup>
   <ItemGroup>
     <Compile Include="Program.cs" />
-    <Compile Include="..\..\..\..\MacOS\BookSourceCode\XNAGameDevelopmentbyExampleCode\FloodControl\FadingPiece.cs">
+    <Compile Include="FadingPiece.cs">
       <Link>FadingPiece.cs</Link>
     </Compile>
-    <Compile Include="..\..\..\..\MacOS\BookSourceCode\XNAGameDevelopmentbyExampleCode\FloodControl\FallingPiece.cs">
+    <Compile Include="FallingPiece.cs">
       <Link>FallingPiece.cs</Link>
     </Compile>
-    <Compile Include="..\..\..\..\MacOS\BookSourceCode\XNAGameDevelopmentbyExampleCode\FloodControl\Game1.cs">
+    <Compile Include="Game1.cs">
       <Link>Game1.cs</Link>
     </Compile>
-    <Compile Include="..\..\..\..\MacOS\BookSourceCode\XNAGameDevelopmentbyExampleCode\FloodControl\GameBoard.cs">
+    <Compile Include="GameBoard.cs">
       <Link>GameBoard.cs</Link>
     </Compile>
-    <Compile Include="..\..\..\..\MacOS\BookSourceCode\XNAGameDevelopmentbyExampleCode\FloodControl\GamePiece.cs">
+    <Compile Include="GamePiece.cs">
       <Link>GamePiece.cs</Link>
     </Compile>
-    <Compile Include="..\..\..\..\MacOS\BookSourceCode\XNAGameDevelopmentbyExampleCode\FloodControl\RotatingPiece.cs">
+    <Compile Include="RotatingPiece.cs">
       <Link>RotatingPiece.cs</Link>
     </Compile>
-    <Compile Include="..\..\..\..\MacOS\BookSourceCode\XNAGameDevelopmentbyExampleCode\FloodControl\ScoreZooms.cs">
+    <Compile Include="ScoreZooms.cs">
       <Link>ScoreZooms.cs</Link>
     </Compile>
   </ItemGroup>
@@ -74,31 +74,31 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <Content Include="..\..\..\..\MacOS\BookSourceCode\XNAGameDevelopmentbyExampleCode\FloodControl\Content\Fonts\Pericles36.xnb">
+    <Content Include="Content\Fonts\Pericles36.xnb">
       <Link>Content\Fonts\Pericles36.xnb</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="..\..\..\..\MacOS\BookSourceCode\XNAGameDevelopmentbyExampleCode\FloodControl\Content\Textures\Background.xnb">
+    <Content Include="Content\Textures\Background.xnb">
       <Link>Content\Textures\Background.xnb</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="..\..\..\..\MacOS\BookSourceCode\XNAGameDevelopmentbyExampleCode\FloodControl\Content\Textures\Tile_Sheet.xnb">
+    <Content Include="Content\Textures\Tile_Sheet.xnb">
       <Link>Content\Textures\Tile_Sheet.xnb</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="..\..\..\..\MacOS\BookSourceCode\XNAGameDevelopmentbyExampleCode\FloodControl\Content\Textures\TitleScreen.xnb">
+    <Content Include="Content\Textures\TitleScreen.xnb">
       <Link>Content\Textures\TitleScreen.xnb</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
   </ItemGroup>
   <ItemGroup>
-    <None Include="..\..\..\..\MacOS\BookSourceCode\XNAGameDevelopmentbyExampleCode\FloodControl\Game.ico">
+    <None Include="Game.ico">
       <Link>Game.ico</Link>
     </None>
-    <None Include="..\..\..\..\MacOS\BookSourceCode\XNAGameDevelopmentbyExampleCode\FloodControl\GameThumbnail.png">
+    <None Include="GameThumbnail.png">
       <Link>GameThumbnail.png</Link>
     </None>
-    <None Include="..\..\..\..\MacOS\BookSourceCode\XNAGameDevelopmentbyExampleCode\FloodControl\README.md">
+    <None Include="README.md">
       <Link>README.md</Link>
     </None>
   </ItemGroup>

+ 35 - 35
BookSourceCode/XNAGameDevelopmentbyExampleCode/GemstoneHunter/GemstoneHunter.Linux.csproj

@@ -53,137 +53,137 @@
   </ItemGroup>
   <ItemGroup>
     <Compile Include="Program.cs" />
-    <Compile Include="..\..\..\..\MacOS\BookSourceCode\XNAGameDevelopmentbyExampleCode\GemstoneHunter\AnimationStrip.cs">
+    <Compile Include="AnimationStrip.cs">
       <Link>AnimationStrip.cs</Link>
     </Compile>
-    <Compile Include="..\..\..\..\MacOS\BookSourceCode\XNAGameDevelopmentbyExampleCode\GemstoneHunter\Enemy.cs">
+    <Compile Include="Enemy.cs">
       <Link>Enemy.cs</Link>
     </Compile>
-    <Compile Include="..\..\..\..\MacOS\BookSourceCode\XNAGameDevelopmentbyExampleCode\GemstoneHunter\Game1.cs">
+    <Compile Include="Game1.cs">
       <Link>Game1.cs</Link>
     </Compile>
-    <Compile Include="..\..\..\..\MacOS\BookSourceCode\XNAGameDevelopmentbyExampleCode\GemstoneHunter\GameObject.cs">
+    <Compile Include="GameObject.cs">
       <Link>GameObject.cs</Link>
     </Compile>
-    <Compile Include="..\..\..\..\MacOS\BookSourceCode\XNAGameDevelopmentbyExampleCode\GemstoneHunter\Gemstone.cs">
+    <Compile Include="Gemstone.cs">
       <Link>Gemstone.cs</Link>
     </Compile>
-    <Compile Include="..\..\..\..\MacOS\BookSourceCode\XNAGameDevelopmentbyExampleCode\GemstoneHunter\LevelManager.cs">
+    <Compile Include="LevelManager.cs">
       <Link>LevelManager.cs</Link>
     </Compile>
-    <Compile Include="..\..\..\..\MacOS\BookSourceCode\XNAGameDevelopmentbyExampleCode\GemstoneHunter\Player.cs">
+    <Compile Include="Player.cs">
       <Link>Player.cs</Link>
     </Compile>
   </ItemGroup>
   <ItemGroup>
-    <None Include="..\..\..\..\MacOS\BookSourceCode\XNAGameDevelopmentbyExampleCode\GemstoneHunter\Game.ico">
+    <None Include="Game.ico">
       <Link>Game.ico</Link>
     </None>
-    <None Include="..\..\..\..\MacOS\BookSourceCode\XNAGameDevelopmentbyExampleCode\GemstoneHunter\GameThumbnail.png">
+    <None Include="GameThumbnail.png">
       <Link>GameThumbnail.png</Link>
     </None>
-    <None Include="..\..\..\..\MacOS\BookSourceCode\XNAGameDevelopmentbyExampleCode\GemstoneHunter\README.md">
+    <None Include="README.md">
       <Link>README.md</Link>
     </None>
   </ItemGroup>
   <ItemGroup>
-    <Content Include="..\..\..\..\MacOS\BookSourceCode\XNAGameDevelopmentbyExampleCode\GemstoneHunter\Content\Fonts\Pericles10Bold.xnb">
+    <Content Include="Content\Fonts\Pericles10Bold.xnb">
       <Link>Content\Fonts\Pericles10Bold.xnb</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="..\..\..\..\MacOS\BookSourceCode\XNAGameDevelopmentbyExampleCode\GemstoneHunter\Content\Fonts\Pericles8.xnb">
+    <Content Include="Content\Fonts\Pericles8.xnb">
       <Link>Content\Fonts\Pericles8.xnb</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="..\..\..\..\MacOS\BookSourceCode\XNAGameDevelopmentbyExampleCode\GemstoneHunter\Content\Maps\MAP000.MAP">
+    <Content Include="Content\Maps\MAP000.MAP">
       <Link>Content\Maps\MAP000.MAP</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="..\..\..\..\MacOS\BookSourceCode\XNAGameDevelopmentbyExampleCode\GemstoneHunter\Content\Maps\MAP001.MAP">
+    <Content Include="Content\Maps\MAP001.MAP">
       <Link>Content\Maps\MAP001.MAP</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="..\..\..\..\MacOS\BookSourceCode\XNAGameDevelopmentbyExampleCode\GemstoneHunter\Content\Textures\Gem.xnb">
+    <Content Include="Content\Textures\Gem.xnb">
       <Link>Content\Textures\Gem.xnb</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="..\..\..\..\MacOS\BookSourceCode\XNAGameDevelopmentbyExampleCode\GemstoneHunter\Content\Textures\PlatformTiles.xnb">
+    <Content Include="Content\Textures\PlatformTiles.xnb">
       <Link>Content\Textures\PlatformTiles.xnb</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="..\..\..\..\MacOS\BookSourceCode\XNAGameDevelopmentbyExampleCode\GemstoneHunter\Content\Textures\TitleScreen.xnb">
+    <Content Include="Content\Textures\TitleScreen.xnb">
       <Link>Content\Textures\TitleScreen.xnb</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="..\..\..\..\MacOS\BookSourceCode\XNAGameDevelopmentbyExampleCode\GemstoneHunter\Content\Textures\Sprites\Gem.xnb">
+    <Content Include="Content\Textures\Sprites\Gem.xnb">
       <Link>Content\Textures\Sprites\Gem.xnb</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="..\..\..\..\MacOS\BookSourceCode\XNAGameDevelopmentbyExampleCode\GemstoneHunter\Content\Textures\Sprites\Player\Celebrate.xnb">
+    <Content Include="Content\Textures\Sprites\Player\Celebrate.xnb">
       <Link>Content\Textures\Sprites\Player\Celebrate.xnb</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="..\..\..\..\MacOS\BookSourceCode\XNAGameDevelopmentbyExampleCode\GemstoneHunter\Content\Textures\Sprites\Player\Die.xnb">
+    <Content Include="Content\Textures\Sprites\Player\Die.xnb">
       <Link>Content\Textures\Sprites\Player\Die.xnb</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="..\..\..\..\MacOS\BookSourceCode\XNAGameDevelopmentbyExampleCode\GemstoneHunter\Content\Textures\Sprites\Player\Idle.xnb">
+    <Content Include="Content\Textures\Sprites\Player\Idle.xnb">
       <Link>Content\Textures\Sprites\Player\Idle.xnb</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="..\..\..\..\MacOS\BookSourceCode\XNAGameDevelopmentbyExampleCode\GemstoneHunter\Content\Textures\Sprites\Player\Jump.xnb">
+    <Content Include="Content\Textures\Sprites\Player\Jump.xnb">
       <Link>Content\Textures\Sprites\Player\Jump.xnb</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="..\..\..\..\MacOS\BookSourceCode\XNAGameDevelopmentbyExampleCode\GemstoneHunter\Content\Textures\Sprites\Player\Run.xnb">
+    <Content Include="Content\Textures\Sprites\Player\Run.xnb">
       <Link>Content\Textures\Sprites\Player\Run.xnb</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="..\..\..\..\MacOS\BookSourceCode\XNAGameDevelopmentbyExampleCode\GemstoneHunter\Content\Textures\Sprites\MonsterA\Die.xnb">
+    <Content Include="Content\Textures\Sprites\MonsterA\Die.xnb">
       <Link>Content\Textures\Sprites\MonsterA\Die.xnb</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="..\..\..\..\MacOS\BookSourceCode\XNAGameDevelopmentbyExampleCode\GemstoneHunter\Content\Textures\Sprites\MonsterA\Idle.xnb">
+    <Content Include="Content\Textures\Sprites\MonsterA\Idle.xnb">
       <Link>Content\Textures\Sprites\MonsterA\Idle.xnb</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="..\..\..\..\MacOS\BookSourceCode\XNAGameDevelopmentbyExampleCode\GemstoneHunter\Content\Textures\Sprites\MonsterA\Run.xnb">
+    <Content Include="Content\Textures\Sprites\MonsterA\Run.xnb">
       <Link>Content\Textures\Sprites\MonsterA\Run.xnb</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="..\..\..\..\MacOS\BookSourceCode\XNAGameDevelopmentbyExampleCode\GemstoneHunter\Content\Textures\Sprites\MonsterB\Die.xnb">
+    <Content Include="Content\Textures\Sprites\MonsterB\Die.xnb">
       <Link>Content\Textures\Sprites\MonsterB\Die.xnb</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="..\..\..\..\MacOS\BookSourceCode\XNAGameDevelopmentbyExampleCode\GemstoneHunter\Content\Textures\Sprites\MonsterB\Idle.xnb">
+    <Content Include="Content\Textures\Sprites\MonsterB\Idle.xnb">
       <Link>Content\Textures\Sprites\MonsterB\Idle.xnb</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="..\..\..\..\MacOS\BookSourceCode\XNAGameDevelopmentbyExampleCode\GemstoneHunter\Content\Textures\Sprites\MonsterB\Run.xnb">
+    <Content Include="Content\Textures\Sprites\MonsterB\Run.xnb">
       <Link>Content\Textures\Sprites\MonsterB\Run.xnb</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="..\..\..\..\MacOS\BookSourceCode\XNAGameDevelopmentbyExampleCode\GemstoneHunter\Content\Textures\Sprites\MonsterC\Die.xnb">
+    <Content Include="Content\Textures\Sprites\MonsterC\Die.xnb">
       <Link>Content\Textures\Sprites\MonsterC\Die.xnb</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="..\..\..\..\MacOS\BookSourceCode\XNAGameDevelopmentbyExampleCode\GemstoneHunter\Content\Textures\Sprites\MonsterC\Idle.xnb">
+    <Content Include="Content\Textures\Sprites\MonsterC\Idle.xnb">
       <Link>Content\Textures\Sprites\MonsterC\Idle.xnb</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="..\..\..\..\MacOS\BookSourceCode\XNAGameDevelopmentbyExampleCode\GemstoneHunter\Content\Textures\Sprites\MonsterC\Run.xnb">
+    <Content Include="Content\Textures\Sprites\MonsterC\Run.xnb">
       <Link>Content\Textures\Sprites\MonsterC\Run.xnb</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="..\..\..\..\MacOS\BookSourceCode\XNAGameDevelopmentbyExampleCode\GemstoneHunter\Content\Textures\Sprites\MonsterD\Die.xnb">
+    <Content Include="Content\Textures\Sprites\MonsterD\Die.xnb">
       <Link>Content\Textures\Sprites\MonsterD\Die.xnb</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="..\..\..\..\MacOS\BookSourceCode\XNAGameDevelopmentbyExampleCode\GemstoneHunter\Content\Textures\Sprites\MonsterD\Idle.xnb">
+    <Content Include="Content\Textures\Sprites\MonsterD\Idle.xnb">
       <Link>Content\Textures\Sprites\MonsterD\Idle.xnb</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="..\..\..\..\MacOS\BookSourceCode\XNAGameDevelopmentbyExampleCode\GemstoneHunter\Content\Textures\Sprites\MonsterD\Run.xnb">
+    <Content Include="Content\Textures\Sprites\MonsterD\Run.xnb">
       <Link>Content\Textures\Sprites\MonsterD\Run.xnb</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>

+ 1 - 1
BookSourceCode/XNAGameDevelopmentbyExampleCode/GemstoneHunter/GemstoneHunter.MacOS.csproj

@@ -38,7 +38,7 @@
     <Reference Include="MonoMac" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="Info.plist" />
+    <None Include="Info.plist"></None>
     <None Include="Game.ico" />
     <None Include="GameThumbnail.png" />
     <None Include="README.md" />

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

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

+ 22 - 22
BookSourceCode/XNAGameDevelopmentbyExampleCode/RobotRampage/MonoGame.Samples.RobotRampage.Linux.csproj

@@ -40,16 +40,16 @@
     <Reference Include="System.Drawing" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="..\..\..\..\MacOS\BookSourceCode\XNAGameDevelopmentbyExampleCode\RobotRampage\README.md">
+    <None Include="README.md">
       <Link>README.md</Link>
     </None>
-    <None Include="..\..\..\..\MacOS\BookSourceCode\XNAGameDevelopmentbyExampleCode\RobotRampage\Info.plist">
+    <None Include="Info.plist">
       <Link>Info.plist</Link>
     </None>
-    <None Include="..\..\..\..\MacOS\BookSourceCode\XNAGameDevelopmentbyExampleCode\RobotRampage\GameThumbnail.png">
+    <None Include="GameThumbnail.png">
       <Link>GameThumbnail.png</Link>
     </None>
-    <None Include="..\..\..\..\MacOS\BookSourceCode\XNAGameDevelopmentbyExampleCode\RobotRampage\Game.ico">
+    <None Include="Game.ico">
       <Link>Game.ico</Link>
     </None>
   </ItemGroup>
@@ -62,49 +62,49 @@
   </ItemGroup>
   <ItemGroup>
     <Compile Include="Program.cs" />
-    <Compile Include="..\..\..\..\MacOS\BookSourceCode\XNAGameDevelopmentbyExampleCode\RobotRampage\WeaponManager.cs">
+    <Compile Include="WeaponManager.cs">
       <Link>WeaponManager.cs</Link>
     </Compile>
-    <Compile Include="..\..\..\..\MacOS\BookSourceCode\XNAGameDevelopmentbyExampleCode\RobotRampage\TileMap.cs">
+    <Compile Include="TileMap.cs">
       <Link>TileMap.cs</Link>
     </Compile>
-    <Compile Include="..\..\..\..\MacOS\BookSourceCode\XNAGameDevelopmentbyExampleCode\RobotRampage\Sprite.cs">
+    <Compile Include="Sprite.cs">
       <Link>Sprite.cs</Link>
     </Compile>
-    <Compile Include="..\..\..\..\MacOS\BookSourceCode\XNAGameDevelopmentbyExampleCode\RobotRampage\Player.cs">
+    <Compile Include="Player.cs">
       <Link>Player.cs</Link>
     </Compile>
-    <Compile Include="..\..\..\..\MacOS\BookSourceCode\XNAGameDevelopmentbyExampleCode\RobotRampage\PathNode.cs">
+    <Compile Include="PathNode.cs">
       <Link>PathNode.cs</Link>
     </Compile>
-    <Compile Include="..\..\..\..\MacOS\BookSourceCode\XNAGameDevelopmentbyExampleCode\RobotRampage\PathFinder.cs">
+    <Compile Include="PathFinder.cs">
       <Link>PathFinder.cs</Link>
     </Compile>
-    <Compile Include="..\..\..\..\MacOS\BookSourceCode\XNAGameDevelopmentbyExampleCode\RobotRampage\Particle.cs">
+    <Compile Include="Particle.cs">
       <Link>Particle.cs</Link>
     </Compile>
-    <Compile Include="..\..\..\..\MacOS\BookSourceCode\XNAGameDevelopmentbyExampleCode\RobotRampage\GoalManager.cs">
+    <Compile Include="GoalManager.cs">
       <Link>GoalManager.cs</Link>
     </Compile>
-    <Compile Include="..\..\..\..\MacOS\BookSourceCode\XNAGameDevelopmentbyExampleCode\RobotRampage\GameManager.cs">
+    <Compile Include="GameManager.cs">
       <Link>GameManager.cs</Link>
     </Compile>
-    <Compile Include="..\..\..\..\MacOS\BookSourceCode\XNAGameDevelopmentbyExampleCode\RobotRampage\Game1.cs">
+    <Compile Include="Game1.cs">
       <Link>Game1.cs</Link>
     </Compile>
-    <Compile Include="..\..\..\..\MacOS\BookSourceCode\XNAGameDevelopmentbyExampleCode\RobotRampage\EnemyManager.cs">
+    <Compile Include="EnemyManager.cs">
       <Link>EnemyManager.cs</Link>
     </Compile>
-    <Compile Include="..\..\..\..\MacOS\BookSourceCode\XNAGameDevelopmentbyExampleCode\RobotRampage\Enemy.cs">
+    <Compile Include="Enemy.cs">
       <Link>Enemy.cs</Link>
     </Compile>
-    <Compile Include="..\..\..\..\MacOS\BookSourceCode\XNAGameDevelopmentbyExampleCode\RobotRampage\EffectsManager.cs">
+    <Compile Include="EffectsManager.cs">
       <Link>EffectsManager.cs</Link>
     </Compile>
-    <Compile Include="..\..\..\..\MacOS\BookSourceCode\XNAGameDevelopmentbyExampleCode\RobotRampage\ComputerTerminal.cs">
+    <Compile Include="ComputerTerminal.cs">
       <Link>ComputerTerminal.cs</Link>
     </Compile>
-    <Compile Include="..\..\..\..\MacOS\BookSourceCode\XNAGameDevelopmentbyExampleCode\RobotRampage\Camera.cs">
+    <Compile Include="Camera.cs">
       <Link>Camera.cs</Link>
     </Compile>
   </ItemGroup>
@@ -115,15 +115,15 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <Content Include="..\..\..\..\MacOS\BookSourceCode\XNAGameDevelopmentbyExampleCode\RobotRampage\Content\Fonts\Pericles14.xnb">
+    <Content Include="Content\Fonts\Pericles14.xnb">
       <Link>Content\Fonts\Pericles14.xnb</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="..\..\..\..\MacOS\BookSourceCode\XNAGameDevelopmentbyExampleCode\RobotRampage\Content\Textures\TitleScreen.xnb">
+    <Content Include="Content\Textures\TitleScreen.xnb">
       <Link>Content\Textures\TitleScreen.xnb</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="..\..\..\..\MacOS\BookSourceCode\XNAGameDevelopmentbyExampleCode\RobotRampage\Content\Textures\SpriteSheet.xnb">
+    <Content Include="Content\Textures\SpriteSheet.xnb">
       <Link>Content\Textures\SpriteSheet.xnb</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>

+ 1 - 1
BookSourceCode/XNAGameDevelopmentbyExampleCode/RobotRampage/RobotRampage.MacOS.csproj

@@ -38,7 +38,7 @@
     <Reference Include="MonoMac" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="Info.plist" />
+    <None Include="Info.plist"></None>
     <None Include="Game.ico" />
     <None Include="GameThumbnail.png" />
     <None Include="README.md" />

+ 0 - 0
BouncingBox/Info.MacOS.plist → BouncingBox/Info.plist


+ 5 - 5
BouncingBox/MonoGame.Samples.BouncingBox.MacOS.csproj

@@ -43,25 +43,25 @@
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <Import Project="$(MSBuildExtensionsPath)\Mono\MonoMac\v0.0\Mono.MonoMac.targets" />
   <ItemGroup>
-    <Compile Include="..\..\iOS\BouncingBox\FPSCounterComponent.cs">
+    <Compile Include="FPSCounterComponent.cs">
       <Link>FPSCounterComponent.cs</Link>
     </Compile>
     <Compile Include="main.cs" />
-    <Compile Include="..\..\iOS\BouncingBox\Game1.cs">
+    <Compile Include="Game1.cs">
       <Link>Game1.cs</Link>
     </Compile>
   </ItemGroup>
   <ItemGroup>
-    <Content Include="..\..\iOS\BouncingBox\Content\font.xnb">
+    <Content Include="Content\font.xnb">
       <Link>Content\font.xnb</Link>
     </Content>
-    <Content Include="..\..\iOS\BouncingBox\Content\monogameicon.png">
+    <Content Include="Content\monogameicon.png">
       <Link>Content\monogameicon.png</Link>
     </Content>
     <Content Include="monogameicon.png" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="Info.plist" />
+    <None Include="Info.plist"></None>
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\MonoGame.Framework\MonoGame.Framework.MacOS.csproj">

+ 2 - 2
BouncingBox/MonoGame.Samples.BouncingBox.iOS.csproj

@@ -101,10 +101,10 @@
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <ItemGroup>
     <None Include="monogameicon.png" />
-    <None Include="Info.plist" />
+    <None Include="Info.iOS.plist"><Link>Info.plist</Link></None>
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\..\MonoGame.Framework\MonoGame.Framework.iOS.csproj">
+    <ProjectReference Include="..\..\MonoGame.Framework\MonoGame.Framework.iOS.csproj">
       <Project>{DB8508BB-9849-4CC2-BC0F-8EB5DACB3C47}</Project>
       <Name>MonoGame.Framework.iOS</Name>
     </ProjectReference>

+ 1 - 1
CatapaultWars/CatapaultGame.MacOS.csproj

@@ -40,7 +40,7 @@
     <Reference Include="MonoMac" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="Info.plist" />
+    <None Include="Info.plist"></None>
     <None Include="Background.png" />
     <None Include="Game.ico" />
   </ItemGroup>

+ 0 - 0
CatapaultWars/Info.MacOS.plist → CatapaultWars/Info.plist


+ 55 - 55
CatapaultWars/MonoGame.Samples.CatapultWars.Android.csproj

@@ -50,64 +50,64 @@
     <Compile Include="Activity1.cs" />
     <Compile Include="Resources\Resource.designer.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="..\..\MacOS\CatapaultWars\CatapultGame.cs">
+    <Compile Include="CatapultGame.cs">
       <Link>CatapultGame.cs</Link>
     </Compile>
-    <Compile Include="..\..\MacOS\CatapaultWars\Catapult\Catapult.cs">
+    <Compile Include="Catapult\Catapult.cs">
       <Link>Catapult\Catapult.cs</Link>
     </Compile>
-    <Compile Include="..\..\MacOS\CatapaultWars\Catapult\Projectile.cs">
+    <Compile Include="Catapult\Projectile.cs">
       <Link>Catapult\Projectile.cs</Link>
     </Compile>
-    <Compile Include="..\..\MacOS\CatapaultWars\Players\AI.cs">
+    <Compile Include="Players\AI.cs">
       <Link>Players\AI.cs</Link>
     </Compile>
-    <Compile Include="..\..\MacOS\CatapaultWars\Players\Human.cs">
+    <Compile Include="Players\Human.cs">
       <Link>Players\Human.cs</Link>
     </Compile>
-    <Compile Include="..\..\MacOS\CatapaultWars\Players\Player.cs">
+    <Compile Include="Players\Player.cs">
       <Link>Players\Player.cs</Link>
     </Compile>
-    <Compile Include="..\..\MacOS\CatapaultWars\ScreenManager\GameScreen.cs">
+    <Compile Include="ScreenManager\GameScreen.cs">
       <Link>ScreenManager\GameScreen.cs</Link>
     </Compile>
-    <Compile Include="..\..\MacOS\CatapaultWars\ScreenManager\InputState.cs">
+    <Compile Include="ScreenManager\InputState.cs">
       <Link>ScreenManager\InputState.cs</Link>
     </Compile>
-    <Compile Include="..\..\MacOS\CatapaultWars\ScreenManager\MenuEntry.cs">
+    <Compile Include="ScreenManager\MenuEntry.cs">
       <Link>ScreenManager\MenuEntry.cs</Link>
     </Compile>
-    <Compile Include="..\..\MacOS\CatapaultWars\ScreenManager\MenuScreen.cs">
+    <Compile Include="ScreenManager\MenuScreen.cs">
       <Link>ScreenManager\MenuScreen.cs</Link>
     </Compile>
-    <Compile Include="..\..\MacOS\CatapaultWars\ScreenManager\MouseGestureType.cs">
+    <Compile Include="ScreenManager\MouseGestureType.cs">
       <Link>ScreenManager\MouseGestureType.cs</Link>
     </Compile>
-    <Compile Include="..\..\MacOS\CatapaultWars\ScreenManager\PlayerIndexEventArgs.cs">
+    <Compile Include="ScreenManager\PlayerIndexEventArgs.cs">
       <Link>ScreenManager\PlayerIndexEventArgs.cs</Link>
     </Compile>
-    <Compile Include="..\..\MacOS\CatapaultWars\ScreenManager\ScreenManager.cs">
+    <Compile Include="ScreenManager\ScreenManager.cs">
       <Link>ScreenManager\ScreenManager.cs</Link>
     </Compile>
-    <Compile Include="..\..\MacOS\CatapaultWars\Screens\BackgroundScreen.cs">
+    <Compile Include="Screens\BackgroundScreen.cs">
       <Link>Screens\BackgroundScreen.cs</Link>
     </Compile>
-    <Compile Include="..\..\MacOS\CatapaultWars\Screens\GameplayScreen.cs">
+    <Compile Include="Screens\GameplayScreen.cs">
       <Link>Screens\GameplayScreen.cs</Link>
     </Compile>
-    <Compile Include="..\..\MacOS\CatapaultWars\Screens\InstructionsScreen.cs">
+    <Compile Include="Screens\InstructionsScreen.cs">
       <Link>Screens\InstructionsScreen.cs</Link>
     </Compile>
-    <Compile Include="..\..\MacOS\CatapaultWars\Screens\MainMenuScreen.cs">
+    <Compile Include="Screens\MainMenuScreen.cs">
       <Link>Screens\MainMenuScreen.cs</Link>
     </Compile>
-    <Compile Include="..\..\MacOS\CatapaultWars\Screens\PauseScreen.cs">
+    <Compile Include="Screens\PauseScreen.cs">
       <Link>Screens\PauseScreen.cs</Link>
     </Compile>
-    <Compile Include="..\..\MacOS\CatapaultWars\Utility\Animation.cs">
+    <Compile Include="Utility\Animation.cs">
       <Link>Utility\Animation.cs</Link>
     </Compile>
-    <Compile Include="..\..\MacOS\CatapaultWars\Utility\AudioManager.cs">
+    <Compile Include="Utility\AudioManager.cs">
       <Link>Utility\AudioManager.cs</Link>
     </Compile>
   </ItemGroup>
@@ -126,7 +126,7 @@
       <Project>{565129E0-4EE5-4F6F-B403-C3484C9740BE}</Project>
       <Name>Lidgren.Network.Android</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\MonoGame.Framework\MonoGame.Framework.Android.csproj">
+    <ProjectReference Include="..\..\MonoGame.Framework\MonoGame.Framework.Android.csproj">
       <Project>{BA9476CF-99BA-4D03-92F2-73D2C5E58883}</Project>
       <Name>MonoGame.Framework.Android</Name>
     </ProjectReference>
@@ -159,133 +159,133 @@
     <Folder Include="Assets\Content\Textures\Catapults\Red\redPullback\" />
   </ItemGroup>
   <ItemGroup>
-    <AndroidAsset Include="..\..\MacOS\CatapaultWars\Content\Fonts\HUDFont.xnb">
+    <AndroidAsset Include="Content\Fonts\HUDFont.xnb">
       <Link>Assets\Content\Fonts\HUDFont.xnb</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </AndroidAsset>
-    <AndroidAsset Include="..\..\MacOS\CatapaultWars\Content\Fonts\MenuFont.xnb">
+    <AndroidAsset Include="Content\Fonts\MenuFont.xnb">
       <Link>Assets\Content\Fonts\MenuFont.xnb</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </AndroidAsset>
-    <AndroidAsset Include="..\..\MacOS\CatapaultWars\Content\Textures\Ammo\rock_ammo.xnb">
+    <AndroidAsset Include="Content\Textures\Ammo\rock_ammo.xnb">
       <Link>Assets\Content\Textures\Ammo\rock_ammo.xnb</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </AndroidAsset>
-    <AndroidAsset Include="..\..\MacOS\CatapaultWars\Content\Textures\Backgrounds\blank.xnb">
+    <AndroidAsset Include="Content\Textures\Backgrounds\blank.xnb">
       <Link>Assets\Content\Textures\Backgrounds\blank.xnb</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </AndroidAsset>
-    <AndroidAsset Include="..\..\MacOS\CatapaultWars\Content\Textures\Backgrounds\cloud1.xnb">
+    <AndroidAsset Include="Content\Textures\Backgrounds\cloud1.xnb">
       <Link>Assets\Content\Textures\Backgrounds\cloud1.xnb</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </AndroidAsset>
-    <AndroidAsset Include="..\..\MacOS\CatapaultWars\Content\Textures\Backgrounds\cloud2.xnb">
+    <AndroidAsset Include="Content\Textures\Backgrounds\cloud2.xnb">
       <Link>Assets\Content\Textures\Backgrounds\cloud2.xnb</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </AndroidAsset>
-    <AndroidAsset Include="..\..\MacOS\CatapaultWars\Content\Textures\Backgrounds\defeat.xnb">
+    <AndroidAsset Include="Content\Textures\Backgrounds\defeat.xnb">
       <Link>Assets\Content\Textures\Backgrounds\defeat.xnb</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </AndroidAsset>
-    <AndroidAsset Include="..\..\MacOS\CatapaultWars\Content\Textures\Backgrounds\gameplay_screen.xnb">
+    <AndroidAsset Include="Content\Textures\Backgrounds\gameplay_screen.xnb">
       <Link>Assets\Content\Textures\Backgrounds\gameplay_screen.xnb</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </AndroidAsset>
-    <AndroidAsset Include="..\..\MacOS\CatapaultWars\Content\Textures\Backgrounds\instructions.xnb">
+    <AndroidAsset Include="Content\Textures\Backgrounds\instructions.xnb">
       <Link>Assets\Content\Textures\Backgrounds\instructions.xnb</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </AndroidAsset>
-    <AndroidAsset Include="..\..\MacOS\CatapaultWars\Content\Textures\Backgrounds\mountain.xnb">
+    <AndroidAsset Include="Content\Textures\Backgrounds\mountain.xnb">
       <Link>Assets\Content\Textures\Backgrounds\mountain.xnb</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </AndroidAsset>
-    <AndroidAsset Include="..\..\MacOS\CatapaultWars\Content\Textures\Backgrounds\sky.xnb">
+    <AndroidAsset Include="Content\Textures\Backgrounds\sky.xnb">
       <Link>Assets\Content\Textures\Backgrounds\sky.xnb</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </AndroidAsset>
-    <AndroidAsset Include="..\..\MacOS\CatapaultWars\Content\Textures\Backgrounds\title_screen.xnb">
+    <AndroidAsset Include="Content\Textures\Backgrounds\title_screen.xnb">
       <Link>Assets\Content\Textures\Backgrounds\title_screen.xnb</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </AndroidAsset>
-    <AndroidAsset Include="..\..\MacOS\CatapaultWars\Content\Textures\Backgrounds\victory.xnb">
+    <AndroidAsset Include="Content\Textures\Backgrounds\victory.xnb">
       <Link>Assets\Content\Textures\Backgrounds\victory.xnb</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </AndroidAsset>
-    <AndroidAsset Include="..\..\MacOS\CatapaultWars\Content\Textures\HUD\ammoType.xnb">
+    <AndroidAsset Include="Content\Textures\HUD\ammoType.xnb">
       <Link>Assets\Content\Textures\HUD\ammoType.xnb</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </AndroidAsset>
-    <AndroidAsset Include="..\..\MacOS\CatapaultWars\Content\Textures\HUD\Arrow.xnb">
+    <AndroidAsset Include="Content\Textures\HUD\Arrow.xnb">
       <Link>Assets\Content\Textures\HUD\Arrow.xnb</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </AndroidAsset>
-    <AndroidAsset Include="..\..\MacOS\CatapaultWars\Content\Textures\HUD\hudBackground.xnb">
+    <AndroidAsset Include="Content\Textures\HUD\hudBackground.xnb">
       <Link>Assets\Content\Textures\HUD\hudBackground.xnb</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </AndroidAsset>
-    <AndroidAsset Include="..\..\MacOS\CatapaultWars\Content\Textures\HUD\windArrow.xnb">
+    <AndroidAsset Include="Content\Textures\HUD\windArrow.xnb">
       <Link>Assets\Content\Textures\HUD\windArrow.xnb</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </AndroidAsset>
-    <AndroidAsset Include="..\..\MacOS\CatapaultWars\Content\Textures\Catapults\AnimationsDef.xml">
+    <AndroidAsset Include="Content\Textures\Catapults\AnimationsDef.xml">
       <Link>Assets\Content\Textures\Catapults\AnimationsDef.xml</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </AndroidAsset>
-    <AndroidAsset Include="..\..\MacOS\CatapaultWars\Content\Textures\Catapults\Blue\blueDestroyed\blueCatapult_destroyed.xnb">
+    <AndroidAsset Include="Content\Textures\Catapults\Blue\blueDestroyed\blueCatapult_destroyed.xnb">
       <Link>Assets\Content\Textures\Catapults\Blue\blueDestroyed\blueCatapult_destroyed.xnb</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </AndroidAsset>
-    <AndroidAsset Include="..\..\MacOS\CatapaultWars\Content\Textures\Catapults\Blue\blueFire\blueCatapult_fire.xnb">
+    <AndroidAsset Include="Content\Textures\Catapults\Blue\blueFire\blueCatapult_fire.xnb">
       <Link>Assets\Content\Textures\Catapults\Blue\blueFire\blueCatapult_fire.xnb</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </AndroidAsset>
-    <AndroidAsset Include="..\..\MacOS\CatapaultWars\Content\Textures\Catapults\Blue\blueIdle\blueIdle.xnb">
+    <AndroidAsset Include="Content\Textures\Catapults\Blue\blueIdle\blueIdle.xnb">
       <Link>Assets\Content\Textures\Catapults\Blue\blueIdle\blueIdle.xnb</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </AndroidAsset>
-    <AndroidAsset Include="..\..\MacOS\CatapaultWars\Content\Textures\Catapults\Blue\bluePullback\blueCatapult_Pullback.xnb">
+    <AndroidAsset Include="Content\Textures\Catapults\Blue\bluePullback\blueCatapult_Pullback.xnb">
       <Link>Assets\Content\Textures\Catapults\Blue\bluePullback\blueCatapult_Pullback.xnb</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </AndroidAsset>
-    <AndroidAsset Include="..\..\MacOS\CatapaultWars\Content\Textures\Catapults\Red\redDestroyed\redCatapult_destroyed.xnb">
+    <AndroidAsset Include="Content\Textures\Catapults\Red\redDestroyed\redCatapult_destroyed.xnb">
       <Link>Assets\Content\Textures\Catapults\Red\redDestroyed\redCatapult_destroyed.xnb</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </AndroidAsset>
-    <AndroidAsset Include="..\..\MacOS\CatapaultWars\Content\Textures\Catapults\Red\redFire\redCatapult_fire.xnb">
+    <AndroidAsset Include="Content\Textures\Catapults\Red\redFire\redCatapult_fire.xnb">
       <Link>Assets\Content\Textures\Catapults\Red\redFire\redCatapult_fire.xnb</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </AndroidAsset>
-    <AndroidAsset Include="..\..\MacOS\CatapaultWars\Content\Textures\Catapults\Red\redIdle\redIdle.xnb">
+    <AndroidAsset Include="Content\Textures\Catapults\Red\redIdle\redIdle.xnb">
       <Link>Assets\Content\Textures\Catapults\Red\redIdle\redIdle.xnb</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </AndroidAsset>
-    <AndroidAsset Include="..\..\MacOS\CatapaultWars\Content\Textures\Catapults\Red\redPullback\redCatapult_Pullback.xnb">
+    <AndroidAsset Include="Content\Textures\Catapults\Red\redPullback\redCatapult_Pullback.xnb">
       <Link>Assets\Content\Textures\Catapults\Red\redPullback\redCatapult_Pullback.xnb</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </AndroidAsset>
-    <AndroidAsset Include="..\..\MacOS\CatapaultWars\Content\Sounds\BoulderHit.wav">
+    <AndroidAsset Include="Content\Sounds\BoulderHit.wav">
       <Link>Assets\Content\Sounds\BoulderHit.wav</Link>
     </AndroidAsset>
-    <AndroidAsset Include="..\..\MacOS\CatapaultWars\Content\Sounds\CatapultExplosion.wav">
+    <AndroidAsset Include="Content\Sounds\CatapultExplosion.wav">
       <Link>Assets\Content\Sounds\CatapultExplosion.wav</Link>
     </AndroidAsset>
-    <AndroidAsset Include="..\..\MacOS\CatapaultWars\Content\Sounds\CatapultFire.wav">
+    <AndroidAsset Include="Content\Sounds\CatapultFire.wav">
       <Link>Assets\Content\Sounds\CatapultFire.wav</Link>
     </AndroidAsset>
-    <AndroidAsset Include="..\..\MacOS\CatapaultWars\Content\Sounds\Lose.wav">
+    <AndroidAsset Include="Content\Sounds\Lose.wav">
       <Link>Assets\Content\Sounds\Lose.wav</Link>
     </AndroidAsset>
-    <AndroidAsset Include="..\..\MacOS\CatapaultWars\Content\Sounds\RopeStretch.wav">
+    <AndroidAsset Include="Content\Sounds\RopeStretch.wav">
       <Link>Assets\Content\Sounds\RopeStretch.wav</Link>
     </AndroidAsset>
-    <AndroidAsset Include="..\..\MacOS\CatapaultWars\Content\Sounds\Win.wav">
+    <AndroidAsset Include="Content\Sounds\Win.wav">
       <Link>Assets\Content\Sounds\Win.wav</Link>
     </AndroidAsset>
-    <AndroidAsset Include="..\..\MacOS\CatapaultWars\Content\Textures\Catapults\Fire_Miss\fire_miss.xnb">
+    <AndroidAsset Include="Content\Textures\Catapults\Fire_Miss\fire_miss.xnb">
       <Link>Assets\Content\Textures\Catapults\Fire_Miss\fire_miss.xnb</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </AndroidAsset>
-    <AndroidAsset Include="..\..\MacOS\CatapaultWars\Content\Textures\Catapults\Hit_Smoke\smoke.xnb">
+    <AndroidAsset Include="Content\Textures\Catapults\Hit_Smoke\smoke.xnb">
       <Link>Assets\Content\Textures\Catapults\Hit_Smoke\smoke.xnb</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </AndroidAsset>

+ 57 - 57
CatapaultWars/MonoGame.Samples.CatapultWars.iOS.csproj

@@ -65,181 +65,181 @@
     <Reference Include="System.Xml.Linq" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="Info.plist" />
-    <None Include="..\..\MacOS\CatapaultWars\Content\Fonts\HUDFont.xnb">
+    <None Include="Info.iOS.plist"><Link>Info.plist</Link></None>
+    <None Include="Content\Fonts\HUDFont.xnb">
       <Link>Content\Fonts\HUDFont.xnb</Link>
     </None>
-    <None Include="..\..\MacOS\CatapaultWars\Content\Fonts\MenuFont.xnb">
+    <None Include="Content\Fonts\MenuFont.xnb">
       <Link>Content\Fonts\MenuFont.xnb</Link>
     </None>
-    <None Include="..\..\MacOS\CatapaultWars\Content\Sounds\BoulderHit.xnb">
+    <None Include="Content\Sounds\BoulderHit.xnb">
       <Link>Content\Sounds\BoulderHit.xnb</Link>
     </None>
-    <None Include="..\..\MacOS\CatapaultWars\Content\Sounds\CatapultExplosion.xnb">
+    <None Include="Content\Sounds\CatapultExplosion.xnb">
       <Link>Content\Sounds\CatapultExplosion.xnb</Link>
     </None>
-    <None Include="..\..\MacOS\CatapaultWars\Content\Sounds\CatapultFire.xnb">
+    <None Include="Content\Sounds\CatapultFire.xnb">
       <Link>Content\Sounds\CatapultFire.xnb</Link>
     </None>
-    <None Include="..\..\MacOS\CatapaultWars\Content\Sounds\Lose.xnb">
+    <None Include="Content\Sounds\Lose.xnb">
       <Link>Content\Sounds\Lose.xnb</Link>
     </None>
-    <None Include="..\..\MacOS\CatapaultWars\Content\Sounds\RopeStretch.xnb">
+    <None Include="Content\Sounds\RopeStretch.xnb">
       <Link>Content\Sounds\RopeStretch.xnb</Link>
     </None>
-    <None Include="..\..\MacOS\CatapaultWars\Content\Sounds\Win.xnb">
+    <None Include="Content\Sounds\Win.xnb">
       <Link>Content\Sounds\Win.xnb</Link>
     </None>
-    <None Include="..\..\MacOS\CatapaultWars\Content\Textures\Ammo\rock_ammo.xnb">
+    <None Include="Content\Textures\Ammo\rock_ammo.xnb">
       <Link>Content\Textures\Ammo\rock_ammo.xnb</Link>
     </None>
-    <None Include="..\..\MacOS\CatapaultWars\Content\Textures\Catapults\AnimationsDef.xml">
+    <None Include="Content\Textures\Catapults\AnimationsDef.xml">
       <Link>Content\Textures\Catapults\AnimationsDef.xml</Link>
     </None>
-    <None Include="..\..\MacOS\CatapaultWars\Content\Textures\Catapults\Blue\blueDestroyed\blueCatapult_destroyed.xnb">
+    <None Include="Content\Textures\Catapults\Blue\blueDestroyed\blueCatapult_destroyed.xnb">
       <Link>Content\Textures\Catapults\Blue\blueDestroyed\blueCatapult_destroyed.xnb</Link>
     </None>
-    <None Include="..\..\MacOS\CatapaultWars\Content\Textures\Catapults\Blue\blueFire\blueCatapult_fire.xnb">
+    <None Include="Content\Textures\Catapults\Blue\blueFire\blueCatapult_fire.xnb">
       <Link>Content\Textures\Catapults\Blue\blueFire\blueCatapult_fire.xnb</Link>
     </None>
-    <None Include="..\..\MacOS\CatapaultWars\Content\Textures\Catapults\Blue\blueIdle\blueIdle.xnb">
+    <None Include="Content\Textures\Catapults\Blue\blueIdle\blueIdle.xnb">
       <Link>Content\Textures\Catapults\Blue\blueIdle\blueIdle.xnb</Link>
     </None>
-    <None Include="..\..\MacOS\CatapaultWars\Content\Textures\Catapults\Blue\bluePullback\blueCatapult_Pullback.xnb">
+    <None Include="Content\Textures\Catapults\Blue\bluePullback\blueCatapult_Pullback.xnb">
       <Link>Content\Textures\Catapults\Blue\bluePullback\blueCatapult_Pullback.xnb</Link>
     </None>
-    <None Include="..\..\MacOS\CatapaultWars\Content\Textures\Catapults\Fire_Miss\fire_miss.xnb">
+    <None Include="Content\Textures\Catapults\Fire_Miss\fire_miss.xnb">
       <Link>Content\Textures\Catapults\Fire_Miss\fire_miss.xnb</Link>
     </None>
-    <None Include="..\..\MacOS\CatapaultWars\Content\Textures\Catapults\Hit_Smoke\smoke.xnb">
+    <None Include="Content\Textures\Catapults\Hit_Smoke\smoke.xnb">
       <Link>Content\Textures\Catapults\Hit_Smoke\smoke.xnb</Link>
     </None>
-    <None Include="..\..\MacOS\CatapaultWars\Content\Textures\Catapults\Red\redDestroyed\redCatapult_destroyed.xnb">
+    <None Include="Content\Textures\Catapults\Red\redDestroyed\redCatapult_destroyed.xnb">
       <Link>Content\Textures\Catapults\Red\redDestroyed\redCatapult_destroyed.xnb</Link>
     </None>
-    <None Include="..\..\MacOS\CatapaultWars\Content\Textures\Catapults\Red\redFire\redCatapult_fire.xnb">
+    <None Include="Content\Textures\Catapults\Red\redFire\redCatapult_fire.xnb">
       <Link>Content\Textures\Catapults\Red\redFire\redCatapult_fire.xnb</Link>
     </None>
-    <None Include="..\..\MacOS\CatapaultWars\Content\Textures\Catapults\Red\redIdle\redIdle.xnb">
+    <None Include="Content\Textures\Catapults\Red\redIdle\redIdle.xnb">
       <Link>Content\Textures\Catapults\Red\redIdle\redIdle.xnb</Link>
     </None>
-    <None Include="..\..\MacOS\CatapaultWars\Content\Textures\Catapults\Red\redPullback\redCatapult_Pullback.xnb">
+    <None Include="Content\Textures\Catapults\Red\redPullback\redCatapult_Pullback.xnb">
       <Link>Content\Textures\Catapults\Red\redPullback\redCatapult_Pullback.xnb</Link>
     </None>
-    <None Include="..\..\MacOS\CatapaultWars\Content\Textures\HUD\Arrow.xnb">
+    <None Include="Content\Textures\HUD\Arrow.xnb">
       <Link>Content\Textures\HUD\Arrow.xnb</Link>
     </None>
-    <None Include="..\..\MacOS\CatapaultWars\Content\Textures\HUD\ammoType.xnb">
+    <None Include="Content\Textures\HUD\ammoType.xnb">
       <Link>Content\Textures\HUD\ammoType.xnb</Link>
     </None>
-    <None Include="..\..\MacOS\CatapaultWars\Content\Textures\HUD\hudBackground.xnb">
+    <None Include="Content\Textures\HUD\hudBackground.xnb">
       <Link>Content\Textures\HUD\hudBackground.xnb</Link>
     </None>
-    <None Include="..\..\MacOS\CatapaultWars\Content\Textures\HUD\windArrow.xnb">
+    <None Include="Content\Textures\HUD\windArrow.xnb">
       <Link>Content\Textures\HUD\windArrow.xnb</Link>
     </None>
   </ItemGroup>
   <ItemGroup>
     <Compile Include="Main.cs" />
-    <Compile Include="..\..\MacOS\CatapaultWars\CatapultGame.cs">
+    <Compile Include="CatapultGame.cs">
       <Link>CatapultGame.cs</Link>
     </Compile>
-    <Compile Include="..\..\MacOS\CatapaultWars\Catapult\Catapult.cs">
+    <Compile Include="Catapult\Catapult.cs">
       <Link>Catapult\Catapult.cs</Link>
     </Compile>
-    <Compile Include="..\..\MacOS\CatapaultWars\Catapult\Projectile.cs">
+    <Compile Include="Catapult\Projectile.cs">
       <Link>Catapult\Projectile.cs</Link>
     </Compile>
-    <Compile Include="..\..\MacOS\CatapaultWars\Players\AI.cs">
+    <Compile Include="Players\AI.cs">
       <Link>Players\AI.cs</Link>
     </Compile>
-    <Compile Include="..\..\MacOS\CatapaultWars\Players\Human.cs">
+    <Compile Include="Players\Human.cs">
       <Link>Players\Human.cs</Link>
     </Compile>
-    <Compile Include="..\..\MacOS\CatapaultWars\Players\Player.cs">
+    <Compile Include="Players\Player.cs">
       <Link>Players\Player.cs</Link>
     </Compile>
-    <Compile Include="..\..\MacOS\CatapaultWars\ScreenManager\GameScreen.cs">
+    <Compile Include="ScreenManager\GameScreen.cs">
       <Link>ScreenManager\GameScreen.cs</Link>
     </Compile>
-    <Compile Include="..\..\MacOS\CatapaultWars\ScreenManager\InputState.cs">
+    <Compile Include="ScreenManager\InputState.cs">
       <Link>ScreenManager\InputState.cs</Link>
     </Compile>
-    <Compile Include="..\..\MacOS\CatapaultWars\ScreenManager\MenuEntry.cs">
+    <Compile Include="ScreenManager\MenuEntry.cs">
       <Link>ScreenManager\MenuEntry.cs</Link>
     </Compile>
-    <Compile Include="..\..\MacOS\CatapaultWars\ScreenManager\MenuScreen.cs">
+    <Compile Include="ScreenManager\MenuScreen.cs">
       <Link>ScreenManager\MenuScreen.cs</Link>
     </Compile>
-    <Compile Include="..\..\MacOS\CatapaultWars\ScreenManager\MouseGestureType.cs">
+    <Compile Include="ScreenManager\MouseGestureType.cs">
       <Link>ScreenManager\MouseGestureType.cs</Link>
     </Compile>
-    <Compile Include="..\..\MacOS\CatapaultWars\ScreenManager\PlayerIndexEventArgs.cs">
+    <Compile Include="ScreenManager\PlayerIndexEventArgs.cs">
       <Link>ScreenManager\PlayerIndexEventArgs.cs</Link>
     </Compile>
-    <Compile Include="..\..\MacOS\CatapaultWars\ScreenManager\ScreenManager.cs">
+    <Compile Include="ScreenManager\ScreenManager.cs">
       <Link>ScreenManager\ScreenManager.cs</Link>
     </Compile>
-    <Compile Include="..\..\MacOS\CatapaultWars\Screens\BackgroundScreen.cs">
+    <Compile Include="Screens\BackgroundScreen.cs">
       <Link>Screens\BackgroundScreen.cs</Link>
     </Compile>
-    <Compile Include="..\..\MacOS\CatapaultWars\Screens\GameplayScreen.cs">
+    <Compile Include="Screens\GameplayScreen.cs">
       <Link>Screens\GameplayScreen.cs</Link>
     </Compile>
-    <Compile Include="..\..\MacOS\CatapaultWars\Screens\InstructionsScreen.cs">
+    <Compile Include="Screens\InstructionsScreen.cs">
       <Link>Screens\InstructionsScreen.cs</Link>
     </Compile>
-    <Compile Include="..\..\MacOS\CatapaultWars\Screens\MainMenuScreen.cs">
+    <Compile Include="Screens\MainMenuScreen.cs">
       <Link>Screens\MainMenuScreen.cs</Link>
     </Compile>
-    <Compile Include="..\..\MacOS\CatapaultWars\Screens\PauseScreen.cs">
+    <Compile Include="Screens\PauseScreen.cs">
       <Link>Screens\PauseScreen.cs</Link>
     </Compile>
-    <Compile Include="..\..\MacOS\CatapaultWars\Utility\Animation.cs">
+    <Compile Include="Utility\Animation.cs">
       <Link>Utility\Animation.cs</Link>
     </Compile>
-    <Compile Include="..\..\MacOS\CatapaultWars\Utility\AudioManager.cs">
+    <Compile Include="Utility\AudioManager.cs">
       <Link>Utility\AudioManager.cs</Link>
     </Compile>
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <ItemGroup>
-    <Content Include="..\..\MacOS\CatapaultWars\Background.png">
+    <Content Include="Background.png">
       <Link>Background.png</Link>
     </Content>
-    <Content Include="..\..\MacOS\CatapaultWars\Content\Textures\Backgrounds\blank.xnb">
+    <Content Include="Content\Textures\Backgrounds\blank.xnb">
       <Link>Content\Textures\Backgrounds\blank.xnb</Link>
     </Content>
-    <Content Include="..\..\MacOS\CatapaultWars\Content\Textures\Backgrounds\cloud1.xnb">
+    <Content Include="Content\Textures\Backgrounds\cloud1.xnb">
       <Link>Content\Textures\Backgrounds\cloud1.xnb</Link>
     </Content>
-    <Content Include="..\..\MacOS\CatapaultWars\Content\Textures\Backgrounds\cloud2.xnb">
+    <Content Include="Content\Textures\Backgrounds\cloud2.xnb">
       <Link>Content\Textures\Backgrounds\cloud2.xnb</Link>
     </Content>
-    <Content Include="..\..\MacOS\CatapaultWars\Content\Textures\Backgrounds\defeat.xnb">
+    <Content Include="Content\Textures\Backgrounds\defeat.xnb">
       <Link>Content\Textures\Backgrounds\defeat.xnb</Link>
     </Content>
-    <Content Include="..\..\MacOS\CatapaultWars\Content\Textures\Backgrounds\gameplay_screen.xnb">
+    <Content Include="Content\Textures\Backgrounds\gameplay_screen.xnb">
       <Link>Content\Textures\Backgrounds\gameplay_screen.xnb</Link>
     </Content>
-    <Content Include="..\..\MacOS\CatapaultWars\Content\Textures\Backgrounds\instructions.xnb">
+    <Content Include="Content\Textures\Backgrounds\instructions.xnb">
       <Link>Content\Textures\Backgrounds\instructions.xnb</Link>
     </Content>
-    <Content Include="..\..\MacOS\CatapaultWars\Content\Textures\Backgrounds\mountain.xnb">
+    <Content Include="Content\Textures\Backgrounds\mountain.xnb">
       <Link>Content\Textures\Backgrounds\mountain.xnb</Link>
     </Content>
-    <Content Include="..\..\MacOS\CatapaultWars\Content\Textures\Backgrounds\sky.xnb">
+    <Content Include="Content\Textures\Backgrounds\sky.xnb">
       <Link>Content\Textures\Backgrounds\sky.xnb</Link>
     </Content>
-    <Content Include="..\..\MacOS\CatapaultWars\Content\Textures\Backgrounds\title_screen.xnb">
+    <Content Include="Content\Textures\Backgrounds\title_screen.xnb">
       <Link>Content\Textures\Backgrounds\title_screen.xnb</Link>
     </Content>
-    <Content Include="..\..\MacOS\CatapaultWars\Content\Textures\Backgrounds\victory.xnb">
+    <Content Include="Content\Textures\Backgrounds\victory.xnb">
       <Link>Content\Textures\Backgrounds\victory.xnb</Link>
     </Content>
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\..\MonoGame.Framework\MonoGame.Framework.iOS.csproj">
+    <ProjectReference Include="..\..\MonoGame.Framework\MonoGame.Framework.iOS.csproj">
       <Project>{DB8508BB-9849-4CC2-BC0F-8EB5DACB3C47}</Project>
       <Name>MonoGame.Framework.iOS</Name>
     </ProjectReference>

+ 1 - 1
CatapaultWars/Players/Human.cs

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

+ 75 - 75
CatapultNetWars/CatapaultNetWars.Linux.csproj

@@ -44,103 +44,103 @@
   </ItemGroup>
   <ItemGroup>
     <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="..\..\MacOS\CatapultNetWars\CatapultGame.cs">
+    <Compile Include="CatapultGame.cs">
       <Link>CatapultGame.cs</Link>
     </Compile>
-    <Compile Include="..\..\MacOS\CatapultNetWars\Utility\Animation.cs">
+    <Compile Include="Utility\Animation.cs">
       <Link>Utility\Animation.cs</Link>
     </Compile>
-    <Compile Include="..\..\MacOS\CatapultNetWars\Utility\AudioManager.cs">
+    <Compile Include="Utility\AudioManager.cs">
       <Link>Utility\AudioManager.cs</Link>
     </Compile>
-    <Compile Include="..\..\MacOS\CatapultNetWars\Screens\BackgroundScreen.cs">
+    <Compile Include="Screens\BackgroundScreen.cs">
       <Link>Screens\BackgroundScreen.cs</Link>
     </Compile>
-    <Compile Include="..\..\MacOS\CatapultNetWars\Screens\GameplayScreen.cs">
+    <Compile Include="Screens\GameplayScreen.cs">
       <Link>Screens\GameplayScreen.cs</Link>
     </Compile>
-    <Compile Include="..\..\MacOS\CatapultNetWars\Screens\InstructionsScreen.cs">
+    <Compile Include="Screens\InstructionsScreen.cs">
       <Link>Screens\InstructionsScreen.cs</Link>
     </Compile>
-    <Compile Include="..\..\MacOS\CatapultNetWars\Screens\LoadingScreen.cs">
+    <Compile Include="Screens\LoadingScreen.cs">
       <Link>Screens\LoadingScreen.cs</Link>
     </Compile>
-    <Compile Include="..\..\MacOS\CatapultNetWars\Screens\MainMenuScreen.cs">
+    <Compile Include="Screens\MainMenuScreen.cs">
       <Link>Screens\MainMenuScreen.cs</Link>
     </Compile>
-    <Compile Include="..\..\MacOS\CatapultNetWars\Screens\MessageBoxScreen.cs">
+    <Compile Include="Screens\MessageBoxScreen.cs">
       <Link>Screens\MessageBoxScreen.cs</Link>
     </Compile>
-    <Compile Include="..\..\MacOS\CatapultNetWars\Screens\PauseScreen.cs">
+    <Compile Include="Screens\PauseScreen.cs">
       <Link>Screens\PauseScreen.cs</Link>
     </Compile>
-    <Compile Include="..\..\MacOS\CatapultNetWars\ScreenManager\GameScreen.cs">
+    <Compile Include="ScreenManager\GameScreen.cs">
       <Link>ScreenManager\GameScreen.cs</Link>
     </Compile>
-    <Compile Include="..\..\MacOS\CatapultNetWars\ScreenManager\InputState.cs">
+    <Compile Include="ScreenManager\InputState.cs">
       <Link>ScreenManager\InputState.cs</Link>
     </Compile>
-    <Compile Include="..\..\MacOS\CatapultNetWars\ScreenManager\MenuEntry.cs">
+    <Compile Include="ScreenManager\MenuEntry.cs">
       <Link>ScreenManager\MenuEntry.cs</Link>
     </Compile>
-    <Compile Include="..\..\MacOS\CatapultNetWars\ScreenManager\MenuScreen.cs">
+    <Compile Include="ScreenManager\MenuScreen.cs">
       <Link>ScreenManager\MenuScreen.cs</Link>
     </Compile>
-    <Compile Include="..\..\MacOS\CatapultNetWars\ScreenManager\MouseGestureType.cs">
+    <Compile Include="ScreenManager\MouseGestureType.cs">
       <Link>ScreenManager\MouseGestureType.cs</Link>
     </Compile>
-    <Compile Include="..\..\MacOS\CatapultNetWars\ScreenManager\PlayerIndexEventArgs.cs">
+    <Compile Include="ScreenManager\PlayerIndexEventArgs.cs">
       <Link>ScreenManager\PlayerIndexEventArgs.cs</Link>
     </Compile>
-    <Compile Include="..\..\MacOS\CatapultNetWars\ScreenManager\ScreenManager.cs">
+    <Compile Include="ScreenManager\ScreenManager.cs">
       <Link>ScreenManager\ScreenManager.cs</Link>
     </Compile>
-    <Compile Include="..\..\MacOS\CatapultNetWars\Players\AI.cs">
+    <Compile Include="Players\AI.cs">
       <Link>Players\AI.cs</Link>
     </Compile>
-    <Compile Include="..\..\MacOS\CatapultNetWars\Players\Human.cs">
+    <Compile Include="Players\Human.cs">
       <Link>Players\Human.cs</Link>
     </Compile>
-    <Compile Include="..\..\MacOS\CatapultNetWars\Players\Player.cs">
+    <Compile Include="Players\Player.cs">
       <Link>Players\Player.cs</Link>
     </Compile>
-    <Compile Include="..\..\MacOS\CatapultNetWars\Networking\AvailableSessionMenuEntry.cs">
+    <Compile Include="Networking\AvailableSessionMenuEntry.cs">
       <Link>Networking\AvailableSessionMenuEntry.cs</Link>
     </Compile>
-    <Compile Include="..\..\MacOS\CatapultNetWars\Networking\CreateOrFindSessionScreen.cs">
+    <Compile Include="Networking\CreateOrFindSessionScreen.cs">
       <Link>Networking\CreateOrFindSessionScreen.cs</Link>
     </Compile>
-    <Compile Include="..\..\MacOS\CatapultNetWars\Networking\JoinSessionScreen.cs">
+    <Compile Include="Networking\JoinSessionScreen.cs">
       <Link>Networking\JoinSessionScreen.cs</Link>
     </Compile>
-    <Compile Include="..\..\MacOS\CatapultNetWars\Networking\LobbyScreen.cs">
+    <Compile Include="Networking\LobbyScreen.cs">
       <Link>Networking\LobbyScreen.cs</Link>
     </Compile>
-    <Compile Include="..\..\MacOS\CatapultNetWars\Networking\NetworkBusyScreen.cs">
+    <Compile Include="Networking\NetworkBusyScreen.cs">
       <Link>Networking\NetworkBusyScreen.cs</Link>
     </Compile>
-    <Compile Include="..\..\MacOS\CatapultNetWars\Networking\NetworkErrorScreen.cs">
+    <Compile Include="Networking\NetworkErrorScreen.cs">
       <Link>Networking\NetworkErrorScreen.cs</Link>
     </Compile>
-    <Compile Include="..\..\MacOS\CatapultNetWars\Networking\NetworkSessionComponent.cs">
+    <Compile Include="Networking\NetworkSessionComponent.cs">
       <Link>Networking\NetworkSessionComponent.cs</Link>
     </Compile>
-    <Compile Include="..\..\MacOS\CatapultNetWars\Networking\OperationCompletedEventArgs.cs">
+    <Compile Include="Networking\OperationCompletedEventArgs.cs">
       <Link>Networking\OperationCompletedEventArgs.cs</Link>
     </Compile>
-    <Compile Include="..\..\MacOS\CatapultNetWars\Networking\ProfileSignInScreen.cs">
+    <Compile Include="Networking\ProfileSignInScreen.cs">
       <Link>Networking\ProfileSignInScreen.cs</Link>
     </Compile>
-    <Compile Include="..\..\MacOS\CatapultNetWars\Catapult\Catapult.cs">
+    <Compile Include="Catapult\Catapult.cs">
       <Link>Catapult\Catapult.cs</Link>
     </Compile>
-    <Compile Include="..\..\MacOS\CatapultNetWars\Catapult\Projectile.cs">
+    <Compile Include="Catapult\Projectile.cs">
       <Link>Catapult\Projectile.cs</Link>
     </Compile>
-    <Compile Include="..\..\MacOS\CatapultNetWars\IMessageDisplay.cs">
+    <Compile Include="IMessageDisplay.cs">
       <Link>IMessageDisplay.cs</Link>
     </Compile>
-    <Compile Include="..\..\MacOS\CatapultNetWars\MessageDisplayComponent.cs">
+    <Compile Include="MessageDisplayComponent.cs">
       <Link>MessageDisplayComponent.cs</Link>
     </Compile>
     <Compile Include="Program.cs" />
@@ -151,129 +151,129 @@
     </Compile>
   </ItemGroup>
   <ItemGroup>
-    <Content Include="..\..\MacOS\CatapultNetWars\Content\Fonts\HUDFont.xnb">
+    <Content Include="Content\Fonts\HUDFont.xnb">
       <Link>Content\Fonts\HUDFont.xnb</Link><CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="..\..\MacOS\CatapultNetWars\Content\Fonts\MenuFont.xnb">
+    <Content Include="Content\Fonts\MenuFont.xnb">
       <Link>Content\Fonts\MenuFont.xnb</Link><CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="..\..\MacOS\CatapaultWars\Content\Sounds\BoulderHit.wav">
+    <Content Include="Content\Sounds\BoulderHit.wav">
       <Link>Content\Sounds\BoulderHit.wav</Link><CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="..\..\MacOS\CatapaultWars\Content\Sounds\CatapultExplosion.wav">
+    <Content Include="Content\Sounds\CatapultExplosion.wav">
       <Link>Content\Sounds\CatapultExplosion.wav</Link><CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="..\..\MacOS\CatapaultWars\Content\Sounds\CatapultFire.wav">
+    <Content Include="Content\Sounds\CatapultFire.wav">
       <Link>Content\Sounds\CatapultFire.wav</Link><CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="..\..\MacOS\CatapaultWars\Content\Sounds\Lose.wav">
+    <Content Include="Content\Sounds\Lose.wav">
       <Link>Content\Sounds\Lose.wav</Link><CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="..\..\MacOS\CatapaultWars\Content\Sounds\RopeStretch.wav">
+    <Content Include="Content\Sounds\RopeStretch.wav">
       <Link>Content\Sounds\RopeStretch.wav</Link><CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="..\..\MacOS\CatapaultWars\Content\Sounds\Win.wav">
+    <Content Include="Content\Sounds\Win.wav">
       <Link>Content\Sounds\Win.wav</Link><CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="..\..\MacOS\CatapultNetWars\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>
     </Content>
-    <Content Include="..\..\MacOS\CatapultNetWars\Content\Textures\Backgrounds\blank.xnb">
+    <Content Include="Content\Textures\Backgrounds\blank.xnb">
       <Link>Content\Textures\Backgrounds\blank.xnb</Link><CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="..\..\MacOS\CatapultNetWars\Content\Textures\Backgrounds\cloud1.xnb">
+    <Content Include="Content\Textures\Backgrounds\cloud1.xnb">
       <Link>Content\Textures\Backgrounds\cloud1.xnb</Link><CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="..\..\MacOS\CatapultNetWars\Content\Textures\Backgrounds\cloud2.xnb">
+    <Content Include="Content\Textures\Backgrounds\cloud2.xnb">
       <Link>Content\Textures\Backgrounds\cloud2.xnb</Link><CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="..\..\MacOS\CatapultNetWars\Content\Textures\Backgrounds\defeat.xnb">
+    <Content Include="Content\Textures\Backgrounds\defeat.xnb">
       <Link>Content\Textures\Backgrounds\defeat.xnb</Link><CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="..\..\MacOS\CatapultNetWars\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>
     </Content>
-    <Content Include="..\..\MacOS\CatapultNetWars\Content\Textures\Backgrounds\instructions.xnb">
+    <Content Include="Content\Textures\Backgrounds\instructions.xnb">
       <Link>Content\Textures\Backgrounds\instructions.xnb</Link><CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="..\..\MacOS\CatapultNetWars\Content\Textures\Backgrounds\mountain.xnb">
+    <Content Include="Content\Textures\Backgrounds\mountain.xnb">
       <Link>Content\Textures\Backgrounds\mountain.xnb</Link><CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="..\..\MacOS\CatapultNetWars\Content\Textures\Backgrounds\sky.xnb">
+    <Content Include="Content\Textures\Backgrounds\sky.xnb">
       <Link>Content\Textures\Backgrounds\sky.xnb</Link><CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="..\..\MacOS\CatapultNetWars\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>
     </Content>
-    <Content Include="..\..\MacOS\CatapultNetWars\Content\Textures\Backgrounds\victory.xnb">
+    <Content Include="Content\Textures\Backgrounds\victory.xnb">
       <Link>Content\Textures\Backgrounds\victory.xnb</Link><CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="..\..\MacOS\CatapultNetWars\Content\Textures\HUD\ammoType.xnb">
+    <Content Include="Content\Textures\HUD\ammoType.xnb">
       <Link>Content\Textures\HUD\ammoType.xnb</Link><CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="..\..\MacOS\CatapultNetWars\Content\Textures\HUD\Arrow.xnb">
+    <Content Include="Content\Textures\HUD\Arrow.xnb">
       <Link>Content\Textures\HUD\Arrow.xnb</Link><CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="..\..\MacOS\CatapultNetWars\Content\Textures\HUD\hudBackground.xnb">
+    <Content Include="Content\Textures\HUD\hudBackground.xnb">
       <Link>Content\Textures\HUD\hudBackground.xnb</Link><CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="..\..\MacOS\CatapultNetWars\Content\Textures\HUD\windArrow.xnb">
+    <Content Include="Content\Textures\HUD\windArrow.xnb">
       <Link>Content\Textures\HUD\windArrow.xnb</Link><CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="..\..\MacOS\CatapultNetWars\Content\Textures\Catapults\AnimationsDef.xml">
+    <Content Include="Content\Textures\Catapults\AnimationsDef.xml">
       <Link>Content\Textures\Catapults\AnimationsDef.xml</Link><CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="..\..\MacOS\CatapultNetWars\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>
     </Content>
-    <Content Include="..\..\MacOS\CatapultNetWars\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>
     </Content>
-    <Content Include="..\..\MacOS\CatapultNetWars\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>
     </Content>
-    <Content Include="..\..\MacOS\CatapultNetWars\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>
     </Content>
-    <Content Include="..\..\MacOS\CatapultNetWars\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>
     </Content>
-    <Content Include="..\..\MacOS\CatapultNetWars\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>
     </Content>
-    <Content Include="..\..\MacOS\CatapultNetWars\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>
     </Content>
-    <Content Include="..\..\MacOS\CatapultNetWars\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>
     </Content>
-    <Content Include="..\..\MacOS\CatapultNetWars\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>
     </Content>
-    <Content Include="..\..\MacOS\CatapultNetWars\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>
     </Content>
-    <Content Include="..\..\MacOS\CatapultNetWars\Content\cat.xnb">
+    <Content Include="Content\cat.xnb">
       <Link>Content\cat.xnb</Link><CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="..\..\MacOS\CatapultNetWars\Content\chat_able.xnb">
+    <Content Include="Content\chat_able.xnb">
       <Link>Content\chat_able.xnb</Link><CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="..\..\MacOS\CatapultNetWars\Content\chat_mute.xnb">
+    <Content Include="Content\chat_mute.xnb">
       <Link>Content\chat_mute.xnb</Link><CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="..\..\MacOS\CatapultNetWars\Content\chat_ready.xnb">
+    <Content Include="Content\chat_ready.xnb">
       <Link>Content\chat_ready.xnb</Link><CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="..\..\MacOS\CatapultNetWars\Content\chat_talking.xnb">
+    <Content Include="Content\chat_talking.xnb">
       <Link>Content\chat_talking.xnb</Link><CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="..\..\MacOS\CatapultNetWars\Content\gradient.xnb">
+    <Content Include="Content\gradient.xnb">
       <Link>Content\gradient.xnb</Link><CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
   </ItemGroup>
   <ItemGroup>
-    <Content Include="..\..\MacOS\\CatapultNetWars\Content\Textures\Catapults\AnimationsDef.xml">
+    <Content Include="Content\Textures\Catapults\AnimationsDef.xml">
       <Link>Content\Textures\Catapults\AnimationsDef.xml</Link><CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
   </ItemGroup>
@@ -284,7 +284,7 @@
     </EmbeddedResource>
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\..\MonoGame.Framework\MonoGame.Framework.Linux.csproj">
+    <ProjectReference Include="..\..\MonoGame.Framework\MonoGame.Framework.Linux.csproj">
       <Project>{35253CE1-C864-4CD3-8249-4D1319748E8F}</Project>
       <Name>MonoGame.Framework.Linux</Name>
     </ProjectReference>

+ 74 - 74
CatapultNetWars/CatapaultNetWars.Windows.csproj

@@ -44,103 +44,103 @@
   </ItemGroup>
   <ItemGroup>
     <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="..\..\MacOS\CatapultNetWars\CatapultGame.cs">
+    <Compile Include="CatapultGame.cs">
       <Link>CatapultGame.cs</Link>
     </Compile>
-    <Compile Include="..\..\MacOS\CatapultNetWars\Utility\Animation.cs">
+    <Compile Include="Utility\Animation.cs">
       <Link>Utility\Animation.cs</Link>
     </Compile>
-    <Compile Include="..\..\MacOS\CatapultNetWars\Utility\AudioManager.cs">
+    <Compile Include="Utility\AudioManager.cs">
       <Link>Utility\AudioManager.cs</Link>
     </Compile>
-    <Compile Include="..\..\MacOS\CatapultNetWars\Screens\BackgroundScreen.cs">
+    <Compile Include="Screens\BackgroundScreen.cs">
       <Link>Screens\BackgroundScreen.cs</Link>
     </Compile>
-    <Compile Include="..\..\MacOS\CatapultNetWars\Screens\GameplayScreen.cs">
+    <Compile Include="Screens\GameplayScreen.cs">
       <Link>Screens\GameplayScreen.cs</Link>
     </Compile>
-    <Compile Include="..\..\MacOS\CatapultNetWars\Screens\InstructionsScreen.cs">
+    <Compile Include="Screens\InstructionsScreen.cs">
       <Link>Screens\InstructionsScreen.cs</Link>
     </Compile>
-    <Compile Include="..\..\MacOS\CatapultNetWars\Screens\LoadingScreen.cs">
+    <Compile Include="Screens\LoadingScreen.cs">
       <Link>Screens\LoadingScreen.cs</Link>
     </Compile>
-    <Compile Include="..\..\MacOS\CatapultNetWars\Screens\MainMenuScreen.cs">
+    <Compile Include="Screens\MainMenuScreen.cs">
       <Link>Screens\MainMenuScreen.cs</Link>
     </Compile>
-    <Compile Include="..\..\MacOS\CatapultNetWars\Screens\MessageBoxScreen.cs">
+    <Compile Include="Screens\MessageBoxScreen.cs">
       <Link>Screens\MessageBoxScreen.cs</Link>
     </Compile>
-    <Compile Include="..\..\MacOS\CatapultNetWars\Screens\PauseScreen.cs">
+    <Compile Include="Screens\PauseScreen.cs">
       <Link>Screens\PauseScreen.cs</Link>
     </Compile>
-    <Compile Include="..\..\MacOS\CatapultNetWars\ScreenManager\GameScreen.cs">
+    <Compile Include="ScreenManager\GameScreen.cs">
       <Link>ScreenManager\GameScreen.cs</Link>
     </Compile>
-    <Compile Include="..\..\MacOS\CatapultNetWars\ScreenManager\InputState.cs">
+    <Compile Include="ScreenManager\InputState.cs">
       <Link>ScreenManager\InputState.cs</Link>
     </Compile>
-    <Compile Include="..\..\MacOS\CatapultNetWars\ScreenManager\MenuEntry.cs">
+    <Compile Include="ScreenManager\MenuEntry.cs">
       <Link>ScreenManager\MenuEntry.cs</Link>
     </Compile>
-    <Compile Include="..\..\MacOS\CatapultNetWars\ScreenManager\MenuScreen.cs">
+    <Compile Include="ScreenManager\MenuScreen.cs">
       <Link>ScreenManager\MenuScreen.cs</Link>
     </Compile>
-    <Compile Include="..\..\MacOS\CatapultNetWars\ScreenManager\MouseGestureType.cs">
+    <Compile Include="ScreenManager\MouseGestureType.cs">
       <Link>ScreenManager\MouseGestureType.cs</Link>
     </Compile>
-    <Compile Include="..\..\MacOS\CatapultNetWars\ScreenManager\PlayerIndexEventArgs.cs">
+    <Compile Include="ScreenManager\PlayerIndexEventArgs.cs">
       <Link>ScreenManager\PlayerIndexEventArgs.cs</Link>
     </Compile>
-    <Compile Include="..\..\MacOS\CatapultNetWars\ScreenManager\ScreenManager.cs">
+    <Compile Include="ScreenManager\ScreenManager.cs">
       <Link>ScreenManager\ScreenManager.cs</Link>
     </Compile>
-    <Compile Include="..\..\MacOS\CatapultNetWars\Players\AI.cs">
+    <Compile Include="Players\AI.cs">
       <Link>Players\AI.cs</Link>
     </Compile>
-    <Compile Include="..\..\MacOS\CatapultNetWars\Players\Human.cs">
+    <Compile Include="Players\Human.cs">
       <Link>Players\Human.cs</Link>
     </Compile>
-    <Compile Include="..\..\MacOS\CatapultNetWars\Players\Player.cs">
+    <Compile Include="Players\Player.cs">
       <Link>Players\Player.cs</Link>
     </Compile>
-    <Compile Include="..\..\MacOS\CatapultNetWars\Networking\AvailableSessionMenuEntry.cs">
+    <Compile Include="Networking\AvailableSessionMenuEntry.cs">
       <Link>Networking\AvailableSessionMenuEntry.cs</Link>
     </Compile>
-    <Compile Include="..\..\MacOS\CatapultNetWars\Networking\CreateOrFindSessionScreen.cs">
+    <Compile Include="Networking\CreateOrFindSessionScreen.cs">
       <Link>Networking\CreateOrFindSessionScreen.cs</Link>
     </Compile>
-    <Compile Include="..\..\MacOS\CatapultNetWars\Networking\JoinSessionScreen.cs">
+    <Compile Include="Networking\JoinSessionScreen.cs">
       <Link>Networking\JoinSessionScreen.cs</Link>
     </Compile>
-    <Compile Include="..\..\MacOS\CatapultNetWars\Networking\LobbyScreen.cs">
+    <Compile Include="Networking\LobbyScreen.cs">
       <Link>Networking\LobbyScreen.cs</Link>
     </Compile>
-    <Compile Include="..\..\MacOS\CatapultNetWars\Networking\NetworkBusyScreen.cs">
+    <Compile Include="Networking\NetworkBusyScreen.cs">
       <Link>Networking\NetworkBusyScreen.cs</Link>
     </Compile>
-    <Compile Include="..\..\MacOS\CatapultNetWars\Networking\NetworkErrorScreen.cs">
+    <Compile Include="Networking\NetworkErrorScreen.cs">
       <Link>Networking\NetworkErrorScreen.cs</Link>
     </Compile>
-    <Compile Include="..\..\MacOS\CatapultNetWars\Networking\NetworkSessionComponent.cs">
+    <Compile Include="Networking\NetworkSessionComponent.cs">
       <Link>Networking\NetworkSessionComponent.cs</Link>
     </Compile>
-    <Compile Include="..\..\MacOS\CatapultNetWars\Networking\OperationCompletedEventArgs.cs">
+    <Compile Include="Networking\OperationCompletedEventArgs.cs">
       <Link>Networking\OperationCompletedEventArgs.cs</Link>
     </Compile>
-    <Compile Include="..\..\MacOS\CatapultNetWars\Networking\ProfileSignInScreen.cs">
+    <Compile Include="Networking\ProfileSignInScreen.cs">
       <Link>Networking\ProfileSignInScreen.cs</Link>
     </Compile>
-    <Compile Include="..\..\MacOS\CatapultNetWars\Catapult\Catapult.cs">
+    <Compile Include="Catapult\Catapult.cs">
       <Link>Catapult\Catapult.cs</Link>
     </Compile>
-    <Compile Include="..\..\MacOS\CatapultNetWars\Catapult\Projectile.cs">
+    <Compile Include="Catapult\Projectile.cs">
       <Link>Catapult\Projectile.cs</Link>
     </Compile>
-    <Compile Include="..\..\MacOS\CatapultNetWars\IMessageDisplay.cs">
+    <Compile Include="IMessageDisplay.cs">
       <Link>IMessageDisplay.cs</Link>
     </Compile>
-    <Compile Include="..\..\MacOS\CatapultNetWars\MessageDisplayComponent.cs">
+    <Compile Include="MessageDisplayComponent.cs">
       <Link>MessageDisplayComponent.cs</Link>
     </Compile>
     <Compile Include="Program.cs" />
@@ -161,129 +161,129 @@
     </ProjectReference>
   </ItemGroup>
  <ItemGroup>
-    <Content Include="..\..\MacOS\CatapultNetWars\Content\Fonts\HUDFont.xnb">
+    <Content Include="Content\Fonts\HUDFont.xnb">
       <Link>Content\Fonts\HUDFont.xnb</Link><CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="..\..\MacOS\CatapultNetWars\Content\Fonts\MenuFont.xnb">
+    <Content Include="Content\Fonts\MenuFont.xnb">
       <Link>Content\Fonts\MenuFont.xnb</Link><CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="..\..\MacOS\CatapaultWars\Content\Sounds\BoulderHit.wav">
+    <Content Include="Content\Sounds\BoulderHit.wav">
       <Link>Content\Sounds\BoulderHit.wav</Link><CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="..\..\MacOS\CatapaultWars\Content\Sounds\CatapultExplosion.wav">
+    <Content Include="Content\Sounds\CatapultExplosion.wav">
       <Link>Content\Sounds\CatapultExplosion.wav</Link><CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="..\..\MacOS\CatapaultWars\Content\Sounds\CatapultFire.wav">
+    <Content Include="Content\Sounds\CatapultFire.wav">
       <Link>Content\Sounds\CatapultFire.wav</Link><CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="..\..\MacOS\CatapaultWars\Content\Sounds\Lose.wav">
+    <Content Include="Content\Sounds\Lose.wav">
       <Link>Content\Sounds\Lose.wav</Link><CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="..\..\MacOS\CatapaultWars\Content\Sounds\RopeStretch.wav">
+    <Content Include="Content\Sounds\RopeStretch.wav">
       <Link>Content\Sounds\RopeStretch.wav</Link><CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="..\..\MacOS\CatapaultWars\Content\Sounds\Win.wav">
+    <Content Include="Content\Sounds\Win.wav">
       <Link>Content\Sounds\Win.wav</Link><CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="..\..\MacOS\CatapultNetWars\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>
     </Content>
-    <Content Include="..\..\MacOS\CatapultNetWars\Content\Textures\Backgrounds\blank.xnb">
+    <Content Include="Content\Textures\Backgrounds\blank.xnb">
       <Link>Content\Textures\Backgrounds\blank.xnb</Link><CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="..\..\MacOS\CatapultNetWars\Content\Textures\Backgrounds\cloud1.xnb">
+    <Content Include="Content\Textures\Backgrounds\cloud1.xnb">
       <Link>Content\Textures\Backgrounds\cloud1.xnb</Link><CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="..\..\MacOS\CatapultNetWars\Content\Textures\Backgrounds\cloud2.xnb">
+    <Content Include="Content\Textures\Backgrounds\cloud2.xnb">
       <Link>Content\Textures\Backgrounds\cloud2.xnb</Link><CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="..\..\MacOS\CatapultNetWars\Content\Textures\Backgrounds\defeat.xnb">
+    <Content Include="Content\Textures\Backgrounds\defeat.xnb">
       <Link>Content\Textures\Backgrounds\defeat.xnb</Link><CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="..\..\MacOS\CatapultNetWars\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>
     </Content>
-    <Content Include="..\..\MacOS\CatapultNetWars\Content\Textures\Backgrounds\instructions.xnb">
+    <Content Include="Content\Textures\Backgrounds\instructions.xnb">
       <Link>Content\Textures\Backgrounds\instructions.xnb</Link><CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="..\..\MacOS\CatapultNetWars\Content\Textures\Backgrounds\mountain.xnb">
+    <Content Include="Content\Textures\Backgrounds\mountain.xnb">
       <Link>Content\Textures\Backgrounds\mountain.xnb</Link><CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="..\..\MacOS\CatapultNetWars\Content\Textures\Backgrounds\sky.xnb">
+    <Content Include="Content\Textures\Backgrounds\sky.xnb">
       <Link>Content\Textures\Backgrounds\sky.xnb</Link><CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="..\..\MacOS\CatapultNetWars\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>
     </Content>
-    <Content Include="..\..\MacOS\CatapultNetWars\Content\Textures\Backgrounds\victory.xnb">
+    <Content Include="Content\Textures\Backgrounds\victory.xnb">
       <Link>Content\Textures\Backgrounds\victory.xnb</Link><CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="..\..\MacOS\CatapultNetWars\Content\Textures\HUD\ammoType.xnb">
+    <Content Include="Content\Textures\HUD\ammoType.xnb">
       <Link>Content\Textures\HUD\ammoType.xnb</Link><CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="..\..\MacOS\CatapultNetWars\Content\Textures\HUD\Arrow.xnb">
+    <Content Include="Content\Textures\HUD\Arrow.xnb">
       <Link>Content\Textures\HUD\Arrow.xnb</Link><CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="..\..\MacOS\CatapultNetWars\Content\Textures\HUD\hudBackground.xnb">
+    <Content Include="Content\Textures\HUD\hudBackground.xnb">
       <Link>Content\Textures\HUD\hudBackground.xnb</Link><CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="..\..\MacOS\CatapultNetWars\Content\Textures\HUD\windArrow.xnb">
+    <Content Include="Content\Textures\HUD\windArrow.xnb">
       <Link>Content\Textures\HUD\windArrow.xnb</Link><CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="..\..\MacOS\CatapultNetWars\Content\Textures\Catapults\AnimationsDef.xml">
+    <Content Include="Content\Textures\Catapults\AnimationsDef.xml">
       <Link>Content\Textures\Catapults\AnimationsDef.xml</Link><CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="..\..\MacOS\CatapultNetWars\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>
     </Content>
-    <Content Include="..\..\MacOS\CatapultNetWars\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>
     </Content>
-    <Content Include="..\..\MacOS\CatapultNetWars\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>
     </Content>
-    <Content Include="..\..\MacOS\CatapultNetWars\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>
     </Content>
-    <Content Include="..\..\MacOS\CatapultNetWars\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>
     </Content>
-    <Content Include="..\..\MacOS\CatapultNetWars\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>
     </Content>
-    <Content Include="..\..\MacOS\CatapultNetWars\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>
     </Content>
-    <Content Include="..\..\MacOS\CatapultNetWars\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>
     </Content>
-    <Content Include="..\..\MacOS\CatapultNetWars\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>
     </Content>
-    <Content Include="..\..\MacOS\CatapultNetWars\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>
     </Content>
-    <Content Include="..\..\MacOS\CatapultNetWars\Content\cat.xnb">
+    <Content Include="Content\cat.xnb">
       <Link>Content\cat.xnb</Link><CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="..\..\MacOS\CatapultNetWars\Content\chat_able.xnb">
+    <Content Include="Content\chat_able.xnb">
       <Link>Content\chat_able.xnb</Link><CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="..\..\MacOS\CatapultNetWars\Content\chat_mute.xnb">
+    <Content Include="Content\chat_mute.xnb">
       <Link>Content\chat_mute.xnb</Link><CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="..\..\MacOS\CatapultNetWars\Content\chat_ready.xnb">
+    <Content Include="Content\chat_ready.xnb">
       <Link>Content\chat_ready.xnb</Link><CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="..\..\MacOS\CatapultNetWars\Content\chat_talking.xnb">
+    <Content Include="Content\chat_talking.xnb">
       <Link>Content\chat_talking.xnb</Link><CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="..\..\MacOS\CatapultNetWars\Content\gradient.xnb">
+    <Content Include="Content\gradient.xnb">
       <Link>Content\gradient.xnb</Link><CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
   </ItemGroup>
   <ItemGroup>
-    <Content Include="..\..\MacOS\\CatapultNetWars\Content\Textures\Catapults\AnimationsDef.xml">
+    <Content Include="Content\Textures\Catapults\AnimationsDef.xml">
       <Link>Content\Textures\Catapults\AnimationsDef.xml</Link><CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
   </ItemGroup>

+ 76 - 76
CatapultNetWars/CatapultNetWars.Android.csproj

@@ -51,106 +51,106 @@
     <Compile Include="Activity1.cs" />
     <Compile Include="Resources\Resource.designer.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="..\..\MacOS\CatapultNetWars\CatapultGame.cs">
+    <Compile Include="CatapultGame.cs">
       <Link>CatapultGame.cs</Link>
     </Compile>
-    <Compile Include="..\..\MacOS\CatapultNetWars\Utility\Animation.cs">
+    <Compile Include="Utility\Animation.cs">
       <Link>Utility\Animation.cs</Link>
     </Compile>
-    <Compile Include="..\..\MacOS\CatapultNetWars\Utility\AudioManager.cs">
+    <Compile Include="Utility\AudioManager.cs">
       <Link>Utility\AudioManager.cs</Link>
     </Compile>
-    <Compile Include="..\..\MacOS\CatapultNetWars\Screens\BackgroundScreen.cs">
+    <Compile Include="Screens\BackgroundScreen.cs">
       <Link>Screens\BackgroundScreen.cs</Link>
     </Compile>
-    <Compile Include="..\..\MacOS\CatapultNetWars\Screens\GameplayScreen.cs">
+    <Compile Include="Screens\GameplayScreen.cs">
       <Link>Screens\GameplayScreen.cs</Link>
     </Compile>
-    <Compile Include="..\..\MacOS\CatapultNetWars\Screens\InstructionsScreen.cs">
+    <Compile Include="Screens\InstructionsScreen.cs">
       <Link>Screens\InstructionsScreen.cs</Link>
     </Compile>
-    <Compile Include="..\..\MacOS\CatapultNetWars\Screens\LoadingScreen.cs">
+    <Compile Include="Screens\LoadingScreen.cs">
       <Link>Screens\LoadingScreen.cs</Link>
     </Compile>
-    <Compile Include="..\..\MacOS\CatapultNetWars\Screens\MainMenuScreen.cs">
+    <Compile Include="Screens\MainMenuScreen.cs">
       <Link>Screens\MainMenuScreen.cs</Link>
     </Compile>
-    <Compile Include="..\..\MacOS\CatapultNetWars\Screens\MessageBoxScreen.cs">
+    <Compile Include="Screens\MessageBoxScreen.cs">
       <Link>Screens\MessageBoxScreen.cs</Link>
     </Compile>
-    <Compile Include="..\..\MacOS\CatapultNetWars\Screens\PauseScreen.cs">
+    <Compile Include="Screens\PauseScreen.cs">
       <Link>Screens\PauseScreen.cs</Link>
     </Compile>
-    <Compile Include="..\..\MacOS\CatapultNetWars\ScreenManager\GameScreen.cs">
+    <Compile Include="ScreenManager\GameScreen.cs">
       <Link>ScreenManager\GameScreen.cs</Link>
     </Compile>
-    <Compile Include="..\..\MacOS\CatapultNetWars\ScreenManager\InputState.cs">
+    <Compile Include="ScreenManager\InputState.cs">
       <Link>ScreenManager\InputState.cs</Link>
     </Compile>
-    <Compile Include="..\..\MacOS\CatapultNetWars\ScreenManager\MenuEntry.cs">
+    <Compile Include="ScreenManager\MenuEntry.cs">
       <Link>ScreenManager\MenuEntry.cs</Link>
     </Compile>
-    <Compile Include="..\..\MacOS\CatapultNetWars\ScreenManager\MenuScreen.cs">
+    <Compile Include="ScreenManager\MenuScreen.cs">
       <Link>ScreenManager\MenuScreen.cs</Link>
     </Compile>
-    <Compile Include="..\..\MacOS\CatapultNetWars\ScreenManager\MouseGestureType.cs">
+    <Compile Include="ScreenManager\MouseGestureType.cs">
       <Link>ScreenManager\MouseGestureType.cs</Link>
     </Compile>
-    <Compile Include="..\..\MacOS\CatapultNetWars\ScreenManager\PlayerIndexEventArgs.cs">
+    <Compile Include="ScreenManager\PlayerIndexEventArgs.cs">
       <Link>ScreenManager\PlayerIndexEventArgs.cs</Link>
     </Compile>
-    <Compile Include="..\..\MacOS\CatapultNetWars\ScreenManager\ScreenManager.cs">
+    <Compile Include="ScreenManager\ScreenManager.cs">
       <Link>ScreenManager\ScreenManager.cs</Link>
     </Compile>
-    <Compile Include="..\..\MacOS\CatapultNetWars\Players\AI.cs">
+    <Compile Include="Players\AI.cs">
       <Link>Players\AI.cs</Link>
     </Compile>
-    <Compile Include="..\..\MacOS\CatapultNetWars\Players\Human.cs">
+    <Compile Include="Players\Human.cs">
       <Link>Players\Human.cs</Link>
     </Compile>
-    <Compile Include="..\..\MacOS\CatapultNetWars\Players\Player.cs">
+    <Compile Include="Players\Player.cs">
       <Link>Players\Player.cs</Link>
     </Compile>
-    <Compile Include="..\..\MacOS\CatapultNetWars\Networking\AvailableSessionMenuEntry.cs">
+    <Compile Include="Networking\AvailableSessionMenuEntry.cs">
       <Link>Networking\AvailableSessionMenuEntry.cs</Link>
     </Compile>
-    <Compile Include="..\..\MacOS\CatapultNetWars\Networking\CreateOrFindSessionScreen.cs">
+    <Compile Include="Networking\CreateOrFindSessionScreen.cs">
       <Link>Networking\CreateOrFindSessionScreen.cs</Link>
     </Compile>
-    <Compile Include="..\..\MacOS\CatapultNetWars\Networking\JoinSessionScreen.cs">
+    <Compile Include="Networking\JoinSessionScreen.cs">
       <Link>Networking\JoinSessionScreen.cs</Link>
     </Compile>
-    <Compile Include="..\..\MacOS\CatapultNetWars\Networking\LobbyScreen.cs">
+    <Compile Include="Networking\LobbyScreen.cs">
       <Link>Networking\LobbyScreen.cs</Link>
     </Compile>
-    <Compile Include="..\..\MacOS\CatapultNetWars\Networking\NetworkBusyScreen.cs">
+    <Compile Include="Networking\NetworkBusyScreen.cs">
       <Link>Networking\NetworkBusyScreen.cs</Link>
     </Compile>
-    <Compile Include="..\..\MacOS\CatapultNetWars\Networking\NetworkErrorScreen.cs">
+    <Compile Include="Networking\NetworkErrorScreen.cs">
       <Link>Networking\NetworkErrorScreen.cs</Link>
     </Compile>
-    <Compile Include="..\..\MacOS\CatapultNetWars\Networking\NetworkSessionComponent.cs">
+    <Compile Include="Networking\NetworkSessionComponent.cs">
       <Link>Networking\NetworkSessionComponent.cs</Link>
     </Compile>
-    <Compile Include="..\..\MacOS\CatapultNetWars\Networking\OperationCompletedEventArgs.cs">
+    <Compile Include="Networking\OperationCompletedEventArgs.cs">
       <Link>Networking\OperationCompletedEventArgs.cs</Link>
     </Compile>
-    <Compile Include="..\..\MacOS\CatapultNetWars\Networking\ProfileSignInScreen.cs">
+    <Compile Include="Networking\ProfileSignInScreen.cs">
       <Link>Networking\ProfileSignInScreen.cs</Link>
     </Compile>
-    <Compile Include="..\..\MacOS\CatapultNetWars\Catapult\Catapult.cs">
+    <Compile Include="Catapult\Catapult.cs">
       <Link>Catapult\Catapult.cs</Link>
     </Compile>
-    <Compile Include="..\..\MacOS\CatapultNetWars\Catapult\Projectile.cs">
+    <Compile Include="Catapult\Projectile.cs">
       <Link>Catapult\Projectile.cs</Link>
     </Compile>
-    <Compile Include="..\..\MacOS\CatapultNetWars\IMessageDisplay.cs">
+    <Compile Include="IMessageDisplay.cs">
       <Link>IMessageDisplay.cs</Link>
     </Compile>
-    <Compile Include="..\..\MacOS\CatapultNetWars\MessageDisplayComponent.cs">
+    <Compile Include="MessageDisplayComponent.cs">
       <Link>MessageDisplayComponent.cs</Link>
     </Compile>
-    <Compile Include="..\..\MacOS\CatapultNetWars\Resources.Designer.cs">
+    <Compile Include="Resources.Designer.cs">
       <Link>Resources.Designer.cs</Link>
     </Compile>
   </ItemGroup>
@@ -172,7 +172,7 @@
       <Project>{565129E0-4EE5-4F6F-B403-C3484C9740BE}</Project>
       <Name>Lidgren.Network.Android</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\MonoGame.Framework\MonoGame.Framework.Android.csproj">
+    <ProjectReference Include="..\..\MonoGame.Framework\MonoGame.Framework.Android.csproj">
       <Project>{BA9476CF-99BA-4D03-92F2-73D2C5E58883}</Project>
       <Name>MonoGame.Framework.Android</Name>
     </ProjectReference>
@@ -208,129 +208,129 @@
     <Folder Include="Resources\drawable-port\" />
   </ItemGroup>
   <ItemGroup>
-    <AndroidAsset Include="..\..\MacOS\CatapultNetWars\Content\Fonts\HUDFont.xnb">
+    <AndroidAsset Include="Content\Fonts\HUDFont.xnb">
       <Link>Assets\Content\Fonts\HUDFont.xnb</Link>
     </AndroidAsset>
-    <AndroidAsset Include="..\..\MacOS\CatapultNetWars\Content\Fonts\MenuFont.xnb">
+    <AndroidAsset Include="Content\Fonts\MenuFont.xnb">
       <Link>Assets\Content\Fonts\MenuFont.xnb</Link>
     </AndroidAsset>
-    <AndroidAsset Include="..\..\MacOS\CatapaultWars\Content\Sounds\BoulderHit.wav">
+    <AndroidAsset Include="Content\Sounds\BoulderHit.wav">
       <Link>Assets\Content\Sounds\BoulderHit.wav</Link>
     </AndroidAsset>
-    <AndroidAsset Include="..\..\MacOS\CatapaultWars\Content\Sounds\CatapultExplosion.wav">
+    <AndroidAsset Include="Content\Sounds\CatapultExplosion.wav">
       <Link>Assets\Content\Sounds\CatapultExplosion.wav</Link>
     </AndroidAsset>
-    <AndroidAsset Include="..\..\MacOS\CatapaultWars\Content\Sounds\CatapultFire.wav">
+    <AndroidAsset Include="Content\Sounds\CatapultFire.wav">
       <Link>Assets\Content\Sounds\CatapultFire.wav</Link>
     </AndroidAsset>
-    <AndroidAsset Include="..\..\MacOS\CatapaultWars\Content\Sounds\Lose.wav">
+    <AndroidAsset Include="Content\Sounds\Lose.wav">
       <Link>Assets\Content\Sounds\Lose.wav</Link>
     </AndroidAsset>
-    <AndroidAsset Include="..\..\MacOS\CatapaultWars\Content\Sounds\RopeStretch.wav">
+    <AndroidAsset Include="Content\Sounds\RopeStretch.wav">
       <Link>Assets\Content\Sounds\RopeStretch.wav</Link>
     </AndroidAsset>
-    <AndroidAsset Include="..\..\MacOS\CatapaultWars\Content\Sounds\Win.wav">
+    <AndroidAsset Include="Content\Sounds\Win.wav">
       <Link>Assets\Content\Sounds\Win.wav</Link>
     </AndroidAsset>
-    <AndroidAsset Include="..\..\MacOS\CatapultNetWars\Content\Textures\Ammo\rock_ammo.xnb">
+    <AndroidAsset Include="Content\Textures\Ammo\rock_ammo.xnb">
       <Link>Assets\Content\Textures\Ammo\rock_ammo.xnb</Link>
     </AndroidAsset>
-    <AndroidAsset Include="..\..\MacOS\CatapultNetWars\Content\Textures\Backgrounds\blank.xnb">
+    <AndroidAsset Include="Content\Textures\Backgrounds\blank.xnb">
       <Link>Assets\Content\Textures\Backgrounds\blank.xnb</Link>
     </AndroidAsset>
-    <AndroidAsset Include="..\..\MacOS\CatapultNetWars\Content\Textures\Backgrounds\cloud1.xnb">
+    <AndroidAsset Include="Content\Textures\Backgrounds\cloud1.xnb">
       <Link>Assets\Content\Textures\Backgrounds\cloud1.xnb</Link>
     </AndroidAsset>
-    <AndroidAsset Include="..\..\MacOS\CatapultNetWars\Content\Textures\Backgrounds\cloud2.xnb">
+    <AndroidAsset Include="Content\Textures\Backgrounds\cloud2.xnb">
       <Link>Assets\Content\Textures\Backgrounds\cloud2.xnb</Link>
     </AndroidAsset>
-    <AndroidAsset Include="..\..\MacOS\CatapultNetWars\Content\Textures\Backgrounds\defeat.xnb">
+    <AndroidAsset Include="Content\Textures\Backgrounds\defeat.xnb">
       <Link>Assets\Content\Textures\Backgrounds\defeat.xnb</Link>
     </AndroidAsset>
-    <AndroidAsset Include="..\..\MacOS\CatapultNetWars\Content\Textures\Backgrounds\gameplay_screen.xnb">
+    <AndroidAsset Include="Content\Textures\Backgrounds\gameplay_screen.xnb">
       <Link>Assets\Content\Textures\Backgrounds\gameplay_screen.xnb</Link>
     </AndroidAsset>
-    <AndroidAsset Include="..\..\MacOS\CatapultNetWars\Content\Textures\Backgrounds\instructions.xnb">
+    <AndroidAsset Include="Content\Textures\Backgrounds\instructions.xnb">
       <Link>Assets\Content\Textures\Backgrounds\instructions.xnb</Link>
     </AndroidAsset>
-    <AndroidAsset Include="..\..\MacOS\CatapultNetWars\Content\Textures\Backgrounds\mountain.xnb">
+    <AndroidAsset Include="Content\Textures\Backgrounds\mountain.xnb">
       <Link>Assets\Content\Textures\Backgrounds\mountain.xnb</Link>
     </AndroidAsset>
-    <AndroidAsset Include="..\..\MacOS\CatapultNetWars\Content\Textures\Backgrounds\sky.xnb">
+    <AndroidAsset Include="Content\Textures\Backgrounds\sky.xnb">
       <Link>Assets\Content\Textures\Backgrounds\sky.xnb</Link>
     </AndroidAsset>
-    <AndroidAsset Include="..\..\MacOS\CatapultNetWars\Content\Textures\Backgrounds\title_screen.xnb">
+    <AndroidAsset Include="Content\Textures\Backgrounds\title_screen.xnb">
       <Link>Assets\Content\Textures\Backgrounds\title_screen.xnb</Link>
     </AndroidAsset>
-    <AndroidAsset Include="..\..\MacOS\CatapultNetWars\Content\Textures\Backgrounds\victory.xnb">
+    <AndroidAsset Include="Content\Textures\Backgrounds\victory.xnb">
       <Link>Assets\Content\Textures\Backgrounds\victory.xnb</Link>
     </AndroidAsset>
-    <AndroidAsset Include="..\..\MacOS\CatapultNetWars\Content\Textures\HUD\ammoType.xnb">
+    <AndroidAsset Include="Content\Textures\HUD\ammoType.xnb">
       <Link>Assets\Content\Textures\HUD\ammoType.xnb</Link>
     </AndroidAsset>
-    <AndroidAsset Include="..\..\MacOS\CatapultNetWars\Content\Textures\HUD\Arrow.xnb">
+    <AndroidAsset Include="Content\Textures\HUD\Arrow.xnb">
       <Link>Assets\Content\Textures\HUD\Arrow.xnb</Link>
     </AndroidAsset>
-    <AndroidAsset Include="..\..\MacOS\CatapultNetWars\Content\Textures\HUD\hudBackground.xnb">
+    <AndroidAsset Include="Content\Textures\HUD\hudBackground.xnb">
       <Link>Assets\Content\Textures\HUD\hudBackground.xnb</Link>
     </AndroidAsset>
-    <AndroidAsset Include="..\..\MacOS\CatapultNetWars\Content\Textures\HUD\windArrow.xnb">
+    <AndroidAsset Include="Content\Textures\HUD\windArrow.xnb">
       <Link>Assets\Content\Textures\HUD\windArrow.xnb</Link>
     </AndroidAsset>
-    <AndroidAsset Include="..\..\MacOS\CatapultNetWars\Content\Textures\Catapults\AnimationsDef.xml">
+    <AndroidAsset Include="Content\Textures\Catapults\AnimationsDef.xml">
       <Link>Assets\Content\Textures\Catapults\AnimationsDef.xml</Link>
     </AndroidAsset>
-    <AndroidAsset Include="..\..\MacOS\CatapultNetWars\Content\Textures\Catapults\Fire_Miss\fire_miss.xnb">
+    <AndroidAsset Include="Content\Textures\Catapults\Fire_Miss\fire_miss.xnb">
       <Link>Assets\Content\Textures\Catapults\Fire_Miss\fire_miss.xnb</Link>
     </AndroidAsset>
-    <AndroidAsset Include="..\..\MacOS\CatapultNetWars\Content\Textures\Catapults\Hit_Smoke\smoke.xnb">
+    <AndroidAsset Include="Content\Textures\Catapults\Hit_Smoke\smoke.xnb">
       <Link>Assets\Content\Textures\Catapults\Hit_Smoke\smoke.xnb</Link>
     </AndroidAsset>
-    <AndroidAsset Include="..\..\MacOS\CatapultNetWars\Content\Textures\Catapults\Blue\blueDestroyed\blueCatapult_destroyed.xnb">
+    <AndroidAsset Include="Content\Textures\Catapults\Blue\blueDestroyed\blueCatapult_destroyed.xnb">
       <Link>Assets\Content\Textures\Catapults\Blue\blueDestroyed\blueCatapult_destroyed.xnb</Link>
     </AndroidAsset>
-    <AndroidAsset Include="..\..\MacOS\CatapultNetWars\Content\Textures\Catapults\Blue\blueFire\blueCatapult_fire.xnb">
+    <AndroidAsset Include="Content\Textures\Catapults\Blue\blueFire\blueCatapult_fire.xnb">
       <Link>Assets\Content\Textures\Catapults\Blue\blueFire\blueCatapult_fire.xnb</Link>
     </AndroidAsset>
-    <AndroidAsset Include="..\..\MacOS\CatapultNetWars\Content\Textures\Catapults\Blue\blueIdle\blueIdle.xnb">
+    <AndroidAsset Include="Content\Textures\Catapults\Blue\blueIdle\blueIdle.xnb">
       <Link>Assets\Content\Textures\Catapults\Blue\blueIdle\blueIdle.xnb</Link>
     </AndroidAsset>
-    <AndroidAsset Include="..\..\MacOS\CatapultNetWars\Content\Textures\Catapults\Blue\bluePullback\blueCatapult_Pullback.xnb">
+    <AndroidAsset Include="Content\Textures\Catapults\Blue\bluePullback\blueCatapult_Pullback.xnb">
       <Link>Assets\Content\Textures\Catapults\Blue\bluePullback\blueCatapult_Pullback.xnb</Link>
     </AndroidAsset>
-    <AndroidAsset Include="..\..\MacOS\CatapultNetWars\Content\Textures\Catapults\Red\redDestroyed\redCatapult_destroyed.xnb">
+    <AndroidAsset Include="Content\Textures\Catapults\Red\redDestroyed\redCatapult_destroyed.xnb">
       <Link>Assets\Content\Textures\Catapults\Red\redDestroyed\redCatapult_destroyed.xnb</Link>
     </AndroidAsset>
-    <AndroidAsset Include="..\..\MacOS\CatapultNetWars\Content\Textures\Catapults\Red\redFire\redCatapult_fire.xnb">
+    <AndroidAsset Include="Content\Textures\Catapults\Red\redFire\redCatapult_fire.xnb">
       <Link>Assets\Content\Textures\Catapults\Red\redFire\redCatapult_fire.xnb</Link>
     </AndroidAsset>
-    <AndroidAsset Include="..\..\MacOS\CatapultNetWars\Content\Textures\Catapults\Red\redIdle\redIdle.xnb">
+    <AndroidAsset Include="Content\Textures\Catapults\Red\redIdle\redIdle.xnb">
       <Link>Assets\Content\Textures\Catapults\Red\redIdle\redIdle.xnb</Link>
     </AndroidAsset>
-    <AndroidAsset Include="..\..\MacOS\CatapultNetWars\Content\Textures\Catapults\Red\redPullback\redCatapult_Pullback.xnb">
+    <AndroidAsset Include="Content\Textures\Catapults\Red\redPullback\redCatapult_Pullback.xnb">
       <Link>Assets\Content\Textures\Catapults\Red\redPullback\redCatapult_Pullback.xnb</Link>
     </AndroidAsset>
-    <AndroidAsset Include="..\..\MacOS\CatapultNetWars\Content\cat.xnb">
+    <AndroidAsset Include="Content\cat.xnb">
       <Link>Assets\Content\cat.xnb</Link>
     </AndroidAsset>
-    <AndroidAsset Include="..\..\MacOS\CatapultNetWars\Content\chat_able.xnb">
+    <AndroidAsset Include="Content\chat_able.xnb">
       <Link>Assets\Content\chat_able.xnb</Link>
     </AndroidAsset>
-    <AndroidAsset Include="..\..\MacOS\CatapultNetWars\Content\chat_mute.xnb">
+    <AndroidAsset Include="Content\chat_mute.xnb">
       <Link>Assets\Content\chat_mute.xnb</Link>
     </AndroidAsset>
-    <AndroidAsset Include="..\..\MacOS\CatapultNetWars\Content\chat_ready.xnb">
+    <AndroidAsset Include="Content\chat_ready.xnb">
       <Link>Assets\Content\chat_ready.xnb</Link>
     </AndroidAsset>
-    <AndroidAsset Include="..\..\MacOS\CatapultNetWars\Content\chat_talking.xnb">
+    <AndroidAsset Include="Content\chat_talking.xnb">
       <Link>Assets\Content\chat_talking.xnb</Link>
     </AndroidAsset>
-    <AndroidAsset Include="..\..\MacOS\CatapultNetWars\Content\gradient.xnb">
+    <AndroidAsset Include="Content\gradient.xnb">
       <Link>Assets\Content\gradient.xnb</Link>
     </AndroidAsset>
   </ItemGroup>
   <ItemGroup>
-    <EmbeddedResource Include="..\..\MacOS\CatapultNetWars\Resources.resx">
+    <EmbeddedResource Include="Resources.resx">
       <Link>Resources.resx</Link>
     </EmbeddedResource>
   </ItemGroup>

+ 1 - 1
CatapultNetWars/CatapultNetWars.MacOS.csproj

@@ -40,7 +40,7 @@
     <Reference Include="MonoMac" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="Info.plist" />
+    <None Include="Info.plist"></None>
     <None Include="Background.png" />
     <None Include="Game.ico" />
   </ItemGroup>

+ 0 - 0
CatapultNetWars/Info.MacOS.plist → CatapultNetWars/Info.plist


+ 78 - 78
CatapultNetWars/MonoGame.Samples.CatapultNetWars.iOS.csproj

@@ -65,242 +65,242 @@
     <Reference Include="System.Xml.Linq" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="Info.plist" />
-    <None Include="..\..\..\MacOS\CatapultNetWars\Resources.resources">
+    <None Include="Info.iOS.plist"><Link>Info.plist</Link></None>
+    <None Include="Resources.resources">
       <Link>Resources.resources</Link>
     </None>
-    <None Include="..\..\..\MacOS\CatapultNetWars\Resources.resx">
+    <None Include="Resources.resx">
       <Link>Resources.resx</Link>
     </None>
   </ItemGroup>
   <ItemGroup>
     <Compile Include="Main.cs" />
-    <Compile Include="..\..\..\MacOS\CatapultNetWars\CatapultGame.cs">
+    <Compile Include="CatapultGame.cs">
       <Link>CatapultGame.cs</Link>
     </Compile>
-    <Compile Include="..\..\..\MacOS\CatapultNetWars\IMessageDisplay.cs">
+    <Compile Include="IMessageDisplay.cs">
       <Link>IMessageDisplay.cs</Link>
     </Compile>
-    <Compile Include="..\..\..\MacOS\CatapultNetWars\MessageDisplayComponent.cs">
+    <Compile Include="MessageDisplayComponent.cs">
       <Link>MessageDisplayComponent.cs</Link>
     </Compile>
-    <Compile Include="..\..\..\MacOS\CatapultNetWars\Catapult\Catapult.cs">
+    <Compile Include="Catapult\Catapult.cs">
       <Link>Catapult\Catapult.cs</Link>
     </Compile>
-    <Compile Include="..\..\..\MacOS\CatapultNetWars\Catapult\Projectile.cs">
+    <Compile Include="Catapult\Projectile.cs">
       <Link>Catapult\Projectile.cs</Link>
     </Compile>
-    <Compile Include="..\..\..\MacOS\CatapultNetWars\Networking\AvailableSessionMenuEntry.cs">
+    <Compile Include="Networking\AvailableSessionMenuEntry.cs">
       <Link>Networking\AvailableSessionMenuEntry.cs</Link>
     </Compile>
-    <Compile Include="..\..\..\MacOS\CatapultNetWars\Networking\CreateOrFindSessionScreen.cs">
+    <Compile Include="Networking\CreateOrFindSessionScreen.cs">
       <Link>Networking\CreateOrFindSessionScreen.cs</Link>
     </Compile>
-    <Compile Include="..\..\..\MacOS\CatapultNetWars\Networking\JoinSessionScreen.cs">
+    <Compile Include="Networking\JoinSessionScreen.cs">
       <Link>Networking\JoinSessionScreen.cs</Link>
     </Compile>
-    <Compile Include="..\..\..\MacOS\CatapultNetWars\Networking\LobbyScreen.cs">
+    <Compile Include="Networking\LobbyScreen.cs">
       <Link>Networking\LobbyScreen.cs</Link>
     </Compile>
-    <Compile Include="..\..\..\MacOS\CatapultNetWars\Networking\NetworkBusyScreen.cs">
+    <Compile Include="Networking\NetworkBusyScreen.cs">
       <Link>Networking\NetworkBusyScreen.cs</Link>
     </Compile>
-    <Compile Include="..\..\..\MacOS\CatapultNetWars\Networking\NetworkErrorScreen.cs">
+    <Compile Include="Networking\NetworkErrorScreen.cs">
       <Link>Networking\NetworkErrorScreen.cs</Link>
     </Compile>
-    <Compile Include="..\..\..\MacOS\CatapultNetWars\Networking\NetworkSessionComponent.cs">
+    <Compile Include="Networking\NetworkSessionComponent.cs">
       <Link>Networking\NetworkSessionComponent.cs</Link>
     </Compile>
-    <Compile Include="..\..\..\MacOS\CatapultNetWars\Networking\OperationCompletedEventArgs.cs">
+    <Compile Include="Networking\OperationCompletedEventArgs.cs">
       <Link>Networking\OperationCompletedEventArgs.cs</Link>
     </Compile>
-    <Compile Include="..\..\..\MacOS\CatapultNetWars\Networking\ProfileSignInScreen.cs">
+    <Compile Include="Networking\ProfileSignInScreen.cs">
       <Link>Networking\ProfileSignInScreen.cs</Link>
     </Compile>
-    <Compile Include="..\..\..\MacOS\CatapultNetWars\Players\AI.cs">
+    <Compile Include="Players\AI.cs">
       <Link>Players\AI.cs</Link>
     </Compile>
-    <Compile Include="..\..\..\MacOS\CatapultNetWars\Players\Human.cs">
+    <Compile Include="Players\Human.cs">
       <Link>Players\Human.cs</Link>
     </Compile>
-    <Compile Include="..\..\..\MacOS\CatapultNetWars\Players\Player.cs">
+    <Compile Include="Players\Player.cs">
       <Link>Players\Player.cs</Link>
     </Compile>
-    <Compile Include="..\..\..\MacOS\CatapultNetWars\ScreenManager\GameScreen.cs">
+    <Compile Include="ScreenManager\GameScreen.cs">
       <Link>ScreenManager\GameScreen.cs</Link>
     </Compile>
-    <Compile Include="..\..\..\MacOS\CatapultNetWars\ScreenManager\InputState.cs">
+    <Compile Include="ScreenManager\InputState.cs">
       <Link>ScreenManager\InputState.cs</Link>
     </Compile>
-    <Compile Include="..\..\..\MacOS\CatapultNetWars\ScreenManager\MenuEntry.cs">
+    <Compile Include="ScreenManager\MenuEntry.cs">
       <Link>ScreenManager\MenuEntry.cs</Link>
     </Compile>
-    <Compile Include="..\..\..\MacOS\CatapultNetWars\ScreenManager\MenuScreen.cs">
+    <Compile Include="ScreenManager\MenuScreen.cs">
       <Link>ScreenManager\MenuScreen.cs</Link>
     </Compile>
-    <Compile Include="..\..\..\MacOS\CatapultNetWars\ScreenManager\MouseGestureType.cs">
+    <Compile Include="ScreenManager\MouseGestureType.cs">
       <Link>ScreenManager\MouseGestureType.cs</Link>
     </Compile>
-    <Compile Include="..\..\..\MacOS\CatapultNetWars\ScreenManager\PlayerIndexEventArgs.cs">
+    <Compile Include="ScreenManager\PlayerIndexEventArgs.cs">
       <Link>ScreenManager\PlayerIndexEventArgs.cs</Link>
     </Compile>
-    <Compile Include="..\..\..\MacOS\CatapultNetWars\ScreenManager\ScreenManager.cs">
+    <Compile Include="ScreenManager\ScreenManager.cs">
       <Link>ScreenManager\ScreenManager.cs</Link>
     </Compile>
-    <Compile Include="..\..\..\MacOS\CatapultNetWars\Screens\BackgroundScreen.cs">
+    <Compile Include="Screens\BackgroundScreen.cs">
       <Link>Screens\BackgroundScreen.cs</Link>
     </Compile>
-    <Compile Include="..\..\..\MacOS\CatapultNetWars\Screens\GameplayScreen.cs">
+    <Compile Include="Screens\GameplayScreen.cs">
       <Link>Screens\GameplayScreen.cs</Link>
     </Compile>
-    <Compile Include="..\..\..\MacOS\CatapultNetWars\Screens\InstructionsScreen.cs">
+    <Compile Include="Screens\InstructionsScreen.cs">
       <Link>Screens\InstructionsScreen.cs</Link>
     </Compile>
-    <Compile Include="..\..\..\MacOS\CatapultNetWars\Screens\LoadingScreen.cs">
+    <Compile Include="Screens\LoadingScreen.cs">
       <Link>Screens\LoadingScreen.cs</Link>
     </Compile>
-    <Compile Include="..\..\..\MacOS\CatapultNetWars\Screens\MainMenuScreen.cs">
+    <Compile Include="Screens\MainMenuScreen.cs">
       <Link>Screens\MainMenuScreen.cs</Link>
     </Compile>
-    <Compile Include="..\..\..\MacOS\CatapultNetWars\Screens\MessageBoxScreen.cs">
+    <Compile Include="Screens\MessageBoxScreen.cs">
       <Link>Screens\MessageBoxScreen.cs</Link>
     </Compile>
-    <Compile Include="..\..\..\MacOS\CatapultNetWars\Screens\PauseScreen.cs">
+    <Compile Include="Screens\PauseScreen.cs">
       <Link>Screens\PauseScreen.cs</Link>
     </Compile>
-    <Compile Include="..\..\..\MacOS\CatapultNetWars\Utility\Animation.cs">
+    <Compile Include="Utility\Animation.cs">
       <Link>Utility\Animation.cs</Link>
     </Compile>
-    <Compile Include="..\..\..\MacOS\CatapultNetWars\Utility\AudioManager.cs">
+    <Compile Include="Utility\AudioManager.cs">
       <Link>Utility\AudioManager.cs</Link>
     </Compile>
-    <Compile Include="..\..\..\MacOS\CatapultNetWars\Resources.Designer.cs">
+    <Compile Include="Resources.Designer.cs">
       <Link>Resources.Designer.cs</Link>
     </Compile>
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <ItemGroup>
-    <Content Include="..\..\..\MacOS\CatapultNetWars\Background.png">
+    <Content Include="Background.png">
       <Link>Background.png</Link>
     </Content>
-    <Content Include="..\..\..\MacOS\CatapultNetWars\Content\cat.xnb">
+    <Content Include="Content\cat.xnb">
       <Link>Content\cat.xnb</Link>
     </Content>
-    <Content Include="..\..\..\MacOS\CatapultNetWars\Content\chat_able.xnb">
+    <Content Include="Content\chat_able.xnb">
       <Link>Content\chat_able.xnb</Link>
     </Content>
-    <Content Include="..\..\..\MacOS\CatapultNetWars\Content\chat_mute.xnb">
+    <Content Include="Content\chat_mute.xnb">
       <Link>Content\chat_mute.xnb</Link>
     </Content>
-    <Content Include="..\..\..\MacOS\CatapultNetWars\Content\chat_ready.xnb">
+    <Content Include="Content\chat_ready.xnb">
       <Link>Content\chat_ready.xnb</Link>
     </Content>
-    <Content Include="..\..\..\MacOS\CatapultNetWars\Content\chat_talking.xnb">
+    <Content Include="Content\chat_talking.xnb">
       <Link>Content\chat_talking.xnb</Link>
     </Content>
-    <Content Include="..\..\..\MacOS\CatapultNetWars\Content\gradient.xnb">
+    <Content Include="Content\gradient.xnb">
       <Link>Content\gradient.xnb</Link>
     </Content>
-    <Content Include="..\..\..\MacOS\CatapultNetWars\Content\Textures\HUD\ammoType.xnb">
+    <Content Include="Content\Textures\HUD\ammoType.xnb">
       <Link>Content\Textures\HUD\ammoType.xnb</Link>
     </Content>
-    <Content Include="..\..\..\MacOS\CatapultNetWars\Content\Textures\HUD\Arrow.xnb">
+    <Content Include="Content\Textures\HUD\Arrow.xnb">
       <Link>Content\Textures\HUD\Arrow.xnb</Link>
     </Content>
-    <Content Include="..\..\..\MacOS\CatapultNetWars\Content\Textures\HUD\hudBackground.xnb">
+    <Content Include="Content\Textures\HUD\hudBackground.xnb">
       <Link>Content\Textures\HUD\hudBackground.xnb</Link>
     </Content>
-    <Content Include="..\..\..\MacOS\CatapultNetWars\Content\Textures\HUD\windArrow.xnb">
+    <Content Include="Content\Textures\HUD\windArrow.xnb">
       <Link>Content\Textures\HUD\windArrow.xnb</Link>
     </Content>
-    <Content Include="..\..\..\MacOS\CatapultNetWars\Content\Textures\Catapults\AnimationsDef.xml">
+    <Content Include="Content\Textures\Catapults\AnimationsDef.xml">
       <Link>Content\Textures\Catapults\AnimationsDef.xml</Link>
     </Content>
-    <Content Include="..\..\..\MacOS\CatapultNetWars\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>
     </Content>
-    <Content Include="..\..\..\MacOS\CatapultNetWars\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>
     </Content>
-    <Content Include="..\..\..\MacOS\CatapultNetWars\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>
     </Content>
-    <Content Include="..\..\..\MacOS\CatapultNetWars\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>
     </Content>
-    <Content Include="..\..\..\MacOS\CatapultNetWars\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>
     </Content>
-    <Content Include="..\..\..\MacOS\CatapultNetWars\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>
     </Content>
-    <Content Include="..\..\..\MacOS\CatapultNetWars\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>
     </Content>
-    <Content Include="..\..\..\MacOS\CatapultNetWars\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>
     </Content>
-    <Content Include="..\..\..\MacOS\CatapultNetWars\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>
     </Content>
-    <Content Include="..\..\..\MacOS\CatapultNetWars\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>
     </Content>
-    <Content Include="..\..\..\MacOS\CatapultNetWars\Content\Textures\Backgrounds\blank.xnb">
+    <Content Include="Content\Textures\Backgrounds\blank.xnb">
       <Link>Content\Textures\Backgrounds\blank.xnb</Link>
     </Content>
-    <Content Include="..\..\..\MacOS\CatapultNetWars\Content\Textures\Backgrounds\cloud1.xnb">
+    <Content Include="Content\Textures\Backgrounds\cloud1.xnb">
       <Link>Content\Textures\Backgrounds\cloud1.xnb</Link>
     </Content>
-    <Content Include="..\..\..\MacOS\CatapultNetWars\Content\Textures\Backgrounds\cloud2.xnb">
+    <Content Include="Content\Textures\Backgrounds\cloud2.xnb">
       <Link>Content\Textures\Backgrounds\cloud2.xnb</Link>
     </Content>
-    <Content Include="..\..\..\MacOS\CatapultNetWars\Content\Textures\Backgrounds\defeat.xnb">
+    <Content Include="Content\Textures\Backgrounds\defeat.xnb">
       <Link>Content\Textures\Backgrounds\defeat.xnb</Link>
     </Content>
-    <Content Include="..\..\..\MacOS\CatapultNetWars\Content\Textures\Backgrounds\gameplay_screen.xnb">
+    <Content Include="Content\Textures\Backgrounds\gameplay_screen.xnb">
       <Link>Content\Textures\Backgrounds\gameplay_screen.xnb</Link>
     </Content>
-    <Content Include="..\..\..\MacOS\CatapultNetWars\Content\Textures\Backgrounds\instructions.xnb">
+    <Content Include="Content\Textures\Backgrounds\instructions.xnb">
       <Link>Content\Textures\Backgrounds\instructions.xnb</Link>
     </Content>
-    <Content Include="..\..\..\MacOS\CatapultNetWars\Content\Textures\Backgrounds\mountain.xnb">
+    <Content Include="Content\Textures\Backgrounds\mountain.xnb">
       <Link>Content\Textures\Backgrounds\mountain.xnb</Link>
     </Content>
-    <Content Include="..\..\..\MacOS\CatapultNetWars\Content\Textures\Backgrounds\sky.xnb">
+    <Content Include="Content\Textures\Backgrounds\sky.xnb">
       <Link>Content\Textures\Backgrounds\sky.xnb</Link>
     </Content>
-    <Content Include="..\..\..\MacOS\CatapultNetWars\Content\Textures\Backgrounds\title_screen.xnb">
+    <Content Include="Content\Textures\Backgrounds\title_screen.xnb">
       <Link>Content\Textures\Backgrounds\title_screen.xnb</Link>
     </Content>
-    <Content Include="..\..\..\MacOS\CatapultNetWars\Content\Textures\Backgrounds\victory.xnb">
+    <Content Include="Content\Textures\Backgrounds\victory.xnb">
       <Link>Content\Textures\Backgrounds\victory.xnb</Link>
     </Content>
-    <Content Include="..\..\..\MacOS\CatapultNetWars\Content\Textures\Ammo\rock_ammo.xnb">
+    <Content Include="Content\Textures\Ammo\rock_ammo.xnb">
       <Link>Content\Textures\Ammo\rock_ammo.xnb</Link>
     </Content>
-    <Content Include="..\..\..\MacOS\CatapultNetWars\Content\Sounds\Win.xnb">
+    <Content Include="Content\Sounds\Win.xnb">
       <Link>Content\Sounds\Win.xnb</Link>
     </Content>
-    <Content Include="..\..\..\MacOS\CatapultNetWars\Content\Sounds\Lose.xnb">
+    <Content Include="Content\Sounds\Lose.xnb">
       <Link>Content\Sounds\Lose.xnb</Link>
     </Content>
-    <Content Include="..\..\..\MacOS\CatapultNetWars\Content\Sounds\RopeStretch.xnb">
+    <Content Include="Content\Sounds\RopeStretch.xnb">
       <Link>Content\Sounds\RopeStretch.xnb</Link>
     </Content>
-    <Content Include="..\..\..\MacOS\CatapultNetWars\Content\Sounds\CatapultFire.xnb">
+    <Content Include="Content\Sounds\CatapultFire.xnb">
       <Link>Content\Sounds\CatapultFire.xnb</Link>
     </Content>
-    <Content Include="..\..\..\MacOS\CatapultNetWars\Content\Sounds\CatapultExplosion.xnb">
+    <Content Include="Content\Sounds\CatapultExplosion.xnb">
       <Link>Content\Sounds\CatapultExplosion.xnb</Link>
     </Content>
-    <Content Include="..\..\..\MacOS\CatapultNetWars\Content\Sounds\BoulderHit.xnb">
+    <Content Include="Content\Sounds\BoulderHit.xnb">
       <Link>Content\Sounds\BoulderHit.xnb</Link>
     </Content>
-    <Content Include="..\..\..\MacOS\CatapultNetWars\Content\Fonts\HUDFont.xnb">
+    <Content Include="Content\Fonts\HUDFont.xnb">
       <Link>Content\Fonts\HUDFont.xnb</Link>
     </Content>
-    <Content Include="..\..\..\MacOS\CatapultNetWars\Content\Fonts\MenuFont.xnb">
+    <Content Include="Content\Fonts\MenuFont.xnb">
       <Link>Content\Fonts\MenuFont.xnb</Link>
     </Content>
   </ItemGroup>

+ 0 - 0
ChaseAndEvade/Info.MacOS.plist → ChaseAndEvade/Info.plist


+ 6 - 6
ChaseAndEvade/MonoGame.Samples.ChaseAndEvade.Android.csproj

@@ -49,27 +49,27 @@
   </ItemGroup>
   <ItemGroup>
     <Compile Include="Activity1.cs" />
-    <Compile Include="..\..\iOS\ChaseAndEvade\ChaseAndEvadeGame.cs">
+    <Compile Include="ChaseAndEvadeGame.cs">
       <Link>ChaseAndEvadeGame.cs</Link>
     </Compile>
     <Compile Include="Resources\Resource.Designer.cs" />
   </ItemGroup>
   <ItemGroup>
-    <AndroidAsset Include="..\..\iOS\ChaseAndEvade\Content\Arial.xnb">
+    <AndroidAsset Include="Content\Arial.xnb">
       <Link>Assets\Content\Arial.xnb</Link>
     </AndroidAsset>
-    <AndroidAsset Include="..\..\iOS\ChaseAndEvade\Content\cat.png">
+    <AndroidAsset Include="Content\cat.png">
       <Link>Assets\Content\Cat.png</Link>
     </AndroidAsset>
-    <AndroidAsset Include="..\..\iOS\ChaseAndEvade\Content\mouse.png">
+    <AndroidAsset Include="Content\mouse.png">
       <Link>Assets\Content\Mouse.png</Link>
     </AndroidAsset>
-    <AndroidAsset Include="..\..\iOS\ChaseAndEvade\Content\tank.png">
+    <AndroidAsset Include="Content\tank.png">
       <Link>Assets\Content\Tank.png</Link>
     </AndroidAsset>
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\..\MonoGame.Framework\MonoGame.Framework.Android.csproj">
+    <ProjectReference Include="..\..\MonoGame.Framework\MonoGame.Framework.Android.csproj">
       <Project>{BA9476CF-99BA-4D03-92F2-73D2C5E58883}</Project>
       <Name>MonoGame.Framework.Android</Name>
     </ProjectReference>

+ 6 - 6
ChaseAndEvade/MonoGame.Samples.ChaseAndEvade.Linux.csproj

@@ -43,32 +43,32 @@
     <None Include="Info.plist" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="..\..\iOS\ChaseAndEvade\ChaseAndEvadeGame.cs">
+    <Compile Include="ChaseAndEvadeGame.cs">
       <Link>ChaseAndEvadeGame.cs</Link>
     </Compile>
     <Compile Include="Program.cs" />
   </ItemGroup>
   <ItemGroup>
-    <Content Include="..\..\iOS\ChaseAndEvade\Content\Arial.xnb">
+    <Content Include="Content\Arial.xnb">
       <Link>Content\Arial.xnb</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="..\..\iOS\ChaseAndEvade\Content\cat.png">
+    <Content Include="Content\cat.png">
       <Link>Content\cat.png</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="..\..\iOS\ChaseAndEvade\Content\mouse.png">
+    <Content Include="Content\mouse.png">
       <Link>Content\mouse.png</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="..\..\iOS\ChaseAndEvade\Content\tank.png">
+    <Content Include="Content\tank.png">
       <Link>Content\tank.png</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
     <Content Include="GameThumbnail.png" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\..\MonoGame.Framework\MonoGame.Framework.Linux.csproj">
+    <ProjectReference Include="..\..\MonoGame.Framework\MonoGame.Framework.Linux.csproj">
       <Project>{35253CE1-C864-4CD3-8249-4D1319748E8F}</Project>
       <Name>MonoGame.Framework.Linux</Name>
     </ProjectReference>

+ 6 - 6
ChaseAndEvade/MonoGame.Samples.ChaseAndEvade.MacOS.csproj

@@ -41,12 +41,12 @@
     </Reference>
   </ItemGroup>
   <ItemGroup>
-    <None Include="Info.plist" />
+    <None Include="Info.plist"></None>
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <Import Project="$(MSBuildExtensionsPath)\Mono\MonoMac\v0.0\Mono.MonoMac.targets" />
   <ItemGroup>
-    <Compile Include="..\..\iOS\ChaseAndEvade\ChaseAndEvadeGame.cs">
+    <Compile Include="ChaseAndEvadeGame.cs">
       <Link>ChaseAndEvadeGame.cs</Link>
     </Compile>
     <Compile Include="Program.cs" />
@@ -58,16 +58,16 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <Content Include="..\..\iOS\ChaseAndEvade\Content\Arial.xnb">
+    <Content Include="Content\Arial.xnb">
       <Link>Content\Arial.xnb</Link>
     </Content>
-    <Content Include="..\..\iOS\ChaseAndEvade\Content\cat.png">
+    <Content Include="Content\cat.png">
       <Link>Content\cat.png</Link>
     </Content>
-    <Content Include="..\..\iOS\ChaseAndEvade\Content\mouse.png">
+    <Content Include="Content\mouse.png">
       <Link>Content\mouse.png</Link>
     </Content>
-    <Content Include="..\..\iOS\ChaseAndEvade\Content\tank.png">
+    <Content Include="Content\tank.png">
       <Link>Content\tank.png</Link>
     </Content>
     <Content Include="GameThumbnail.png" />

+ 2 - 2
ChaseAndEvade/MonoGame.Samples.ChaseAndEvade.iOS.csproj

@@ -114,10 +114,10 @@
   </ItemGroup>
   <ItemGroup>
     <None Include="GameThumbnail.png" />
-    <None Include="Info.plist" />
+    <None Include="Info.iOS.plist"><Link>Info.plist</Link></None>
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\..\MonoGame.Framework\MonoGame.Framework.iOS.csproj">
+    <ProjectReference Include="..\..\MonoGame.Framework\MonoGame.Framework.iOS.csproj">
       <Project>{DB8508BB-9849-4CC2-BC0F-8EB5DACB3C47}</Project>
       <Name>MonoGame.Framework.iOS</Name>
     </ProjectReference>

+ 1 - 1
CollisionSample/CollisionSample.csproj

@@ -49,7 +49,7 @@
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <Import Project="$(MSBuildExtensionsPath)\Mono\MonoMac\v0.0\Mono.MonoMac.targets" />
   <ItemGroup>
-    <ProjectReference Include="..\..\..\MonoGame.Framework\MonoGame.Framework.MacOS.csproj">
+    <ProjectReference Include="..\..\MonoGame.Framework\MonoGame.Framework.MacOS.csproj">
       <Project>{36C538E6-C32A-4A8D-A39C-566173D7118E}</Project>
       <Name>MonoGame.Framework.MacOS</Name>
     </ProjectReference>

+ 1 - 1
Colored3DCube/Colored3DCube.MacOS.csproj

@@ -40,7 +40,7 @@
     <Reference Include="MonoMac" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="Info.plist" />
+    <None Include="Info.plist"></None>
     <None Include="Game.ico" />
     <None Include="GameThumbnail.png" />
   </ItemGroup>

+ 4 - 0
Draw2D/Game1.cs

@@ -36,7 +36,11 @@ namespace Microsoft.Xna.Samples.Draw2D
 			Content.RootDirectory = "Content";
 			
 			graphics.PreferMultiSampling = true;
+#if ANDROID || IPHONE
 			graphics.IsFullScreen = true;
+#else
+			graphics.IsFullScreen = false;
+#endif
 			
 			graphics.PreferredBackBufferHeight = 480;
 			graphics.PreferredBackBufferWidth = 320;

+ 0 - 0
Draw2D/Info.MacOS.plist → Draw2D/Info.plist


+ 13 - 13
Draw2D/MonoGame.Samples.Draw2D.Android.csproj

@@ -47,12 +47,12 @@
   </ItemGroup>
   <ItemGroup>
     <Compile Include="Activity1.cs" />
-    <Compile Include="..\..\iOS\Draw2D\Game1.cs">
+    <Compile Include="Game1.cs">
       <Link>Game1.cs</Link>
     </Compile>
     <Compile Include="Resources\Resource.Designer.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="..\..\iOS\Draw2D\FPSCounterComponent.cs">
+    <Compile Include="FPSCounterComponent.cs">
       <Link>FPSCounterComponent.cs</Link>
     </Compile>
   </ItemGroup>
@@ -63,29 +63,29 @@
     <AndroidResource Include="Resources\Drawable\Icon.png" />
   </ItemGroup>
   <ItemGroup>
-    <AndroidAsset Include="..\..\iOS\Draw2D\Content\monogameicon.png">
+    <AndroidAsset Include="Content\monogameicon.png">
       <Link>Assets\Content\monogameicon.png</Link>
     </AndroidAsset>
-    <AndroidAsset Include="..\..\iOS\Draw2D\Content\purpleBall.xnb">
+    <AndroidAsset Include="Content\purpleBall.xnb">
       <Link>Assets\Content\purpleBall.xnb</Link>
     </AndroidAsset>
-    <AndroidAsset Include="..\..\iOS\Draw2D\Content\spriteFont1.xnb">
+    <AndroidAsset Include="Content\spriteFont1.xnb">
       <Link>Assets\Content\spriteFont1.xnb</Link>
     </AndroidAsset>
-    <AndroidAsset Include="..\..\iOS\Draw2D\Content\monogameicon48x48.png">
+    <AndroidAsset Include="Content\monogameicon48x48.png">
       <Link>Assets\Content\monogameicon48x48.png</Link>
     </AndroidAsset>
   </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath)\Novell\Novell.MonoDroid.CSharp.targets" />
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
-     Other similar extension points exist, see Microsoft.Common.targets.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
+  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
+     Other similar extension points exist, see Microsoft.Common.targets.
+  <Target Name="BeforeBuild">
+  </Target>
+  <Target Name="AfterBuild">
+  </Target>
   -->
   <ItemGroup>
-    <ProjectReference Include="..\..\..\MonoGame.Framework\MonoGame.Framework.Android.csproj">
+    <ProjectReference Include="..\..\MonoGame.Framework\MonoGame.Framework.Android.csproj">
       <Project>{BA9476CF-99BA-4D03-92F2-73D2C5E58883}</Project>
       <Name>MonoGame.Framework.Android</Name>
     </ProjectReference>

+ 7 - 7
Draw2D/MonoGame.Samples.Draw2D.Linux.csproj

@@ -32,28 +32,28 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
-    <Compile Include="..\..\iOS\Draw2D\FPSCounterComponent.cs">
+    <Compile Include="FPSCounterComponent.cs">
       <Link>FPSCounterComponent.cs</Link>
     </Compile>
     <Compile Include="Program.cs" />
-    <Compile Include="..\..\iOS\Draw2D\Game1.cs">
+    <Compile Include="Game1.cs">
       <Link>Game1.cs</Link>
     </Compile>
   </ItemGroup>
   <ItemGroup>
-    <Content Include="..\..\iOS\Draw2D\Content\monogameicon.png">
+    <Content Include="Content\monogameicon.png">
       <Link>Content\monogameicon.png</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="..\..\iOS\Draw2D\Content\purpleBall.xnb">
+    <Content Include="Content\purpleBall.xnb">
       <Link>Content\purpleBall.xnb</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="..\..\iOS\Draw2D\Content\spriteFont1.xnb">
+    <Content Include="Content\spriteFont1.xnb">
       <Link>Content\spriteFont1.xnb</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="..\..\iOS\Draw2D\Default.png">
+    <Content Include="Default.png">
       <Link>Default.png</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
@@ -63,7 +63,7 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
-    <Content Include="..\..\iOS\Draw2D\Default.png">
+    <Content Include="Default.png">
       <Link>Default.png</Link>
     </Content>
   </ItemGroup>

+ 2 - 2
Draw2D/MonoGame.Samples.Draw2D.MacOS.csproj

@@ -71,8 +71,8 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <None Include="Info.MacOS.plist">
-      <Link>Info.plist</Link>
+    <None Include="Info.plist">
+      
     </None>
   </ItemGroup>
 </Project>

+ 8 - 8
Draw2D/MonoGame.Samples.Draw2D.Windows.csproj

@@ -32,10 +32,10 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
-    <Compile Include="..\..\iOS\Draw2D\FPSCounterComponent.cs">
+    <Compile Include="FPSCounterComponent.cs">
       <Link>FPSCounterComponent.cs</Link>
     </Compile>
-    <Compile Include="..\..\iOS\Draw2D\Game1.cs">
+    <Compile Include="Game1.cs">
       <Link>Game1.cs</Link>
     </Compile>
     <Compile Include="Program.cs" />
@@ -45,19 +45,19 @@
       <Link>SDL.dll</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="..\..\iOS\Draw2D\Content\monogameicon.png">
+    <Content Include="Content\monogameicon.png">
       <Link>Content\monogameicon.png</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="..\..\iOS\Draw2D\Content\purpleBall.xnb">
+    <Content Include="Content\purpleBall.xnb">
       <Link>Content\purpleBall.xnb</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="..\..\iOS\Draw2D\Content\spriteFont1.xnb">
+    <Content Include="Content\spriteFont1.xnb">
       <Link>Content\spriteFont1.xnb</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="..\..\iOS\Draw2D\Default.png">
+    <Content Include="Default.png">
       <Link>Default.png</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
@@ -67,12 +67,12 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
-    <Content Include="..\..\iOS\Draw2D\Default.png">
+    <Content Include="Default.png">
       <Link>Default.png</Link>
     </Content>
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\..\MonoGame.Framework\MonoGame.Framework.Windows.csproj">
+    <ProjectReference Include="..\..\MonoGame.Framework\MonoGame.Framework.Windows.csproj">
       <Project>{7DE47032-A904-4C29-BD22-2D235E8D91BA}</Project>
       <Name>MonoGame.Framework.Windows</Name>
     </ProjectReference>

+ 5 - 4
Draw2D/MonoGame.Samples.Draw2D.iOS.csproj

@@ -15,7 +15,7 @@
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
     <OutputPath>bin\iPhoneSimulator\Debug</OutputPath>
-    <DefineConstants>DEBUG;TEST1_1</DefineConstants>
+    <DefineConstants>IPHONE;DEBUG;TEST1_1</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <MtouchLink>None</MtouchLink>
@@ -33,13 +33,14 @@
     <MtouchI18n />
     <MtouchUseArmv7>false</MtouchUseArmv7>
     <AssemblyName>Draw2D</AssemblyName>
+    <DefineConstants>IPHONE;</DefineConstants>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|iPhone' ">
     <DebugSymbols>true</DebugSymbols>
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
     <OutputPath>bin\iPhone\Debug</OutputPath>
-    <DefineConstants>DEBUG;TEST1_1</DefineConstants>
+    <DefineConstants>IPHONE;DEBUG;TEST1_1</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <MtouchDebug>true</MtouchDebug>
@@ -106,10 +107,10 @@
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <ItemGroup>
     <None Include="monogameicon.png" />
-    <None Include="Info.plist" />
+    <None Include="Info.iOS.plist"><Link>Info.plist</Link></None>
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\..\MonoGame.Framework\MonoGame.Framework.iOS.csproj">
+    <ProjectReference Include="..\..\MonoGame.Framework\MonoGame.Framework.iOS.csproj">
       <Project>{DB8508BB-9849-4CC2-BC0F-8EB5DACB3C47}</Project>
       <Name>MonoGame.Framework.iOS</Name>
     </ProjectReference>

+ 26 - 1
Draw2D/main.cs

@@ -1,8 +1,14 @@
+#if MONOMAC
 using MonoMac.AppKit;
 using MonoMac.Foundation;
+#elif IPHONE
+using MonoTouch.Foundation;
+using MonoTouch.UIKit;
+#endif
 
 namespace Microsoft.Xna.Samples.Draw2D
 {
+#if MONOMAC
 	class Program
 	{
 		static void Main (string[] args)
@@ -35,5 +41,24 @@ namespace Microsoft.Xna.Samples.Draw2D
 		{
 			return true;
 		}
-	}	
+	}
+#elif IPHONE
+	[Register ("AppDelegate")]
+	class Program : UIApplicationDelegate 
+	{
+		private Game1 game;
+
+		public override void FinishedLaunching (UIApplication app)
+		{
+			// Fun begins..
+			game = new Game1();
+			game.Run();
+		}
+
+		static void Main (string [] args)
+		{
+			UIApplication.Main (args,null,"AppDelegate");
+		}
+	}
+#endif
 }

+ 2 - 2
GameComponents/MonoGame.Samples.GameComponents.iOS.csproj

@@ -102,10 +102,10 @@
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <ItemGroup>
     <None Include="monogameicon.png" />
-    <None Include="Info.plist" />
+    <None Include="Info.iOS.plist"><Link>Info.plist</Link></None>
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\..\MonoGame.Framework\MonoGame.Framework.iOS.csproj">
+    <ProjectReference Include="..\..\MonoGame.Framework\MonoGame.Framework.iOS.csproj">
       <Project>{DB8508BB-9849-4CC2-BC0F-8EB5DACB3C47}</Project>
       <Name>MonoGame.Framework.iOS</Name>
     </ProjectReference>

+ 70 - 122
GameStateManagement/Game.cs

@@ -10,130 +10,78 @@
 #region Using Statements
 using Microsoft.Xna.Framework;
 using Microsoft.Xna.Framework.Graphics;
+#endregion
 
-using MonoMac.Foundation;
-using MonoMac.AppKit;
-using MonoMac.ObjCRuntime;
+namespace Microsoft.Xna.Samples.GameStateManagement
+{
+    /// <summary>
+    /// Sample showing how to manage different game states, with transitions
+    /// between menu screens, a loading screen, the game itself, and a pause
+    /// menu. This main game class is extremely simple: all the interesting
+    /// stuff happens in the ScreenManager component.
+    /// </summary>
+    public class GameStateManagementGame : Game
+    {
+        #region Fields
 
-#endregion
+        GraphicsDeviceManager graphics;
+        ScreenManager screenManager;
 
+#if ZUNE
+        int BufferWidth = 272;
+        int BufferHeight = 480;
+#elif IPHONE
+        int BufferWidth = 320;
+        int BufferHeight = 480;
+#else
+        int BufferWidth = 272;
+        int BufferHeight = 480;
+#endif
+        #endregion
 
-namespace GameStateManagement
-{
-	/// <summary>
-	/// Sample showing how to manage different game states, with transitions
-	/// between menu screens, a loading screen, the game itself, and a pause
-	/// menu. This main game class is extremely simple: all the interesting
-	/// stuff happens in the ScreenManager component.
-	/// </summary>
-	public class GameStateManagementGame : Microsoft.Xna.Framework.Game
-	{
-	#region Fields
-
-		GraphicsDeviceManager graphics;
-		ScreenManager screenManager;
-
-
-		// By preloading any assets used by UI rendering, we avoid framerate glitches
-		// when they suddenly need to be loaded in the middle of a menu transition.
-		static readonly string[] preloadAssets = 
-	{
-		"gradient",
-	};
-
-
-	#endregion
-
-	#region Initialization
-
-
-		/// <summary>
-		/// The main game constructor.
-		/// </summary>
-		public GameStateManagementGame ()
-			{
-			Content.RootDirectory = "Content";
-
-			graphics = new GraphicsDeviceManager (this);
-			graphics.PreferredBackBufferWidth = 853;
-			graphics.PreferredBackBufferHeight = 480;
-
-			// Create the screen manager component.
-			screenManager = new ScreenManager (this);
-
-			Components.Add (screenManager);
-
-			// Activate the first screens.
-			screenManager.AddScreen (new BackgroundScreen (), null);
-			screenManager.AddScreen (new MainMenuScreen (), null);
-		}
-
-
-		/// <summary>
-		/// Loads graphics content.
-		/// </summary>
-		protected override void LoadContent ()
-		{
-			foreach (string asset in preloadAssets) {
-				Content.Load<object> (asset);
-			}
-		}
-
-
-	#endregion
-
-	#region Draw
-
-
-		/// <summary>
-		/// This is called when the game should draw itself.
-		/// </summary>
-		protected override void Draw (GameTime gameTime)
-		{
-			graphics.GraphicsDevice.Clear (Color.Black);
-
-			// The real drawing happens inside the screen manager component.
-			base.Draw (gameTime);
-		}
-
-
-	#endregion
-	}
-
-
-	#region Entry Point
-	static class Program
-	{
-		/// <summary>
-		/// The main entry point for the application.
-		/// </summary>
-		static void Main (string[] args)
-		{
-			NSApplication.Init ();
-			
-			using (var p = new NSAutoreleasePool ()) {
-				NSApplication.SharedApplication.Delegate = new AppDelegate();
-				NSApplication.Main(args);
-			}
-
-
-		}
-	}
-	
-	class AppDelegate : NSApplicationDelegate
-	{
-		GameStateManagementGame game;
-		public override void FinishedLaunching (MonoMac.Foundation.NSObject notification)
-		{
-			game = new GameStateManagementGame();
-			game.Run();
-		}
-		
-		public override bool ApplicationShouldTerminateAfterLastWindowClosed (NSApplication sender)
-		{
-			return true;
-		}
-	}	
-	
-	#endregion
+        #region Initialization
+
+
+        /// <summary>
+        /// The main game constructor.
+        /// </summary>
+        public GameStateManagementGame()
+        {
+            Content.RootDirectory = "Content";
+
+            graphics = new GraphicsDeviceManager(this);
+
+            graphics.PreferredBackBufferWidth = BufferWidth;
+            graphics.PreferredBackBufferHeight = BufferHeight;
+
+            // Create the screen manager component.
+            screenManager = new ScreenManager(this);
+
+            Components.Add(screenManager);
+
+            // Activate the first screens.
+            screenManager.AddScreen(new BackgroundScreen(), null);
+            screenManager.AddScreen(new MainMenuScreen(), null);
+        }
+
+
+        #endregion
+
+        #region Draw
+
+
+        /// <summary>
+        /// This is called when the game should draw itself.
+        /// </summary>
+        protected override void Draw(GameTime gameTime)
+        {
+            graphics.GraphicsDevice.Clear(Color.Black);
+
+            // The real drawing happens inside the screen manager component.
+            base.Draw(gameTime);
+        }
+
+
+        #endregion
+    }
 }

+ 1 - 1
GameStateManagement/GameStateManagement.MacOS.csproj

@@ -38,7 +38,7 @@
     <Reference Include="MonoMac" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="Info.plist" />
+    <None Include="Info.plist"></None>
     <None Include="Background.png" />
     <None Include="Game.ico" />
     <None Include="Content\background.png" />

+ 25 - 0
GameStateManagement/Info.iOS.plist

@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>CFBundleDisplayName</key>
+	<string>ChaseAndEvade</string>
+	<key>CFBundleIconFiles</key>
+	<array>
+		<string>GameThumbnail.png</string>
+	</array>
+	<key>CFBundleIdentifier</key>
+	<string>project.MonoGame.GameStateManagement</string>
+	<key>MinimumOSVersion</key>
+	<string>3.1</string>
+	<key>UIDeviceFamily</key>
+	<array>
+		<integer>1</integer>
+	</array>
+	<key>UISupportedInterfaceOrientations</key>
+	<array>
+		<string>UIInterfaceOrientationPortrait</string>
+		<string>UIInterfaceOrientationPortraitUpsideDown</string>
+	</array>
+</dict>
+</plist>

+ 0 - 0
GameStateManagement/Info.MacOS.plist → GameStateManagement/Info.plist


+ 147 - 0
GameStateManagement/MonoGame.Samples.GameStateManagement.iOS.csproj

@@ -0,0 +1,147 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+  <PropertyGroup>
+    <ProjectGuid>{B1A596F8-B26C-4826-99D1-94C9327AB586}</ProjectGuid>
+    <ProjectTypeGuids>{6BC8ED88-2882-458C-8E55-DFD12B67127B};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProductVersion>9.0.21022</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <OutputType>Exe</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>GameStateManagement</RootNamespace>
+    <Thumbnail>GameThumbnail.png</Thumbnail>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|iPhoneSimulator' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\iPhoneSimulator\Debug</OutputPath>
+    <DefineConstants>DEBUG;IPHONE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <CheckForOverflowUnderflow>true</CheckForOverflowUnderflow>
+    <MtouchLink>None</MtouchLink>
+    <MtouchDebug>true</MtouchDebug>
+    <MtouchI18n />
+    <MtouchUseArmv7>false</MtouchUseArmv7>
+    <AssemblyName>GameStateManagement</AssemblyName>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|iPhoneSimulator' ">
+    <DebugType>none</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\iPhoneSimulator\Release</OutputPath>
+    <ErrorReport>prompt</ErrorReport>
+    <DefineConstants>IPHONE</DefineConstants>
+    <WarningLevel>4</WarningLevel>
+    <MtouchI18n />
+    <MtouchUseArmv7>false</MtouchUseArmv7>
+    <AssemblyName>GameStateManagement</AssemblyName>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|iPhone' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\iPhone\Debug</OutputPath>
+    <DefineConstants>DEBUG;IPHONE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <MtouchDebug>true</MtouchDebug>
+    <MtouchI18n />
+    <MtouchSdkVersion>4.0</MtouchSdkVersion>
+    <MtouchUseArmv7>false</MtouchUseArmv7>
+    <AssemblyName>GameStateManagement</AssemblyName>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|iPhone' ">
+    <DebugType>none</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\iPhone\Release</OutputPath>
+    <DefineConstants>IPHONE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <MtouchI18n />
+    <CodesignKey>iPhone Developer</CodesignKey>
+    <MtouchSdkVersion>4.0</MtouchSdkVersion>
+    <MtouchUseArmv7>false</MtouchUseArmv7>
+    <AssemblyName>GameStateManagement</AssemblyName>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugType>none</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\Debug</OutputPath>
+    <WarningLevel>4</WarningLevel>
+    <AssemblyName>MonoGameSamplesGameStateManagement</AssemblyName>
+    <MtouchUseArmv7>false</MtouchUseArmv7>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>none</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\Release</OutputPath>
+    <WarningLevel>4</WarningLevel>
+    <AssemblyName>MonoGameSamplesGameStateManagement</AssemblyName>
+    <MtouchUseArmv7>false</MtouchUseArmv7>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="System" />
+    <Reference Include="System.Xml" />
+    <Reference Include="System.Core" />
+    <Reference Include="monotouch" />
+  </ItemGroup>
+  <ItemGroup>
+    <Folder Include="Content\" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="Game.cs" />
+    <Compile Include="Program.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="ScreenManager\GameScreen.cs" />
+    <Compile Include="ScreenManager\InputState.cs" />
+    <Compile Include="ScreenManager\ScreenManager.cs" />
+    <Compile Include="Screens\BackgroundScreen.cs" />
+    <Compile Include="Screens\GameplayScreen.cs" />
+    <Compile Include="Screens\LoadingScreen.cs" />
+    <Compile Include="Screens\MainMenuScreen.cs" />
+    <Compile Include="Screens\MenuEntry.cs" />
+    <Compile Include="Screens\MenuScreen.cs" />
+    <Compile Include="Screens\MessageBoxScreen.cs" />
+    <Compile Include="Screens\OptionsMenuScreen.cs" />
+    <Compile Include="Screens\PauseMenuScreen.cs" />
+    <Compile Include="Screens\PlayerIndexEventArgs.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="GameThumbnail.png" />
+    <None Include="Info.plist" />
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="Content\background.png">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Content\blank.png">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Default.png">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Content\gamefont.xnb">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Content\gradient.png">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Content\menufont.xnb" />
+  </ItemGroup>
+  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
+  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
+       Other similar extension points exist, see Microsoft.Common.targets.
+  <Target Name="BeforeBuild">
+  </Target>
+  <Target Name="AfterBuild">
+  </Target>
+  -->
+  <ItemGroup>
+    <ProjectReference Include="..\..\MonoGame.Framework\MonoGame.Framework.iOS.csproj">
+      <Project>{DB8508BB-9849-4CC2-BC0F-8EB5DACB3C47}</Project>
+      <Name>MonoGame.Framework.iOS</Name>
+    </ProjectReference>
+  </ItemGroup>
+</Project>

+ 10 - 10
GooCursor/GooCursor.Linux.csproj

@@ -34,43 +34,43 @@
     <Reference Include="System" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\..\MonoGame.Framework\MonoGame.Framework.Linux.csproj">
+    <ProjectReference Include="..\..\MonoGame.Framework\MonoGame.Framework.Linux.csproj">
       <Project>{35253CE1-C864-4CD3-8249-4D1319748E8F}</Project>
       <Name>MonoGame.Framework.Linux</Name>
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="..\..\MacOS\GooCursor\Cursor.cs">
+    <Compile Include="Cursor.cs">
       <Link>Cursor.cs</Link>
     </Compile>
-    <Compile Include="..\..\MacOS\GooCursor\Game1.cs">
+    <Compile Include="Game1.cs">
       <Link>Game1.cs</Link>
     </Compile>
     <Compile Include="Program.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="..\..\MacOS\GooCursor\Game.ico">
+    <None Include="Game.ico">
       <Link>Game.ico</Link>
     </None>
-    <None Include="..\..\MacOS\GooCursor\GameThumbnail.png">
+    <None Include="GameThumbnail.png">
       <Link>GameThumbnail.png</Link>
     </None>
-    <None Include="..\..\MacOS\GooCursor\Readme.md">
+    <None Include="Readme.md">
       <Link>Readme.md</Link>
     </None>
-    <None Include="..\..\MacOS\GooCursor\Content\SimpleFont.spritefont">
+    <None Include="Content\SimpleFont.spritefont">
       <Link>Content\SimpleFont.spritefont</Link>
     </None>
-    <None Include="..\..\MacOS\GooCursor\Content\cursor.bmp">
+    <None Include="Content\cursor.bmp">
       <Link>Content\cursor.bmp</Link>
     </None>
   </ItemGroup>
   <ItemGroup>
-    <Content Include="..\..\MacOS\GooCursor\Content\SimpleFont.xnb">
+    <Content Include="Content\SimpleFont.xnb">
       <Link>Content\SimpleFont.xnb</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="..\..\MacOS\GooCursor\Content\cursor.xnb">
+    <Content Include="Content\cursor.xnb">
       <Link>Content\cursor.xnb</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>

+ 1 - 1
GooCursor/GooCursor.MacOS.csproj

@@ -40,7 +40,7 @@
     <Reference Include="MonoMac" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="Info.plist" />
+    <None Include="Info.plist"></None>
     <None Include="Content\SimpleFont.spritefont" />
     <None Include="Content\cursor.bmp" />
     <None Include="Game.ico" />

+ 1 - 1
HoneycombRush/HoneycombRush.MacOS.csproj

@@ -38,7 +38,7 @@
     <Reference Include="MonoMac" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="Info.plist" />
+    <None Include="Info.plist"></None>
     <None Include="Background.png" />
     <None Include="Game.ico" />
     <None Include="GameThumbnail.png" />

+ 2 - 2
Input/MonoGame.Samples.Input.Android.csproj

@@ -65,7 +65,7 @@
       <Project>{565129E0-4EE5-4F6F-B403-C3484C9740BE}</Project>
       <Name>Lidgren.Network.Android</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\MonoGame.Framework\MonoGame.Framework.Android.csproj">
+    <ProjectReference Include="..\..\MonoGame.Framework\MonoGame.Framework.Android.csproj">
       <Project>{BA9476CF-99BA-4D03-92F2-73D2C5E58883}</Project>
       <Name>MonoGame.Framework.Android</Name>
     </ProjectReference>
@@ -77,7 +77,7 @@
     <None Include="Properties\AndroidManifest.xml" />
   </ItemGroup>
   <ItemGroup>
-    <AndroidAsset Include="..\..\iOS\Draw2D\Content\spriteFont1.xnb">
+    <AndroidAsset Include="Content\spriteFont1.xnb">
       <Link>Assets\Content\spriteFont1.xnb</Link>
     </AndroidAsset>
   </ItemGroup>

+ 3 - 4
Input/MonoGame.Samples.Input.iOS.csproj

@@ -63,17 +63,16 @@
     <Reference Include="OpenTK" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="Info.plist" />
+    <None Include="Info.iOS.plist"><Link>Info.plist</Link></None>
   </ItemGroup>
   <ItemGroup>
     <Compile Include="Main.cs" />
-    <Compile Include="..\..\Android\MonoGame.Samples.Input\Game1.cs">
-      <Link>Game1.cs</Link>
+    <Compile Include="Game1.cs">
     </Compile>
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <ItemGroup>
-    <ProjectReference Include="..\..\..\MonoGame.Framework\MonoGame.Framework.iOS.csproj">
+    <ProjectReference Include="..\..\MonoGame.Framework\MonoGame.Framework.iOS.csproj">
       <Project>{DB8508BB-9849-4CC2-BC0F-8EB5DACB3C47}</Project>
       <Name>MonoGame.Framework.iOS</Name>
     </ProjectReference>

+ 1 - 1
InputReporter/InputReporter.MacOS.csproj

@@ -38,7 +38,7 @@
     <Reference Include="MonoMac" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="Info.plist" />
+    <None Include="Info.plist"></None>
     <None Include="Game.ico" />
     <None Include="InputReporter.png" />
     <None Include="Content\Fonts\DataActiveFont.spritefont" />

+ 1 - 1
MonoGame.Samples.MacOS.sln

@@ -41,7 +41,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PerPixelCollisionSample.Mac
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RectangleCollisionSample.MacOS", "RectangleCollisionSample\RectangleCollisionSample.MacOS.csproj", "{466FBEF8-3AB2-4CED-92B6-6250CFD310DB}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SpriteEffects", "SpriteEffects\SpriteEffects.csproj", "{3B9ABB34-4D0F-4CFD-A02D-30D5569A060B}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SpriteEffects", "SpriteEffects\SpriteEffects.MacOS.csproj", "{3B9ABB34-4D0F-4CFD-A02D-30D5569A060B}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MonoGame.Samples.Tetris.MacOS", "Tetris\MonoGame.Samples.Tetris.MacOS.csproj", "{FE144248-B1ED-4A7C-980C-7A2E603CE604}"
 EndProject

+ 25 - 25
MonoGame.Samples.iOS.sln

@@ -5,53 +5,53 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Lidgren.Network.iOS", "..\T
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MonoGame.Framework.iOS", "..\MonoGame.Framework\MonoGame.Framework.iOS.csproj", "{DB8508BB-9849-4CC2-BC0F-8EB5DACB3C47}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MonoGame.Samples.Aiming", "iOS\Aiming\MonoGame.Samples.Aiming.csproj", "{E4C7960D-E564-4CD5-85D6-2B7B0B3DA5BA}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MonoGame.Samples.Aiming", "Aiming\MonoGame.Samples.Aiming.iOS.csproj", "{E4C7960D-E564-4CD5-85D6-2B7B0B3DA5BA}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MonoGame.Samples.BatteryStatus", "iOS\BatteryStatus\MonoGame.Samples.BatteryStatus.csproj", "{B1E27EDB-2AC5-4A8A-8FD2-29CEEBDF3344}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MonoGame.Samples.BatteryStatus", "BatteryStatus\MonoGame.Samples.BatteryStatus.iOS.csproj", "{B1E27EDB-2AC5-4A8A-8FD2-29CEEBDF3344}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MonoGame.Samples.BouncingBox", "iOS\BouncingBox\MonoGame.Samples.BouncingBox.csproj", "{F5FA28E2-53B2-482B-8723-71588DF50BB6}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MonoGame.Samples.BouncingBox", "BouncingBox\MonoGame.Samples.BouncingBox.iOS.csproj", "{F5FA28E2-53B2-482B-8723-71588DF50BB6}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MonoGame.Samples.ChaseAndEvade", "iOS\ChaseAndEvade\MonoGame.Samples.ChaseAndEvade.csproj", "{1557EE13-80AB-4E4C-9C10-9CBFC8E727C3}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MonoGame.Samples.ChaseAndEvade", "ChaseAndEvade\MonoGame.Samples.ChaseAndEvade.iOS.csproj", "{1557EE13-80AB-4E4C-9C10-9CBFC8E727C3}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MonoGame.Samples.Draw2D", "iOS\Draw2D\MonoGame.Samples.Draw2D.csproj", "{DEC435F4-9E84-490B-9890-72E5F514B8D0}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MonoGame.Samples.Draw2D", "Draw2D\MonoGame.Samples.Draw2D.iOS.csproj", "{DEC435F4-9E84-490B-9890-72E5F514B8D0}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MonoGame.Samples.GameComponents", "iOS\GameComponents\MonoGame.Samples.GameComponents.csproj", "{4F51EB5C-03A1-4488-8EEA-0E8F2411DB0C}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MonoGame.Samples.GameComponents", "GameComponents\MonoGame.Samples.GameComponents.iOS.csproj", "{4F51EB5C-03A1-4488-8EEA-0E8F2411DB0C}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MonoGame.Samples.GameStateManagement", "iOS\GameStateManagement\MonoGame.Samples.GameStateManagement.csproj", "{B1A596F8-B26C-4826-99D1-94C9327AB586}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MonoGame.Samples.GameStateManagement", "GameStateManagement\MonoGame.Samples.GameStateManagement.iOS.csproj", "{B1A596F8-B26C-4826-99D1-94C9327AB586}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MonoGame.Samples.MultiTouch", "iOS\MultiTouch\MonoGame.Samples.MultiTouch.csproj", "{DF8DF5E3-2FF4-46DD-9EE0-AE3C9923C6BA}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MonoGame.Samples.MultiTouch", "MultiTouch\MonoGame.Samples.MultiTouch.iOS.csproj", "{DF8DF5E3-2FF4-46DD-9EE0-AE3C9923C6BA}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MonoGame.Samples.ParticleSample", "iOS\ParticleSample\MonoGame.Samples.ParticleSample.csproj", "{4D0C3C5D-B4A5-4C6F-8756-4A05C50ECC3A}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MonoGame.Samples.ParticleSample", "ParticleSample\MonoGame.Samples.ParticleSample.iOS.csproj", "{4D0C3C5D-B4A5-4C6F-8756-4A05C50ECC3A}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MonoGame.Samples.Peer2Peer", "iOS\Peer2Peer\MonoGame.Samples.Peer2Peer.csproj", "{1217FD6D-AFF5-4A21-AA0C-0AE7F14B848F}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MonoGame.Samples.Peer2Peer", "Peer2PeerSample\MonoGame.Samples.Peer2Peer.iOS.csproj", "{1217FD6D-AFF5-4A21-AA0C-0AE7F14B848F}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MonoGame.Samples.PerPixelCollision", "iOS\PerPixelCollision\MonoGame.Samples.PerPixelCollision.csproj", "{CE342066-BCCD-4989-A401-0D36287276EF}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MonoGame.Samples.PerPixelCollision", "PerPixelCollisionSample\MonoGame.Samples.PerPixelCollision.iOS.csproj", "{CE342066-BCCD-4989-A401-0D36287276EF}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MonoGame.Samples.RectangleCollision", "iOS\RectangleCollision\MonoGame.Samples.RectangleCollision.csproj", "{BF785698-D6BF-465C-9089-B48B49D0377A}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MonoGame.Samples.RectangleCollision", "RectangleCollisionSample\MonoGame.Samples.RectangleCollision.iOS.csproj", "{BF785698-D6BF-465C-9089-B48B49D0377A}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MonoGame.Samples.RenderTarget2D", "iOS\RenderTarget2D\MonoGame.Samples.RenderTarget2D.csproj", "{0A404652-27C9-40AA-B037-5665BC725621}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MonoGame.Samples.RenderTarget2D", "RenderTarget2DSample\MonoGame.Samples.RenderTarget2D.iOS.csproj", "{0A404652-27C9-40AA-B037-5665BC725621}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MonoGame.Samples.RockRain", "iOS\RockRain\MonoGame.Samples.RockRain.csproj", "{6AD0E621-8D0C-42B1-A42C-B36F8537B234}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MonoGame.Samples.RockRain", "RockRain\MonoGame.Samples.RockRain.iOS.csproj", "{6AD0E621-8D0C-42B1-A42C-B36F8537B234}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MonoGame.Samples.SpriteFont", "iOS\SpriteFont\MonoGame.Samples.SpriteFont.csproj", "{327EE711-BA4F-40DA-AD4A-F69DD0B2FCFB}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MonoGame.Samples.SpriteFont", "SpriteFont\MonoGame.Samples.SpriteFont.iOS.csproj", "{327EE711-BA4F-40DA-AD4A-F69DD0B2FCFB}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MonoGame.Samples.TouchGesture", "iOS\TouchGesture\MonoGame.Samples.TouchGesture.csproj", "{58763B1D-A43F-4D2B-9279-DBA505C18B32}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MonoGame.Samples.TouchGesture", "TouchGesture\MonoGame.Samples.TouchGesture.iOS.csproj", "{58763B1D-A43F-4D2B-9279-DBA505C18B32}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MonoGame.Samples.TransformedCollision", "iOS\TransformedCollision\MonoGame.Samples.TransformedCollision.csproj", "{96F32BCF-B579-438B-A5DC-667BB9A5849C}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MonoGame.Samples.TransformedCollision", "TransformedCollisionSample\MonoGame.Samples.TransformedCollision.iOS.csproj", "{96F32BCF-B579-438B-A5DC-667BB9A5849C}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MonoGame.Samples.VirtualGamePad", "iOS\VirtualGamePad\MonoGame.Samples.VirtualGamePad.csproj", "{326DC8E8-649F-4F96-92BA-EE0EF51A32DB}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MonoGame.Samples.VirtualGamePad", "VirtualGamePad\MonoGame.Samples.VirtualGamePad.iOS.csproj", "{326DC8E8-649F-4F96-92BA-EE0EF51A32DB}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MonoGame.Samples.Waypoint", "iOS\Waypoint\MonoGame.Samples.Waypoint.csproj", "{75E860EE-EBF1-4BB4-AE39-9729900AFD39}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MonoGame.Samples.Waypoint", "Waypoint\MonoGame.Samples.Waypoint.iOS.csproj", "{75E860EE-EBF1-4BB4-AE39-9729900AFD39}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MonoGame.Samples.VideoPlayer", "iOS\VideoPlayer\MonoGame.Samples.VideoPlayer.csproj", "{D6A6EF59-928C-4DDB-AD8D-D85DD914BF82}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MonoGame.Samples.VideoPlayer", "VideoPlayer\MonoGame.Samples.VideoPlayer.iOS.csproj", "{D6A6EF59-928C-4DDB-AD8D-D85DD914BF82}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MonoGame.Samples.CatapultWars", "iOS\Catapults\MonoGame.Samples.CatapultWars.csproj", "{0FC9E0AB-3FC0-4593-970A-16FA6646CD6C}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MonoGame.Samples.CatapultWars", "CatapaultWars\MonoGame.Samples.CatapultWars.iOS.csproj", "{0FC9E0AB-3FC0-4593-970A-16FA6646CD6C}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MonoGame.Samples.Orientation", "iOS\Orientation\MonoGame.Samples.Orientation.csproj", "{DCE047E9-894F-4C5C-B972-835B62CDEB48}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MonoGame.Samples.Orientation", "Orientation\MonoGame.Samples.Orientation.iOS.csproj", "{DCE047E9-894F-4C5C-B972-835B62CDEB48}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MonoGame.Samples.Input", "iOS\Input\MonoGame.Samples.Input.csproj", "{5FFC1EED-2AD5-4C3C-9824-84D9991A1F30}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MonoGame.Samples.Input", "Input\MonoGame.Samples.Input.iOS.csproj", "{5FFC1EED-2AD5-4C3C-9824-84D9991A1F30}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MonoGame.Samples.CatapultNetWars", "iOS\Catapults\CatapultNetWars\MonoGame.Samples.CatapultNetWars.csproj", "{65DE6FC7-CB94-4E4F-8FBE-E3EA9A34967C}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MonoGame.Samples.CatapultNetWars", "CatapultNetWars\MonoGame.Samples.CatapultNetWars.iOS.csproj", "{65DE6FC7-CB94-4E4F-8FBE-E3EA9A34967C}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -369,6 +369,6 @@ Global
 		{F5FA28E2-53B2-482B-8723-71588DF50BB6}.Release|iPhoneSimulator.Build.0 = Release|iPhoneSimulator
 	EndGlobalSection
 	GlobalSection(MonoDevelopProperties) = preSolution
-		StartupItem = iOS\Draw2D\MonoGame.Samples.Draw2D.csproj
+		StartupItem = Draw2D\MonoGame.Samples.Draw2D.iOS.csproj
 	EndGlobalSection
 EndGlobal

+ 2 - 2
MultiTouch/MonoGame.Samples.MultiTouch.iOS.csproj

@@ -94,7 +94,7 @@
   </ItemGroup>
   <ItemGroup>
     <None Include="GameThumbnail.png" />
-    <None Include="Info.plist" />
+    <None Include="Info.iOS.plist"><Link>Info.plist</Link></None>
   </ItemGroup>
   <ItemGroup>
     <Content Include="Content\circle.png">
@@ -116,7 +116,7 @@
   </Target>
   -->
   <ItemGroup>
-    <ProjectReference Include="..\..\..\MonoGame.Framework\MonoGame.Framework.iOS.csproj">
+    <ProjectReference Include="..\..\MonoGame.Framework\MonoGame.Framework.iOS.csproj">
       <Project>{DB8508BB-9849-4CC2-BC0F-8EB5DACB3C47}</Project>
       <Name>MonoGame.Framework.iOS</Name>
     </ProjectReference>

+ 1 - 1
NetRumble/AudioManager.cs

@@ -79,7 +79,7 @@ namespace NetRumble
                 for (int i = 0; i < audioFileList.Length; i++)
                 {
                     string soundName = Path.GetFileNameWithoutExtension(audioFileList[i].Name);
-                    soundList[soundName] = game.Content.Load<SoundEffect>("audio\\wav\\"+ soundName);
+                    soundList[soundName] = game.Content.Load<SoundEffect>("Audio\\wav\\"+ soundName);
                     soundList[soundName].Name = soundName;
                 }
 

+ 0 - 49
NetRumble/Effects/BloomCombineEffect.cs

@@ -1,49 +0,0 @@
-using System;
-using System.IO;
-using System.Text;
-
-using Microsoft.Xna.Framework.Graphics;
-using Microsoft.Xna.Framework;
-
-using MonoMac.Foundation;
-using MonoMac.AppKit;
-
-namespace NetRumble
-{
-	public class BloomCombineEffect : Effect
-	{
-		public BloomCombineEffect (GraphicsDevice graphicsDevice) : base (graphicsDevice)
-		{
-			// We do not need this but here for test
-			LoadShaderFromFile ("BloomPostprocess/Effects/BloomCombine.fsh");
-			
-			DefineTechnique ("BloomCombine", "Pass1", 0, 0);
-			CurrentTechnique = Techniques ["BloomCombine"];
-		}
-
-		protected void LoadShaderFromFile (string sourceFile)
-		{
-			var path = Path.Combine (NSBundle.MainBundle.ResourcePath, "Content");
-			sourceFile = Path.Combine (path, sourceFile);
-
-			// Load the source into a string
-			string shaderSource = LoadShaderSource (sourceFile);
-
-			CreateFragmentShaderFromSource (shaderSource);				
-
-		}
-
-		// Load the source code of a GLSL program from the content
-		private string LoadShaderSource (string name)
-		{
-
-			StreamReader streamReader = new StreamReader (name);
-			string text = streamReader.ReadToEnd ();
-			streamReader.Close ();
-
-			return text;
-
-		}
-	}
-}
-

+ 0 - 49
NetRumble/Effects/BloomExtractEffect.cs

@@ -1,49 +0,0 @@
-using System;
-using System.IO;
-using System.Text;
-
-using Microsoft.Xna.Framework.Graphics;
-using Microsoft.Xna.Framework;
-
-using MonoMac.Foundation;
-using MonoMac.AppKit;
-
-namespace NetRumble
-{
-	public class BloomExtractEffect : Effect
-	{
-		public BloomExtractEffect (GraphicsDevice graphicsDevice) : base (graphicsDevice)
-		{
-			// We do not need this but here for test
-			LoadShaderFromFile ("BloomPostprocess/Effects/BloomExtract.fsh");
-			
-			DefineTechnique ("Technique1", "Pass1", 0, 0);
-			CurrentTechnique = Techniques ["Technique1"];
-		}
-
-		protected void LoadShaderFromFile (string sourceFile)
-		{
-			var path = Path.Combine (NSBundle.MainBundle.ResourcePath, "Content");
-			sourceFile = Path.Combine (path, sourceFile);
-
-			// Load the source into a string
-			string shaderSource = LoadShaderSource (sourceFile);
-
-			CreateFragmentShaderFromSource (shaderSource);				
-
-		}
-
-		// Load the source code of a GLSL program from the content
-		private string LoadShaderSource (string name)
-		{
-
-			StreamReader streamReader = new StreamReader (name);
-			string text = streamReader.ReadToEnd ();
-			streamReader.Close ();
-
-			return text;
-
-		}
-	}
-}
-

+ 0 - 49
NetRumble/Effects/CloudsEffect.cs

@@ -1,49 +0,0 @@
-using System;
-using System.IO;
-using System.Text;
-
-using Microsoft.Xna.Framework.Graphics;
-using Microsoft.Xna.Framework;
-
-using MonoMac.Foundation;
-using MonoMac.AppKit;
-
-namespace NetRumble
-{
-	public class CloudsEffect : Effect
-	{
-		public CloudsEffect (GraphicsDevice graphicsDevice) : base (graphicsDevice)
-		{
-			// We do not need this but here for test
-			LoadShaderFromFile ("Effects/Clouds.fsh");
-			
-			DefineTechnique ("Technique1", "Pass1", 0, 0);
-			CurrentTechnique = Techniques ["Technique1"];
-		}
-
-		protected void LoadShaderFromFile (string sourceFile)
-		{
-			var path = Path.Combine (NSBundle.MainBundle.ResourcePath, "Content");
-			sourceFile = Path.Combine (path, sourceFile);
-
-			// Load the source into a string
-			string shaderSource = LoadShaderSource (sourceFile);
-
-			CreateFragmentShaderFromSource (shaderSource);				
-
-		}
-
-		// Load the source code of a GLSL program from the content
-		private string LoadShaderSource (string name)
-		{
-
-			StreamReader streamReader = new StreamReader (name);
-			string text = streamReader.ReadToEnd ();
-			streamReader.Close ();
-
-			return text;
-
-		}
-	}
-}
-

+ 0 - 49
NetRumble/Effects/GaussianBlurEffect.cs

@@ -1,49 +0,0 @@
-using System;
-using System.IO;
-using System.Text;
-
-using Microsoft.Xna.Framework.Graphics;
-using Microsoft.Xna.Framework;
-
-using MonoMac.Foundation;
-using MonoMac.AppKit;
-
-namespace NetRumble
-{
-	public class GaussianBlurEffect : Effect
-	{
-		public GaussianBlurEffect (GraphicsDevice graphicsDevice) : base (graphicsDevice)
-		{
-			// We do not need this but here for test
-			LoadShaderFromFile ("BloomPostprocess/Effects/GaussianBlur.fsh");
-			
-			DefineTechnique ("Technique1", "Pass1", 0, 0);
-			CurrentTechnique = Techniques ["Technique1"];
-		}
-
-		protected void LoadShaderFromFile (string sourceFile)
-		{
-			var path = Path.Combine (NSBundle.MainBundle.ResourcePath, "Content");
-			sourceFile = Path.Combine (path, sourceFile);
-
-			// Load the source into a string
-			string shaderSource = LoadShaderSource (sourceFile);
-
-			CreateFragmentShaderFromSource (shaderSource);				
-
-		}
-
-		// Load the source code of a GLSL program from the content
-		private string LoadShaderSource (string name)
-		{
-
-			StreamReader streamReader = new StreamReader (name);
-			string text = streamReader.ReadToEnd ();
-			streamReader.Close ();
-
-			return text;
-
-		}
-	}
-}
-

+ 172 - 172
NetRumble/MonoGame.Samples.NetRumble.Linux.csproj

@@ -39,334 +39,334 @@
     <Reference Include="System.XML" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="..\..\MacOS\NetRumble\Info.plist">
+    <None Include="Info.plist">
       <Link>Info.plist</Link>
     </None>
-    <None Include="..\..\MacOS\NetRumble\GameThumbnail.png">
+    <None Include="GameThumbnail.png">
       <Link>GameThumbnail.png</Link>
     </None>
-    <None Include="..\..\MacOS\NetRumble\Game.ico">
+    <None Include="Game.ico">
       <Link>Game.ico</Link>
     </None>
-    <None Include="..\..\MacOS\NetRumble\Content\One Step Beyond.wma">
+    <None Include="Content\One Step Beyond.wma">
       <Link>Content\One Step Beyond.wma</Link>
     </None>
-    <None Include="..\..\MacOS\NetRumble\Content\Textures\title.png">
+    <None Include="Content\Textures\title.png">
       <Link>Content\Textures\title.png</Link>
     </None>
-    <None Include="..\..\MacOS\NetRumble\Content\Textures\shipShields.png">
+    <None Include="Content\Textures\shipShields.png">
       <Link>Content\Textures\shipShields.png</Link>
     </None>
-    <None Include="..\..\MacOS\NetRumble\Content\Textures\ship3Overlay.png">
+    <None Include="Content\Textures\ship3Overlay.png">
       <Link>Content\Textures\ship3Overlay.png</Link>
     </None>
-    <None Include="..\..\MacOS\NetRumble\Content\Textures\ship3.png">
+    <None Include="Content\Textures\ship3.png">
       <Link>Content\Textures\ship3.png</Link>
     </None>
-    <None Include="..\..\MacOS\NetRumble\Content\Textures\ship2Overlay.png">
+    <None Include="Content\Textures\ship2Overlay.png">
       <Link>Content\Textures\ship2Overlay.png</Link>
     </None>
-    <None Include="..\..\MacOS\NetRumble\Content\Textures\ship2.png">
+    <None Include="Content\Textures\ship2.png">
       <Link>Content\Textures\ship2.png</Link>
     </None>
-    <None Include="..\..\MacOS\NetRumble\Content\Textures\ship1Overlay.png">
+    <None Include="Content\Textures\ship1Overlay.png">
       <Link>Content\Textures\ship1Overlay.png</Link>
     </None>
-    <None Include="..\..\MacOS\NetRumble\Content\Textures\ship1.png">
+    <None Include="Content\Textures\ship1.png">
       <Link>Content\Textures\ship1.png</Link>
     </None>
-    <None Include="..\..\MacOS\NetRumble\Content\Textures\ship0Overlay.png">
+    <None Include="Content\Textures\ship0Overlay.png">
       <Link>Content\Textures\ship0Overlay.png</Link>
     </None>
-    <None Include="..\..\MacOS\NetRumble\Content\Textures\ship0.png">
+    <None Include="Content\Textures\ship0.png">
       <Link>Content\Textures\ship0.png</Link>
     </None>
-    <None Include="..\..\MacOS\NetRumble\Content\Textures\rocket.png">
+    <None Include="Content\Textures\rocket.png">
       <Link>Content\Textures\rocket.png</Link>
     </None>
-    <None Include="..\..\MacOS\NetRumble\Content\Textures\ready.png">
+    <None Include="Content\Textures\ready.png">
       <Link>Content\Textures\ready.png</Link>
     </None>
-    <None Include="..\..\MacOS\NetRumble\Content\Textures\powerupTripleLaser.png">
+    <None Include="Content\Textures\powerupTripleLaser.png">
       <Link>Content\Textures\powerupTripleLaser.png</Link>
     </None>
-    <None Include="..\..\MacOS\NetRumble\Content\Textures\powerupRocket.png">
+    <None Include="Content\Textures\powerupRocket.png">
       <Link>Content\Textures\powerupRocket.png</Link>
     </None>
-    <None Include="..\..\MacOS\NetRumble\Content\Textures\powerupDoubleLaser.png">
+    <None Include="Content\Textures\powerupDoubleLaser.png">
       <Link>Content\Textures\powerupDoubleLaser.png</Link>
     </None>
-    <None Include="..\..\MacOS\NetRumble\Content\Textures\mine.png">
+    <None Include="Content\Textures\mine.png">
       <Link>Content\Textures\mine.png</Link>
     </None>
-    <None Include="..\..\MacOS\NetRumble\Content\Textures\laser.png">
+    <None Include="Content\Textures\laser.png">
       <Link>Content\Textures\laser.png</Link>
     </None>
-    <None Include="..\..\MacOS\NetRumble\Content\Textures\explosion.png">
+    <None Include="Content\Textures\explosion.png">
       <Link>Content\Textures\explosion.png</Link>
     </None>
-    <None Include="..\..\MacOS\NetRumble\Content\Textures\clouds.png">
+    <None Include="Content\Textures\clouds.png">
       <Link>Content\Textures\clouds.png</Link>
     </None>
-    <None Include="..\..\MacOS\NetRumble\Content\Textures\chatTalking.png">
+    <None Include="Content\Textures\chatTalking.png">
       <Link>Content\Textures\chatTalking.png</Link>
     </None>
-    <None Include="..\..\MacOS\NetRumble\Content\Textures\chatMute.png">
+    <None Include="Content\Textures\chatMute.png">
       <Link>Content\Textures\chatMute.png</Link>
     </None>
-    <None Include="..\..\MacOS\NetRumble\Content\Textures\chatAble.png">
+    <None Include="Content\Textures\chatAble.png">
       <Link>Content\Textures\chatAble.png</Link>
     </None>
-    <None Include="..\..\MacOS\NetRumble\Content\Textures\blank.png">
+    <None Include="Content\Textures\blank.png">
       <Link>Content\Textures\blank.png</Link>
     </None>
-    <None Include="..\..\MacOS\NetRumble\Content\Textures\barrierRed.png">
+    <None Include="Content\Textures\barrierRed.png">
       <Link>Content\Textures\barrierRed.png</Link>
     </None>
-    <None Include="..\..\MacOS\NetRumble\Content\Textures\barrierPurple.png">
+    <None Include="Content\Textures\barrierPurple.png">
       <Link>Content\Textures\barrierPurple.png</Link>
     </None>
-    <None Include="..\..\MacOS\NetRumble\Content\Textures\barrierEnd.png">
+    <None Include="Content\Textures\barrierEnd.png">
       <Link>Content\Textures\barrierEnd.png</Link>
     </None>
-    <None Include="..\..\MacOS\NetRumble\Content\Textures\asteroid2.png">
+    <None Include="Content\Textures\asteroid2.png">
       <Link>Content\Textures\asteroid2.png</Link>
     </None>
-    <None Include="..\..\MacOS\NetRumble\Content\Textures\asteroid1.png">
+    <None Include="Content\Textures\asteroid1.png">
       <Link>Content\Textures\asteroid1.png</Link>
     </None>
-    <None Include="..\..\MacOS\NetRumble\Content\Textures\asteroid0.png">
+    <None Include="Content\Textures\asteroid0.png">
       <Link>Content\Textures\asteroid0.png</Link>
     </None>
-    <None Include="..\..\MacOS\NetRumble\Content\Textures\Particles\defaultParticle.PNG">
+    <None Include="Content\Textures\Particles\defaultParticle.PNG">
       <Link>Content\Textures\Particles\defaultParticle.PNG</Link>
     </None>
-    <None Include="..\..\MacOS\NetRumble\Content\Textures\Particles\particle.png">
+    <None Include="Content\Textures\Particles\particle.png">
       <Link>Content\Textures\Particles\particle.png</Link>
     </None>
-    <None Include="..\..\MacOS\NetRumble\Content\Textures\Particles\smoke.png">
+    <None Include="Content\Textures\Particles\smoke.png">
       <Link>Content\Textures\Particles\smoke.png</Link>
     </None>
-    <None Include="..\..\MacOS\NetRumble\Content\Textures\Particles\spark.png">
+    <None Include="Content\Textures\Particles\spark.png">
       <Link>Content\Textures\Particles\spark.png</Link>
     </None>
-    <None Include="..\..\MacOS\NetRumble\Content\Fonts\NetRumbleFont.png">
+    <None Include="Content\Fonts\NetRumbleFont.png">
       <Link>Content\Fonts\NetRumbleFont.png</Link>
     </None>
-    <None Include="..\..\MacOS\NetRumble\Content\Fonts\MessageBox.spritefont">
+    <None Include="Content\Fonts\MessageBox.spritefont">
       <Link>Content\Fonts\MessageBox.spritefont</Link>
     </None>
-    <None Include="..\..\MacOS\NetRumble\Content\Fonts\MenuFont.spritefont">
+    <None Include="Content\Fonts\MenuFont.spritefont">
       <Link>Content\Fonts\MenuFont.spritefont</Link>
     </None>
-    <None Include="..\..\MacOS\NetRumble\Content\BloomPostprocess\Effects\BloomCombine.fx">
+    <None Include="Content\BloomPostprocess\Effects\BloomCombine.fx">
       <Link>Content\BloomPostprocess\Effects\BloomCombine.fx</Link>
     </None>
-    <None Include="..\..\MacOS\NetRumble\Content\BloomPostprocess\Effects\BloomCombine.xnb">
+    <None Include="Content\BloomPostprocess\Effects\BloomCombine.xnb">
       <Link>Content\BloomPostprocess\Effects\BloomCombine.xnb</Link>
     </None>
-    <None Include="..\..\MacOS\NetRumble\Content\BloomPostprocess\Effects\BloomExtract.fx">
+    <None Include="Content\BloomPostprocess\Effects\BloomExtract.fx">
       <Link>Content\BloomPostprocess\Effects\BloomExtract.fx</Link>
     </None>
-    <None Include="..\..\MacOS\NetRumble\Content\BloomPostprocess\Effects\BloomExtract.xnb">
+    <None Include="Content\BloomPostprocess\Effects\BloomExtract.xnb">
       <Link>Content\BloomPostprocess\Effects\BloomExtract.xnb</Link>
     </None>
-    <None Include="..\..\MacOS\NetRumble\Content\BloomPostprocess\Effects\GaussianBlur.fx">
+    <None Include="Content\BloomPostprocess\Effects\GaussianBlur.fx">
       <Link>Content\BloomPostprocess\Effects\GaussianBlur.fx</Link>
     </None>
-    <None Include="..\..\MacOS\NetRumble\Content\BloomPostprocess\Effects\GaussianBlur.xnb">
+    <None Include="Content\BloomPostprocess\Effects\GaussianBlur.xnb">
       <Link>Content\BloomPostprocess\Effects\GaussianBlur.xnb</Link>
     </None>
-    <None Include="..\..\MacOS\NetRumble\Content\Audio\wav\rocket.wav">
+    <None Include="Content\Audio\wav\rocket.wav">
       <Link>Content\Audio\wav\rocket.wav</Link>
     </None>
-    <None Include="..\..\MacOS\NetRumble\Content\Audio\wav\powerup_touch.wav">
+    <None Include="Content\Audio\wav\powerup_touch.wav">
       <Link>Content\Audio\wav\powerup_touch.wav</Link>
     </None>
-    <None Include="..\..\MacOS\NetRumble\Content\Audio\wav\powerup_spawn.wav">
+    <None Include="Content\Audio\wav\powerup_spawn.wav">
       <Link>Content\Audio\wav\powerup_spawn.wav</Link>
     </None>
-    <None Include="..\..\MacOS\NetRumble\Content\Audio\wav\player_spawn.wav">
+    <None Include="Content\Audio\wav\player_spawn.wav">
       <Link>Content\Audio\wav\player_spawn.wav</Link>
     </None>
-    <None Include="..\..\MacOS\NetRumble\Content\Audio\wav\menu_select.wav">
+    <None Include="Content\Audio\wav\menu_select.wav">
       <Link>Content\Audio\wav\menu_select.wav</Link>
     </None>
-    <None Include="..\..\MacOS\NetRumble\Content\Audio\wav\menu_scroll.wav">
+    <None Include="Content\Audio\wav\menu_scroll.wav">
       <Link>Content\Audio\wav\menu_scroll.wav</Link>
     </None>
-    <None Include="..\..\MacOS\NetRumble\Content\Audio\wav\fire_rocket2.wav">
+    <None Include="Content\Audio\wav\fire_rocket2.wav">
       <Link>Content\Audio\wav\fire_rocket2.wav</Link>
     </None>
-    <None Include="..\..\MacOS\NetRumble\Content\Audio\wav\fire_rocket1.wav">
+    <None Include="Content\Audio\wav\fire_rocket1.wav">
       <Link>Content\Audio\wav\fire_rocket1.wav</Link>
     </None>
-    <None Include="..\..\MacOS\NetRumble\Content\Audio\wav\fire_laser3.wav">
+    <None Include="Content\Audio\wav\fire_laser3.wav">
       <Link>Content\Audio\wav\fire_laser3.wav</Link>
     </None>
-    <None Include="..\..\MacOS\NetRumble\Content\Audio\wav\fire_laser2.wav">
+    <None Include="Content\Audio\wav\fire_laser2.wav">
       <Link>Content\Audio\wav\fire_laser2.wav</Link>
     </None>
-    <None Include="..\..\MacOS\NetRumble\Content\Audio\wav\fire_laser1.wav">
+    <None Include="Content\Audio\wav\fire_laser1.wav">
       <Link>Content\Audio\wav\fire_laser1.wav</Link>
     </None>
-    <None Include="..\..\MacOS\NetRumble\Content\Audio\wav\explosion_shockwave.wav">
+    <None Include="Content\Audio\wav\explosion_shockwave.wav">
       <Link>Content\Audio\wav\explosion_shockwave.wav</Link>
     </None>
-    <None Include="..\..\MacOS\NetRumble\Content\Audio\wav\explosion_medium.wav">
+    <None Include="Content\Audio\wav\explosion_medium.wav">
       <Link>Content\Audio\wav\explosion_medium.wav</Link>
     </None>
-    <None Include="..\..\MacOS\NetRumble\Content\Audio\wav\explosion_large.wav">
+    <None Include="Content\Audio\wav\explosion_large.wav">
       <Link>Content\Audio\wav\explosion_large.wav</Link>
     </None>
-    <None Include="..\..\MacOS\NetRumble\Content\Audio\wav\asteroid_touch.wav">
+    <None Include="Content\Audio\wav\asteroid_touch.wav">
       <Link>Content\Audio\wav\asteroid_touch.wav</Link>
     </None>
-    <None Include="..\..\MacOS\NetRumble\Content\Effects\Clouds.fx">
+    <None Include="Content\Effects\Clouds.fx">
       <Link>Content\Effects\Clouds.fx</Link>
     </None>
-    <None Include="..\..\MacOS\NetRumble\Content\Effects\Clouds.xnb">
+    <None Include="Content\Effects\Clouds.xnb">
       <Link>Content\Effects\Clouds.xnb</Link>
     </None>
   </ItemGroup>
   <ItemGroup>
     <Compile Include="Program.cs" />
-    <Compile Include="..\..\MacOS\NetRumble\RandomMath.cs">
+    <Compile Include="RandomMath.cs">
       <Link>RandomMath.cs</Link>
     </Compile>
-    <Compile Include="..\..\MacOS\NetRumble\OperationCompletedEventArgs.cs">
+    <Compile Include="OperationCompletedEventArgs.cs">
       <Link>OperationCompletedEventArgs.cs</Link>
     </Compile>
-    <Compile Include="..\..\MacOS\NetRumble\NetRumbleGame.cs">
+    <Compile Include="NetRumbleGame.cs">
       <Link>NetRumbleGame.cs</Link>
     </Compile>
-    <Compile Include="..\..\MacOS\NetRumble\CollisionMath.cs">
+    <Compile Include="CollisionMath.cs">
       <Link>CollisionMath.cs</Link>
     </Compile>
-    <Compile Include="..\..\MacOS\NetRumble\BatchRemovalCollection.cs">
+    <Compile Include="BatchRemovalCollection.cs">
       <Link>BatchRemovalCollection.cs</Link>
     </Compile>
-    <Compile Include="..\..\MacOS\NetRumble\Screens\SearchResultsScreen.cs">
+    <Compile Include="Screens\SearchResultsScreen.cs">
       <Link>Screens\SearchResultsScreen.cs</Link>
     </Compile>
-    <Compile Include="..\..\MacOS\NetRumble\Screens\NetworkBusyScreen.cs">
+    <Compile Include="Screens\NetworkBusyScreen.cs">
       <Link>Screens\NetworkBusyScreen.cs</Link>
     </Compile>
-    <Compile Include="..\..\MacOS\NetRumble\Screens\MainMenuScreen.cs">
+    <Compile Include="Screens\MainMenuScreen.cs">
       <Link>Screens\MainMenuScreen.cs</Link>
     </Compile>
-    <Compile Include="..\..\MacOS\NetRumble\Screens\LobbyScreen.cs">
+    <Compile Include="Screens\LobbyScreen.cs">
       <Link>Screens\LobbyScreen.cs</Link>
     </Compile>
-    <Compile Include="..\..\MacOS\NetRumble\Screens\GameplayScreen.cs">
+    <Compile Include="Screens\GameplayScreen.cs">
       <Link>Screens\GameplayScreen.cs</Link>
     </Compile>
-    <Compile Include="..\..\MacOS\NetRumble\Screens\BackgroundScreen.cs">
+    <Compile Include="Screens\BackgroundScreen.cs">
       <Link>Screens\BackgroundScreen.cs</Link>
     </Compile>
-    <Compile Include="..\..\MacOS\NetRumble\ScreenManager\ScreenManager.cs">
+    <Compile Include="ScreenManager\ScreenManager.cs">
       <Link>ScreenManager\ScreenManager.cs</Link>
     </Compile>
-    <Compile Include="..\..\MacOS\NetRumble\ScreenManager\MessageBoxScreen.cs">
+    <Compile Include="ScreenManager\MessageBoxScreen.cs">
       <Link>ScreenManager\MessageBoxScreen.cs</Link>
     </Compile>
-    <Compile Include="..\..\MacOS\NetRumble\ScreenManager\MenuScreen.cs">
+    <Compile Include="ScreenManager\MenuScreen.cs">
       <Link>ScreenManager\MenuScreen.cs</Link>
     </Compile>
-    <Compile Include="..\..\MacOS\NetRumble\ScreenManager\LoadingScreen.cs">
+    <Compile Include="ScreenManager\LoadingScreen.cs">
       <Link>ScreenManager\LoadingScreen.cs</Link>
     </Compile>
-    <Compile Include="..\..\MacOS\NetRumble\ScreenManager\InputState.cs">
+    <Compile Include="ScreenManager\InputState.cs">
       <Link>ScreenManager\InputState.cs</Link>
     </Compile>
-    <Compile Include="..\..\MacOS\NetRumble\ScreenManager\GameScreen.cs">
+    <Compile Include="ScreenManager\GameScreen.cs">
       <Link>ScreenManager\GameScreen.cs</Link>
     </Compile>
-    <Compile Include="..\..\MacOS\NetRumble\Rendering\Particles\ParticleSystem.cs">
+    <Compile Include="Rendering\Particles\ParticleSystem.cs">
       <Link>Rendering\Particles\ParticleSystem.cs</Link>
     </Compile>
-    <Compile Include="..\..\MacOS\NetRumble\Rendering\Particles\ParticleEffectType.cs">
+    <Compile Include="Rendering\Particles\ParticleEffectType.cs">
       <Link>Rendering\Particles\ParticleEffectType.cs</Link>
     </Compile>
-    <Compile Include="..\..\MacOS\NetRumble\Rendering\Particles\ParticleEffectManager.cs">
+    <Compile Include="Rendering\Particles\ParticleEffectManager.cs">
       <Link>Rendering\Particles\ParticleEffectManager.cs</Link>
     </Compile>
-    <Compile Include="..\..\MacOS\NetRumble\Rendering\Particles\ParticleEffect.cs">
+    <Compile Include="Rendering\Particles\ParticleEffect.cs">
       <Link>Rendering\Particles\ParticleEffect.cs</Link>
     </Compile>
-    <Compile Include="..\..\MacOS\NetRumble\Rendering\Particles\ParticleCache.cs">
+    <Compile Include="Rendering\Particles\ParticleCache.cs">
       <Link>Rendering\Particles\ParticleCache.cs</Link>
     </Compile>
-    <Compile Include="..\..\MacOS\NetRumble\Rendering\Particles\Particle.cs">
+    <Compile Include="Rendering\Particles\Particle.cs">
       <Link>Rendering\Particles\Particle.cs</Link>
     </Compile>
-    <Compile Include="..\..\MacOS\NetRumble\Gameplay\World.cs">
+    <Compile Include="Gameplay\World.cs">
       <Link>Gameplay\World.cs</Link>
     </Compile>
-    <Compile Include="..\..\MacOS\NetRumble\Gameplay\ShipInput.cs">
+    <Compile Include="Gameplay\ShipInput.cs">
       <Link>Gameplay\ShipInput.cs</Link>
     </Compile>
-    <Compile Include="..\..\MacOS\NetRumble\Gameplay\Ship.cs">
+    <Compile Include="Gameplay\Ship.cs">
       <Link>Gameplay\Ship.cs</Link>
     </Compile>
-    <Compile Include="..\..\MacOS\NetRumble\Gameplay\PlayerData.cs">
+    <Compile Include="Gameplay\PlayerData.cs">
       <Link>Gameplay\PlayerData.cs</Link>
     </Compile>
-    <Compile Include="..\..\MacOS\NetRumble\Gameplay\GameplayObject.cs">
+    <Compile Include="Gameplay\GameplayObject.cs">
       <Link>Gameplay\GameplayObject.cs</Link>
     </Compile>
-    <Compile Include="..\..\MacOS\NetRumble\Gameplay\CollisionManager.cs">
+    <Compile Include="Gameplay\CollisionManager.cs">
       <Link>Gameplay\CollisionManager.cs</Link>
     </Compile>
-    <Compile Include="..\..\MacOS\NetRumble\Gameplay\Asteroid.cs">
+    <Compile Include="Gameplay\Asteroid.cs">
       <Link>Gameplay\Asteroid.cs</Link>
     </Compile>
-    <Compile Include="..\..\MacOS\NetRumble\Gameplay\PowerUps\TripleLaserPowerUp.cs">
+    <Compile Include="Gameplay\PowerUps\TripleLaserPowerUp.cs">
       <Link>Gameplay\PowerUps\TripleLaserPowerUp.cs</Link>
     </Compile>
-    <Compile Include="..\..\MacOS\NetRumble\Gameplay\PowerUps\RocketPowerUp.cs">
+    <Compile Include="Gameplay\PowerUps\RocketPowerUp.cs">
       <Link>Gameplay\PowerUps\RocketPowerUp.cs</Link>
     </Compile>
-    <Compile Include="..\..\MacOS\NetRumble\Gameplay\PowerUps\PowerUp.cs">
+    <Compile Include="Gameplay\PowerUps\PowerUp.cs">
       <Link>Gameplay\PowerUps\PowerUp.cs</Link>
     </Compile>
-    <Compile Include="..\..\MacOS\NetRumble\Gameplay\PowerUps\DoubleLaserPowerUp.cs">
+    <Compile Include="Gameplay\PowerUps\DoubleLaserPowerUp.cs">
       <Link>Gameplay\PowerUps\DoubleLaserPowerUp.cs</Link>
     </Compile>
-    <Compile Include="..\..\MacOS\NetRumble\Gameplay\Projectiles\RocketProjectile.cs">
+    <Compile Include="Gameplay\Projectiles\RocketProjectile.cs">
       <Link>Gameplay\Projectiles\RocketProjectile.cs</Link>
     </Compile>
-    <Compile Include="..\..\MacOS\NetRumble\Gameplay\Projectiles\Projectile.cs">
+    <Compile Include="Gameplay\Projectiles\Projectile.cs">
       <Link>Gameplay\Projectiles\Projectile.cs</Link>
     </Compile>
-    <Compile Include="..\..\MacOS\NetRumble\Gameplay\Projectiles\MineProjectile.cs">
+    <Compile Include="Gameplay\Projectiles\MineProjectile.cs">
       <Link>Gameplay\Projectiles\MineProjectile.cs</Link>
     </Compile>
-    <Compile Include="..\..\MacOS\NetRumble\Gameplay\Projectiles\LaserProjectile.cs">
+    <Compile Include="Gameplay\Projectiles\LaserProjectile.cs">
       <Link>Gameplay\Projectiles\LaserProjectile.cs</Link>
     </Compile>
-    <Compile Include="..\..\MacOS\NetRumble\Gameplay\Weapons\Weapon.cs">
+    <Compile Include="Gameplay\Weapons\Weapon.cs">
       <Link>Gameplay\Weapons\Weapon.cs</Link>
     </Compile>
-    <Compile Include="..\..\MacOS\NetRumble\Gameplay\Weapons\TripleLaserWeapon.cs">
+    <Compile Include="Gameplay\Weapons\TripleLaserWeapon.cs">
       <Link>Gameplay\Weapons\TripleLaserWeapon.cs</Link>
     </Compile>
-    <Compile Include="..\..\MacOS\NetRumble\Gameplay\Weapons\RocketWeapon.cs">
+    <Compile Include="Gameplay\Weapons\RocketWeapon.cs">
       <Link>Gameplay\Weapons\RocketWeapon.cs</Link>
     </Compile>
-    <Compile Include="..\..\MacOS\NetRumble\Gameplay\Weapons\MineWeapon.cs">
+    <Compile Include="Gameplay\Weapons\MineWeapon.cs">
       <Link>Gameplay\Weapons\MineWeapon.cs</Link>
     </Compile>
-    <Compile Include="..\..\MacOS\NetRumble\Gameplay\Weapons\LaserWeapon.cs">
+    <Compile Include="Gameplay\Weapons\LaserWeapon.cs">
       <Link>Gameplay\Weapons\LaserWeapon.cs</Link>
     </Compile>
-    <Compile Include="..\..\MacOS\NetRumble\Gameplay\Weapons\DoubleLaserWeapon.cs">
+    <Compile Include="Gameplay\Weapons\DoubleLaserWeapon.cs">
       <Link>Gameplay\Weapons\DoubleLaserWeapon.cs</Link>
     </Compile>
-    <Compile Include="..\..\MacOS\NetRumble\BloomPostprocess\BloomSettings.cs">
+    <Compile Include="BloomPostprocess\BloomSettings.cs">
       <Link>BloomPostprocess\BloomSettings.cs</Link>
     </Compile>
-    <Compile Include="..\..\MacOS\NetRumble\BloomPostprocess\BloomComponent.cs">
+    <Compile Include="BloomPostprocess\BloomComponent.cs">
       <Link>BloomPostprocess\BloomComponent.cs</Link>
     </Compile>
     <Compile Include="AudioManager.cs" />
@@ -376,257 +376,257 @@
     <Folder Include="Effects\" />
   </ItemGroup>
   <ItemGroup>
-    <Content Include="..\..\MacOS\NetRumble\Content\Audio\wav\asteroid_touch.xnb">
+    <Content Include="Content\Audio\wav\asteroid_touch.xnb">
       <Link>Content\Audio\wav\asteroid_touch.xnb</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="..\..\MacOS\NetRumble\Content\Audio\wav\rocket.xnb">
+    <Content Include="Content\Audio\wav\rocket.xnb">
       <Link>Content\Audio\wav\rocket.xnb</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="..\..\MacOS\NetRumble\Content\Audio\wav\powerup_touch.xnb">
+    <Content Include="Content\Audio\wav\powerup_touch.xnb">
       <Link>Content\Audio\wav\powerup_touch.xnb</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="..\..\MacOS\NetRumble\Content\Audio\wav\powerup_spawn.xnb">
+    <Content Include="Content\Audio\wav\powerup_spawn.xnb">
       <Link>Content\Audio\wav\powerup_spawn.xnb</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="..\..\MacOS\NetRumble\Content\Audio\wav\player_spawn.xnb">
+    <Content Include="Content\Audio\wav\player_spawn.xnb">
       <Link>Content\Audio\wav\player_spawn.xnb</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="..\..\MacOS\NetRumble\Content\Audio\wav\menu_select.xnb">
+    <Content Include="Content\Audio\wav\menu_select.xnb">
       <Link>Content\Audio\wav\menu_select.xnb</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="..\..\MacOS\NetRumble\Content\Audio\wav\menu_scroll.xnb">
+    <Content Include="Content\Audio\wav\menu_scroll.xnb">
       <Link>Content\Audio\wav\menu_scroll.xnb</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="..\..\MacOS\NetRumble\Content\Audio\wav\fire_rocket2.xnb">
+    <Content Include="Content\Audio\wav\fire_rocket2.xnb">
       <Link>Content\Audio\wav\fire_rocket2.xnb</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="..\..\MacOS\NetRumble\Content\Audio\wav\fire_rocket1.xnb">
+    <Content Include="Content\Audio\wav\fire_rocket1.xnb">
       <Link>Content\Audio\wav\fire_rocket1.xnb</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="..\..\MacOS\NetRumble\Content\Audio\wav\fire_laser3.xnb">
+    <Content Include="Content\Audio\wav\fire_laser3.xnb">
       <Link>Content\Audio\wav\fire_laser3.xnb</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="..\..\MacOS\NetRumble\Content\Audio\wav\fire_laser2.xnb">
+    <Content Include="Content\Audio\wav\fire_laser2.xnb">
       <Link>Content\Audio\wav\fire_laser2.xnb</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="..\..\MacOS\NetRumble\Content\Audio\wav\fire_laser1.xnb">
+    <Content Include="Content\Audio\wav\fire_laser1.xnb">
       <Link>Content\Audio\wav\fire_laser1.xnb</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="..\..\MacOS\NetRumble\Content\Audio\wav\explosion_shockwave.xnb">
+    <Content Include="Content\Audio\wav\explosion_shockwave.xnb">
       <Link>Content\Audio\wav\explosion_shockwave.xnb</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="..\..\MacOS\NetRumble\Content\Audio\wav\explosion_medium.xnb">
+    <Content Include="Content\Audio\wav\explosion_medium.xnb">
       <Link>Content\Audio\wav\explosion_medium.xnb</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="..\..\MacOS\NetRumble\Content\Audio\wav\explosion_large.xnb">
+    <Content Include="Content\Audio\wav\explosion_large.xnb">
       <Link>Content\Audio\wav\explosion_large.xnb</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="..\..\MacOS\NetRumble\Content\BloomPostprocess\Effects\BloomCombine.fsh">
+    <Content Include="Content\BloomPostprocess\Effects\BloomCombine.fsh">
       <Link>Content\BloomPostprocess\Effects\BloomCombine.fsh</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="..\..\MacOS\NetRumble\Content\BloomPostprocess\Effects\BloomExtract.fsh">
+    <Content Include="Content\BloomPostprocess\Effects\BloomExtract.fsh">
       <Link>Content\BloomPostprocess\Effects\BloomExtract.fsh</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="..\..\MacOS\NetRumble\Content\BloomPostprocess\Effects\GaussianBlur.fsh">
+    <Content Include="Content\BloomPostprocess\Effects\GaussianBlur.fsh">
       <Link>Content\BloomPostprocess\Effects\GaussianBlur.fsh</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="..\..\MacOS\NetRumble\Content\Fonts\NetRumbleFont.xnb">
+    <Content Include="Content\Fonts\NetRumbleFont.xnb">
       <Link>Content\Fonts\NetRumbleFont.xnb</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="..\..\MacOS\NetRumble\Content\Fonts\MessageBox.xnb">
+    <Content Include="Content\Fonts\MessageBox.xnb">
       <Link>Content\Fonts\MessageBox.xnb</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="..\..\MacOS\NetRumble\Content\Fonts\MenuFont.xnb">
+    <Content Include="Content\Fonts\MenuFont.xnb">
       <Link>Content\Fonts\MenuFont.xnb</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="..\..\MacOS\NetRumble\Content\Particles\laserExplosion.xml">
+    <Content Include="Content\Particles\laserExplosion.xml">
       <Link>Content\Particles\laserExplosion.xml</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="..\..\MacOS\NetRumble\Content\Particles\mineExplosion.xml">
+    <Content Include="Content\Particles\mineExplosion.xml">
       <Link>Content\Particles\mineExplosion.xml</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="..\..\MacOS\NetRumble\Content\Particles\rocketExplosion.xml">
+    <Content Include="Content\Particles\rocketExplosion.xml">
       <Link>Content\Particles\rocketExplosion.xml</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="..\..\MacOS\NetRumble\Content\Particles\rocketTrail.xml">
+    <Content Include="Content\Particles\rocketTrail.xml">
       <Link>Content\Particles\rocketTrail.xml</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="..\..\MacOS\NetRumble\Content\Particles\shipExplosion.xml">
+    <Content Include="Content\Particles\shipExplosion.xml">
       <Link>Content\Particles\shipExplosion.xml</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="..\..\MacOS\NetRumble\Content\Particles\shipSpawn.xml">
+    <Content Include="Content\Particles\shipSpawn.xml">
       <Link>Content\Particles\shipSpawn.xml</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="..\..\MacOS\NetRumble\Content\One Step Beyond.xnb">
+    <Content Include="Content\One Step Beyond.xnb">
       <Link>Content\One Step Beyond.xnb</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="..\..\MacOS\NetRumble\Content\Textures\title.xnb">
+    <Content Include="Content\Textures\title.xnb">
       <Link>Content\Textures\title.xnb</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="..\..\MacOS\NetRumble\Content\Textures\shipShields.xnb">
+    <Content Include="Content\Textures\shipShields.xnb">
       <Link>Content\Textures\shipShields.xnb</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="..\..\MacOS\NetRumble\Content\Textures\ship3Overlay.xnb">
+    <Content Include="Content\Textures\ship3Overlay.xnb">
       <Link>Content\Textures\ship3Overlay.xnb</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="..\..\MacOS\NetRumble\Content\Textures\ship3.xnb">
+    <Content Include="Content\Textures\ship3.xnb">
       <Link>Content\Textures\ship3.xnb</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="..\..\MacOS\NetRumble\Content\Textures\ship2Overlay.xnb">
+    <Content Include="Content\Textures\ship2Overlay.xnb">
       <Link>Content\Textures\ship2Overlay.xnb</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="..\..\MacOS\NetRumble\Content\Textures\ship2.xnb">
+    <Content Include="Content\Textures\ship2.xnb">
       <Link>Content\Textures\ship2.xnb</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="..\..\MacOS\NetRumble\Content\Textures\ship1Overlay.xnb">
+    <Content Include="Content\Textures\ship1Overlay.xnb">
       <Link>Content\Textures\ship1Overlay.xnb</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="..\..\MacOS\NetRumble\Content\Textures\ship1.xnb">
+    <Content Include="Content\Textures\ship1.xnb">
       <Link>Content\Textures\ship1.xnb</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="..\..\MacOS\NetRumble\Content\Textures\ship0Overlay.xnb">
+    <Content Include="Content\Textures\ship0Overlay.xnb">
       <Link>Content\Textures\ship0Overlay.xnb</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="..\..\MacOS\NetRumble\Content\Textures\ship0.xnb">
+    <Content Include="Content\Textures\ship0.xnb">
       <Link>Content\Textures\ship0.xnb</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="..\..\MacOS\NetRumble\Content\Textures\rocket.xnb">
+    <Content Include="Content\Textures\rocket.xnb">
       <Link>Content\Textures\rocket.xnb</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="..\..\MacOS\NetRumble\Content\Textures\ready.xnb">
+    <Content Include="Content\Textures\ready.xnb">
       <Link>Content\Textures\ready.xnb</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="..\..\MacOS\NetRumble\Content\Textures\powerupTripleLaser.xnb">
+    <Content Include="Content\Textures\powerupTripleLaser.xnb">
       <Link>Content\Textures\powerupTripleLaser.xnb</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="..\..\MacOS\NetRumble\Content\Textures\powerupRocket.xnb">
+    <Content Include="Content\Textures\powerupRocket.xnb">
       <Link>Content\Textures\powerupRocket.xnb</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="..\..\MacOS\NetRumble\Content\Textures\powerupDoubleLaser.xnb">
+    <Content Include="Content\Textures\powerupDoubleLaser.xnb">
       <Link>Content\Textures\powerupDoubleLaser.xnb</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="..\..\MacOS\NetRumble\Content\Textures\mine.xnb">
+    <Content Include="Content\Textures\mine.xnb">
       <Link>Content\Textures\mine.xnb</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="..\..\MacOS\NetRumble\Content\Textures\laser.xnb">
+    <Content Include="Content\Textures\laser.xnb">
       <Link>Content\Textures\laser.xnb</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="..\..\MacOS\NetRumble\Content\Textures\explosion.xnb">
+    <Content Include="Content\Textures\explosion.xnb">
       <Link>Content\Textures\explosion.xnb</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="..\..\MacOS\NetRumble\Content\Textures\clouds.xnb">
+    <Content Include="Content\Textures\clouds.xnb">
       <Link>Content\Textures\clouds.xnb</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="..\..\MacOS\NetRumble\Content\Textures\chatTalking.xnb">
+    <Content Include="Content\Textures\chatTalking.xnb">
       <Link>Content\Textures\chatTalking.xnb</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="..\..\MacOS\NetRumble\Content\Textures\chatMute.xnb">
+    <Content Include="Content\Textures\chatMute.xnb">
       <Link>Content\Textures\chatMute.xnb</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="..\..\MacOS\NetRumble\Content\Textures\chatAble.xnb">
+    <Content Include="Content\Textures\chatAble.xnb">
       <Link>Content\Textures\chatAble.xnb</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="..\..\MacOS\NetRumble\Content\Textures\blank.xnb">
+    <Content Include="Content\Textures\blank.xnb">
       <Link>Content\Textures\blank.xnb</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="..\..\MacOS\NetRumble\Content\Textures\barrierRed.xnb">
+    <Content Include="Content\Textures\barrierRed.xnb">
       <Link>Content\Textures\barrierRed.xnb</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="..\..\MacOS\NetRumble\Content\Textures\barrierPurple.xnb">
+    <Content Include="Content\Textures\barrierPurple.xnb">
       <Link>Content\Textures\barrierPurple.xnb</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="..\..\MacOS\NetRumble\Content\Textures\barrierEnd.xnb">
+    <Content Include="Content\Textures\barrierEnd.xnb">
       <Link>Content\Textures\barrierEnd.xnb</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="..\..\MacOS\NetRumble\Content\Textures\asteroid2.xnb">
+    <Content Include="Content\Textures\asteroid2.xnb">
       <Link>Content\Textures\asteroid2.xnb</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="..\..\MacOS\NetRumble\Content\Textures\asteroid1.xnb">
+    <Content Include="Content\Textures\asteroid1.xnb">
       <Link>Content\Textures\asteroid1.xnb</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="..\..\MacOS\NetRumble\Content\Textures\asteroid0.xnb">
+    <Content Include="Content\Textures\asteroid0.xnb">
       <Link>Content\Textures\asteroid0.xnb</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="..\..\MacOS\NetRumble\Content\Textures\Particles\defaultParticle.xnb">
+    <Content Include="Content\Textures\Particles\defaultParticle.xnb">
       <Link>Content\Textures\Particles\defaultParticle.xnb</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="..\..\MacOS\NetRumble\Content\Textures\Particles\particle.xnb">
+    <Content Include="Content\Textures\Particles\particle.xnb">
       <Link>Content\Textures\Particles\particle.xnb</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="..\..\MacOS\NetRumble\Content\Textures\Particles\smoke.xnb">
+    <Content Include="Content\Textures\Particles\smoke.xnb">
       <Link>Content\Textures\Particles\smoke.xnb</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="..\..\MacOS\NetRumble\Content\Textures\Particles\spark.xnb">
+    <Content Include="Content\Textures\Particles\spark.xnb">
       <Link>Content\Textures\Particles\spark.xnb</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="..\..\MacOS\NetRumble\Content\Effects\Clouds.fsh">
+    <Content Include="Content\Effects\Clouds.fsh">
       <Link>Content\Effects\Clouds.fsh</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\..\MonoGame.Framework\MonoGame.Framework.Linux.csproj">
+    <ProjectReference Include="..\..\MonoGame.Framework\MonoGame.Framework.Linux.csproj">
       <Project>{35253CE1-C864-4CD3-8249-4D1319748E8F}</Project>
       <Name>MonoGame.Framework.Linux</Name>
     </ProjectReference>

+ 3 - 9
NetRumble/NetRumble.MacOS.csproj

@@ -38,11 +38,11 @@
     <Reference Include="MonoMac" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="Info.plist" />
+    <None Include="Info.plist">
+    </None>
     <None Include="Game.ico" />
     <None Include="GameThumbnail.png" />
     <None Include="Content\.DS_Store" />
-    <None Include="Content\One Step Beyond.wma" />
     <None Include="Content\Thumbs.db" />
     <None Include="Content\Audio\wav\asteroid_touch.wav" />
     <None Include="Content\Audio\wav\explosion_large.wav" />
@@ -153,10 +153,6 @@
     <Compile Include="BloomPostprocess\BloomComponent.cs" />
     <Compile Include="BloomPostprocess\BloomSettings.cs" />
     <Compile Include="Program.cs" />
-    <Compile Include="Effects\CloudsEffect.cs" />
-    <Compile Include="Effects\BloomCombineEffect.cs" />
-    <Compile Include="Effects\BloomExtractEffect.cs" />
-    <Compile Include="Effects\GaussianBlurEffect.cs" />
   </ItemGroup>
   <ItemGroup>
     <Content Include="Content\Fonts\MenuFont.xnb" />
@@ -225,9 +221,7 @@
     <Content Include="Content\BloomPostprocess\Effects\BloomCombine.fsh" />
     <Content Include="Content\BloomPostprocess\Effects\BloomExtract.fsh" />
     <Content Include="Content\BloomPostprocess\Effects\GaussianBlur.fsh" />
-  </ItemGroup>
-  <ItemGroup>
-    <Folder Include="Effects\" />
+    <Content Include="Content\One Step Beyond.wma" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\MonoGame.Framework\MonoGame.Framework.MacOS.csproj">

+ 111 - 111
NetRumble/NetRumble.Windows.csproj

@@ -52,148 +52,148 @@
     </Reference>
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="..\..\MacOS\NetRumble\AudioManager.cs">
+    <Compile Include="AudioManager.cs">
       <Link>AudioManager.cs</Link>
     </Compile>
-    <Compile Include="..\..\MacOS\NetRumble\BatchRemovalCollection.cs">
+    <Compile Include="BatchRemovalCollection.cs">
       <Link>BatchRemovalCollection.cs</Link>
     </Compile>
-    <Compile Include="..\..\MacOS\NetRumble\BloomPostprocess\BloomComponent.cs">
+    <Compile Include="BloomPostprocess\BloomComponent.cs">
       <Link>BloomPostprocess\BloomComponent.cs</Link>
     </Compile>
-    <Compile Include="..\..\MacOS\NetRumble\BloomPostprocess\BloomSettings.cs">
+    <Compile Include="BloomPostprocess\BloomSettings.cs">
       <Link>BloomPostprocess\BloomSettings.cs</Link>
     </Compile>
-    <Compile Include="..\..\MacOS\NetRumble\CollisionMath.cs">
+    <Compile Include="CollisionMath.cs">
       <Link>CollisionMath.cs</Link>
     </Compile>
-    <Compile Include="..\..\MacOS\NetRumble\Gameplay\Asteroid.cs">
+    <Compile Include="Gameplay\Asteroid.cs">
       <Link>Gameplay\Asteroid.cs</Link>
     </Compile>
-    <Compile Include="..\..\MacOS\NetRumble\Gameplay\CollisionManager.cs">
+    <Compile Include="Gameplay\CollisionManager.cs">
       <Link>Gameplay\CollisionManager.cs</Link>
     </Compile>
-    <Compile Include="..\..\MacOS\NetRumble\Gameplay\GameplayObject.cs">
+    <Compile Include="Gameplay\GameplayObject.cs">
       <Link>Gameplay\GameplayObject.cs</Link>
     </Compile>
-    <Compile Include="..\..\MacOS\NetRumble\Gameplay\PlayerData.cs">
+    <Compile Include="Gameplay\PlayerData.cs">
       <Link>Gameplay\PlayerData.cs</Link>
     </Compile>
-    <Compile Include="..\..\MacOS\NetRumble\Gameplay\PowerUps\DoubleLaserPowerUp.cs">
+    <Compile Include="Gameplay\PowerUps\DoubleLaserPowerUp.cs">
       <Link>Gameplay\PowerUps\DoubleLaserPowerUp.cs</Link>
     </Compile>
-    <Compile Include="..\..\MacOS\NetRumble\Gameplay\PowerUps\PowerUp.cs">
+    <Compile Include="Gameplay\PowerUps\PowerUp.cs">
       <Link>Gameplay\PowerUps\PowerUp.cs</Link>
     </Compile>
-    <Compile Include="..\..\MacOS\NetRumble\Gameplay\PowerUps\RocketPowerUp.cs">
+    <Compile Include="Gameplay\PowerUps\RocketPowerUp.cs">
       <Link>Gameplay\PowerUps\RocketPowerUp.cs</Link>
     </Compile>
-    <Compile Include="..\..\MacOS\NetRumble\Gameplay\PowerUps\TripleLaserPowerUp.cs">
+    <Compile Include="Gameplay\PowerUps\TripleLaserPowerUp.cs">
       <Link>Gameplay\PowerUps\TripleLaserPowerUp.cs</Link>
     </Compile>
-    <Compile Include="..\..\MacOS\NetRumble\Gameplay\Projectiles\LaserProjectile.cs">
+    <Compile Include="Gameplay\Projectiles\LaserProjectile.cs">
       <Link>Gameplay\Projectiles\LaserProjectile.cs</Link>
     </Compile>
-    <Compile Include="..\..\MacOS\NetRumble\Gameplay\Projectiles\MineProjectile.cs">
+    <Compile Include="Gameplay\Projectiles\MineProjectile.cs">
       <Link>Gameplay\Projectiles\MineProjectile.cs</Link>
     </Compile>
-    <Compile Include="..\..\MacOS\NetRumble\Gameplay\Projectiles\Projectile.cs">
+    <Compile Include="Gameplay\Projectiles\Projectile.cs">
       <Link>Gameplay\Projectiles\Projectile.cs</Link>
     </Compile>
-    <Compile Include="..\..\MacOS\NetRumble\Gameplay\Projectiles\RocketProjectile.cs">
+    <Compile Include="Gameplay\Projectiles\RocketProjectile.cs">
       <Link>Gameplay\Projectiles\RocketProjectile.cs</Link>
     </Compile>
-    <Compile Include="..\..\MacOS\NetRumble\Gameplay\Ship.cs">
+    <Compile Include="Gameplay\Ship.cs">
       <Link>Gameplay\Ship.cs</Link>
     </Compile>
-    <Compile Include="..\..\MacOS\NetRumble\Gameplay\ShipInput.cs">
+    <Compile Include="Gameplay\ShipInput.cs">
       <Link>Gameplay\ShipInput.cs</Link>
     </Compile>
-    <Compile Include="..\..\MacOS\NetRumble\Gameplay\Weapons\DoubleLaserWeapon.cs">
+    <Compile Include="Gameplay\Weapons\DoubleLaserWeapon.cs">
       <Link>Gameplay\Weapons\DoubleLaserWeapon.cs</Link>
     </Compile>
-    <Compile Include="..\..\MacOS\NetRumble\Gameplay\Weapons\LaserWeapon.cs">
+    <Compile Include="Gameplay\Weapons\LaserWeapon.cs">
       <Link>Gameplay\Weapons\LaserWeapon.cs</Link>
     </Compile>
-    <Compile Include="..\..\MacOS\NetRumble\Gameplay\Weapons\MineWeapon.cs">
+    <Compile Include="Gameplay\Weapons\MineWeapon.cs">
       <Link>Gameplay\Weapons\MineWeapon.cs</Link>
     </Compile>
-    <Compile Include="..\..\MacOS\NetRumble\Gameplay\Weapons\RocketWeapon.cs">
+    <Compile Include="Gameplay\Weapons\RocketWeapon.cs">
       <Link>Gameplay\Weapons\RocketWeapon.cs</Link>
     </Compile>
-    <Compile Include="..\..\MacOS\NetRumble\Gameplay\Weapons\TripleLaserWeapon.cs">
+    <Compile Include="Gameplay\Weapons\TripleLaserWeapon.cs">
       <Link>Gameplay\Weapons\TripleLaserWeapon.cs</Link>
     </Compile>
-    <Compile Include="..\..\MacOS\NetRumble\Gameplay\Weapons\Weapon.cs">
+    <Compile Include="Gameplay\Weapons\Weapon.cs">
       <Link>Gameplay\Weapons\Weapon.cs</Link>
     </Compile>
-    <Compile Include="..\..\MacOS\NetRumble\Gameplay\World.cs">
+    <Compile Include="Gameplay\World.cs">
       <Link>Gameplay\World.cs</Link>
     </Compile>
-    <Compile Include="..\..\MacOS\NetRumble\NetRumbleGame.cs">
+    <Compile Include="NetRumbleGame.cs">
       <Link>NetRumbleGame.cs</Link>
     </Compile>
-    <Compile Include="..\..\MacOS\NetRumble\OperationCompletedEventArgs.cs">
+    <Compile Include="OperationCompletedEventArgs.cs">
       <Link>OperationCompletedEventArgs.cs</Link>
     </Compile>
-    <Compile Include="..\..\MacOS\NetRumble\RandomMath.cs">
+    <Compile Include="RandomMath.cs">
       <Link>RandomMath.cs</Link>
     </Compile>
-    <Compile Include="..\..\MacOS\NetRumble\Rendering\Particles\Particle.cs">
+    <Compile Include="Rendering\Particles\Particle.cs">
       <Link>Rendering\Particles\Particle.cs</Link>
     </Compile>
-    <Compile Include="..\..\MacOS\NetRumble\Rendering\Particles\ParticleCache.cs">
+    <Compile Include="Rendering\Particles\ParticleCache.cs">
       <Link>Rendering\Particles\ParticleCache.cs</Link>
     </Compile>
-    <Compile Include="..\..\MacOS\NetRumble\Rendering\Particles\ParticleEffect.cs">
+    <Compile Include="Rendering\Particles\ParticleEffect.cs">
       <Link>Rendering\Particles\ParticleEffect.cs</Link>
     </Compile>
-    <Compile Include="..\..\MacOS\NetRumble\Rendering\Particles\ParticleEffectManager.cs">
+    <Compile Include="Rendering\Particles\ParticleEffectManager.cs">
       <Link>Rendering\Particles\ParticleEffectManager.cs</Link>
     </Compile>
-    <Compile Include="..\..\MacOS\NetRumble\Rendering\Particles\ParticleEffectType.cs">
+    <Compile Include="Rendering\Particles\ParticleEffectType.cs">
       <Link>Rendering\Particles\ParticleEffectType.cs</Link>
     </Compile>
-    <Compile Include="..\..\MacOS\NetRumble\Rendering\Particles\ParticleSystem.cs">
+    <Compile Include="Rendering\Particles\ParticleSystem.cs">
       <Link>Rendering\Particles\ParticleSystem.cs</Link>
     </Compile>
-    <Compile Include="..\..\MacOS\NetRumble\Rendering\Starfield.cs">
+    <Compile Include="Rendering\Starfield.cs">
       <Link>Rendering\Starfield.cs</Link>
     </Compile>
-    <Compile Include="..\..\MacOS\NetRumble\ScreenManager\GameScreen.cs">
+    <Compile Include="ScreenManager\GameScreen.cs">
       <Link>ScreenManager\GameScreen.cs</Link>
     </Compile>
-    <Compile Include="..\..\MacOS\NetRumble\ScreenManager\InputState.cs">
+    <Compile Include="ScreenManager\InputState.cs">
       <Link>ScreenManager\InputState.cs</Link>
     </Compile>
-    <Compile Include="..\..\MacOS\NetRumble\ScreenManager\LoadingScreen.cs">
+    <Compile Include="ScreenManager\LoadingScreen.cs">
       <Link>ScreenManager\LoadingScreen.cs</Link>
     </Compile>
-    <Compile Include="..\..\MacOS\NetRumble\ScreenManager\MenuScreen.cs">
+    <Compile Include="ScreenManager\MenuScreen.cs">
       <Link>ScreenManager\MenuScreen.cs</Link>
     </Compile>
-    <Compile Include="..\..\MacOS\NetRumble\ScreenManager\MessageBoxScreen.cs">
+    <Compile Include="ScreenManager\MessageBoxScreen.cs">
       <Link>ScreenManager\MessageBoxScreen.cs</Link>
     </Compile>
-    <Compile Include="..\..\MacOS\NetRumble\ScreenManager\ScreenManager.cs">
+    <Compile Include="ScreenManager\ScreenManager.cs">
       <Link>ScreenManager\ScreenManager.cs</Link>
     </Compile>
-    <Compile Include="..\..\MacOS\NetRumble\Screens\BackgroundScreen.cs">
+    <Compile Include="Screens\BackgroundScreen.cs">
       <Link>Screens\BackgroundScreen.cs</Link>
     </Compile>
-    <Compile Include="..\..\MacOS\NetRumble\Screens\GameplayScreen.cs">
+    <Compile Include="Screens\GameplayScreen.cs">
       <Link>Screens\GameplayScreen.cs</Link>
     </Compile>
-    <Compile Include="..\..\MacOS\NetRumble\Screens\LobbyScreen.cs">
+    <Compile Include="Screens\LobbyScreen.cs">
       <Link>Screens\LobbyScreen.cs</Link>
     </Compile>
-    <Compile Include="..\..\MacOS\NetRumble\Screens\MainMenuScreen.cs">
+    <Compile Include="Screens\MainMenuScreen.cs">
       <Link>Screens\MainMenuScreen.cs</Link>
     </Compile>
-    <Compile Include="..\..\MacOS\NetRumble\Screens\NetworkBusyScreen.cs">
+    <Compile Include="Screens\NetworkBusyScreen.cs">
       <Link>Screens\NetworkBusyScreen.cs</Link>
     </Compile>
-    <Compile Include="..\..\MacOS\NetRumble\Screens\SearchResultsScreen.cs">
+    <Compile Include="Screens\SearchResultsScreen.cs">
       <Link>Screens\SearchResultsScreen.cs</Link>
     </Compile>
     <Compile Include="Program.cs" />
@@ -204,251 +204,251 @@
       <Link>SDL.dll</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="..\..\MacOS\NetRumble\Content\Audio\wav\asteroid_touch.xnb">
+    <Content Include="Content\Audio\wav\asteroid_touch.xnb">
       <Link>Content\Audio\wav\asteroid_touch.xnb</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="..\..\MacOS\NetRumble\Content\Audio\wav\explosion_large.xnb">
+    <Content Include="Content\Audio\wav\explosion_large.xnb">
       <Link>Content\Audio\wav\explosion_large.xnb</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="..\..\MacOS\NetRumble\Content\Audio\wav\explosion_medium.xnb">
+    <Content Include="Content\Audio\wav\explosion_medium.xnb">
       <Link>Content\Audio\wav\explosion_medium.xnb</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="..\..\MacOS\NetRumble\Content\Audio\wav\explosion_shockwave.xnb">
+    <Content Include="Content\Audio\wav\explosion_shockwave.xnb">
       <Link>Content\Audio\wav\explosion_shockwave.xnb</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="..\..\MacOS\NetRumble\Content\Audio\wav\fire_laser1.xnb">
+    <Content Include="Content\Audio\wav\fire_laser1.xnb">
       <Link>Content\Audio\wav\fire_laser1.xnb</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="..\..\MacOS\NetRumble\Content\Audio\wav\fire_laser2.xnb">
+    <Content Include="Content\Audio\wav\fire_laser2.xnb">
       <Link>Content\Audio\wav\fire_laser2.xnb</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="..\..\MacOS\NetRumble\Content\Audio\wav\fire_laser3.xnb">
+    <Content Include="Content\Audio\wav\fire_laser3.xnb">
       <Link>Content\Audio\wav\fire_laser3.xnb</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="..\..\MacOS\NetRumble\Content\Audio\wav\fire_rocket1.xnb">
+    <Content Include="Content\Audio\wav\fire_rocket1.xnb">
       <Link>Content\Audio\wav\fire_rocket1.xnb</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="..\..\MacOS\NetRumble\Content\Audio\wav\fire_rocket2.xnb">
+    <Content Include="Content\Audio\wav\fire_rocket2.xnb">
       <Link>Content\Audio\wav\fire_rocket2.xnb</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="..\..\MacOS\NetRumble\Content\Audio\wav\menu_scroll.xnb">
+    <Content Include="Content\Audio\wav\menu_scroll.xnb">
       <Link>Content\Audio\wav\menu_scroll.xnb</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="..\..\MacOS\NetRumble\Content\Audio\wav\menu_select.xnb">
+    <Content Include="Content\Audio\wav\menu_select.xnb">
       <Link>Content\Audio\wav\menu_select.xnb</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="..\..\MacOS\NetRumble\Content\Audio\wav\player_spawn.xnb">
+    <Content Include="Content\Audio\wav\player_spawn.xnb">
       <Link>Content\Audio\wav\player_spawn.xnb</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="..\..\MacOS\NetRumble\Content\Audio\wav\powerup_spawn.xnb">
+    <Content Include="Content\Audio\wav\powerup_spawn.xnb">
       <Link>Content\Audio\wav\powerup_spawn.xnb</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="..\..\MacOS\NetRumble\Content\Audio\wav\powerup_touch.xnb">
+    <Content Include="Content\Audio\wav\powerup_touch.xnb">
       <Link>Content\Audio\wav\powerup_touch.xnb</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="..\..\MacOS\NetRumble\Content\Audio\wav\rocket.xnb">
+    <Content Include="Content\Audio\wav\rocket.xnb">
       <Link>Content\Audio\wav\rocket.xnb</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="..\..\MacOS\NetRumble\Content\BloomPostprocess\Effects\BloomCombine.fsh">
+    <Content Include="Content\BloomPostprocess\Effects\BloomCombine.fsh">
       <Link>Content\BloomPostprocess\Effects\BloomCombine.fsh</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="..\..\MacOS\NetRumble\Content\BloomPostprocess\Effects\BloomExtract.fsh">
+    <Content Include="Content\BloomPostprocess\Effects\BloomExtract.fsh">
       <Link>Content\BloomPostprocess\Effects\BloomExtract.fsh</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="..\..\MacOS\NetRumble\Content\BloomPostprocess\Effects\GaussianBlur.fsh">
+    <Content Include="Content\BloomPostprocess\Effects\GaussianBlur.fsh">
       <Link>Content\BloomPostprocess\Effects\GaussianBlur.fsh</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="..\..\MacOS\NetRumble\Content\Effects\Clouds.fsh">
+    <Content Include="Content\Effects\Clouds.fsh">
       <Link>Content\Effects\Clouds.fsh</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="..\..\MacOS\NetRumble\Content\Fonts\MenuFont.xnb">
+    <Content Include="Content\Fonts\MenuFont.xnb">
       <Link>Content\Fonts\MenuFont.xnb</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="..\..\MacOS\NetRumble\Content\Fonts\MessageBox.xnb">
+    <Content Include="Content\Fonts\MessageBox.xnb">
       <Link>Content\Fonts\MessageBox.xnb</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="..\..\MacOS\NetRumble\Content\Fonts\NetRumbleFont.xnb">
+    <Content Include="Content\Fonts\NetRumbleFont.xnb">
       <Link>Content\Fonts\NetRumbleFont.xnb</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="..\..\MacOS\NetRumble\Content\One Step Beyond.wma">
+    <Content Include="Content\One Step Beyond.wma">
       <Link>Content\One Step Beyond.wma</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="..\..\MacOS\NetRumble\Content\Particles\laserExplosion.xml">
+    <Content Include="Content\Particles\laserExplosion.xml">
       <Link>Content\Particles\laserExplosion.xml</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="..\..\MacOS\NetRumble\Content\Particles\mineExplosion.xml">
+    <Content Include="Content\Particles\mineExplosion.xml">
       <Link>Content\Particles\mineExplosion.xml</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="..\..\MacOS\NetRumble\Content\Particles\rocketExplosion.xml">
+    <Content Include="Content\Particles\rocketExplosion.xml">
       <Link>Content\Particles\rocketExplosion.xml</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="..\..\MacOS\NetRumble\Content\Particles\rocketTrail.xml">
+    <Content Include="Content\Particles\rocketTrail.xml">
       <Link>Content\Particles\rocketTrail.xml</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="..\..\MacOS\NetRumble\Content\Particles\shipExplosion.xml">
+    <Content Include="Content\Particles\shipExplosion.xml">
       <Link>Content\Particles\shipExplosion.xml</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="..\..\MacOS\NetRumble\Content\Particles\shipSpawn.xml">
+    <Content Include="Content\Particles\shipSpawn.xml">
       <Link>Content\Particles\shipSpawn.xml</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="..\..\MacOS\NetRumble\Content\Textures\asteroid0.xnb">
+    <Content Include="Content\Textures\asteroid0.xnb">
       <Link>Content\Textures\asteroid0.xnb</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="..\..\MacOS\NetRumble\Content\Textures\asteroid1.xnb">
+    <Content Include="Content\Textures\asteroid1.xnb">
       <Link>Content\Textures\asteroid1.xnb</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="..\..\MacOS\NetRumble\Content\Textures\asteroid2.xnb">
+    <Content Include="Content\Textures\asteroid2.xnb">
       <Link>Content\Textures\asteroid2.xnb</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="..\..\MacOS\NetRumble\Content\Textures\barrierEnd.xnb">
+    <Content Include="Content\Textures\barrierEnd.xnb">
       <Link>Content\Textures\barrierEnd.xnb</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="..\..\MacOS\NetRumble\Content\Textures\barrierPurple.xnb">
+    <Content Include="Content\Textures\barrierPurple.xnb">
       <Link>Content\Textures\barrierPurple.xnb</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="..\..\MacOS\NetRumble\Content\Textures\barrierRed.xnb">
+    <Content Include="Content\Textures\barrierRed.xnb">
       <Link>Content\Textures\barrierRed.xnb</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="..\..\MacOS\NetRumble\Content\Textures\blank.xnb">
+    <Content Include="Content\Textures\blank.xnb">
       <Link>Content\Textures\blank.xnb</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="..\..\MacOS\NetRumble\Content\Textures\chatAble.xnb">
+    <Content Include="Content\Textures\chatAble.xnb">
       <Link>Content\Textures\chatAble.xnb</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="..\..\MacOS\NetRumble\Content\Textures\chatMute.xnb">
+    <Content Include="Content\Textures\chatMute.xnb">
       <Link>Content\Textures\chatMute.xnb</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="..\..\MacOS\NetRumble\Content\Textures\chatTalking.xnb">
+    <Content Include="Content\Textures\chatTalking.xnb">
       <Link>Content\Textures\chatTalking.xnb</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="..\..\MacOS\NetRumble\Content\Textures\clouds.xnb">
+    <Content Include="Content\Textures\clouds.xnb">
       <Link>Content\Textures\clouds.xnb</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="..\..\MacOS\NetRumble\Content\Textures\explosion.xnb">
+    <Content Include="Content\Textures\explosion.xnb">
       <Link>Content\Textures\explosion.xnb</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="..\..\MacOS\NetRumble\Content\Textures\laser.xnb">
+    <Content Include="Content\Textures\laser.xnb">
       <Link>Content\Textures\laser.xnb</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="..\..\MacOS\NetRumble\Content\Textures\mine.xnb">
+    <Content Include="Content\Textures\mine.xnb">
       <Link>Content\Textures\mine.xnb</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="..\..\MacOS\NetRumble\Content\Textures\powerupDoubleLaser.xnb">
+    <Content Include="Content\Textures\powerupDoubleLaser.xnb">
       <Link>Content\Textures\powerupDoubleLaser.xnb</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="..\..\MacOS\NetRumble\Content\Textures\powerupRocket.xnb">
+    <Content Include="Content\Textures\powerupRocket.xnb">
       <Link>Content\Textures\powerupRocket.xnb</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="..\..\MacOS\NetRumble\Content\Textures\powerupTripleLaser.xnb">
+    <Content Include="Content\Textures\powerupTripleLaser.xnb">
       <Link>Content\Textures\powerupTripleLaser.xnb</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="..\..\MacOS\NetRumble\Content\Textures\ready.xnb">
+    <Content Include="Content\Textures\ready.xnb">
       <Link>Content\Textures\ready.xnb</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="..\..\MacOS\NetRumble\Content\Textures\rocket.xnb">
+    <Content Include="Content\Textures\rocket.xnb">
       <Link>Content\Textures\rocket.xnb</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="..\..\MacOS\NetRumble\Content\Textures\ship0.xnb">
+    <Content Include="Content\Textures\ship0.xnb">
       <Link>Content\Textures\ship0.xnb</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="..\..\MacOS\NetRumble\Content\Textures\ship0Overlay.xnb">
+    <Content Include="Content\Textures\ship0Overlay.xnb">
       <Link>Content\Textures\ship0Overlay.xnb</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="..\..\MacOS\NetRumble\Content\Textures\ship1.xnb">
+    <Content Include="Content\Textures\ship1.xnb">
       <Link>Content\Textures\ship1.xnb</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="..\..\MacOS\NetRumble\Content\Textures\ship1Overlay.xnb">
+    <Content Include="Content\Textures\ship1Overlay.xnb">
       <Link>Content\Textures\ship1Overlay.xnb</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="..\..\MacOS\NetRumble\Content\Textures\ship2.xnb">
+    <Content Include="Content\Textures\ship2.xnb">
       <Link>Content\Textures\ship2.xnb</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="..\..\MacOS\NetRumble\Content\Textures\ship2Overlay.xnb">
+    <Content Include="Content\Textures\ship2Overlay.xnb">
       <Link>Content\Textures\ship2Overlay.xnb</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="..\..\MacOS\NetRumble\Content\Textures\ship3.xnb">
+    <Content Include="Content\Textures\ship3.xnb">
       <Link>Content\Textures\ship3.xnb</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="..\..\MacOS\NetRumble\Content\Textures\ship3Overlay.xnb">
+    <Content Include="Content\Textures\ship3Overlay.xnb">
       <Link>Content\Textures\ship3Overlay.xnb</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="..\..\MacOS\NetRumble\Content\Textures\shipShields.xnb">
+    <Content Include="Content\Textures\shipShields.xnb">
       <Link>Content\Textures\shipShields.xnb</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="..\..\MacOS\NetRumble\Content\Textures\title.xnb">
+    <Content Include="Content\Textures\title.xnb">
       <Link>Content\Textures\title.xnb</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="..\..\MacOS\NetRumble\Content\Textures\Particles\defaultParticle.xnb">
+    <Content Include="Content\Textures\Particles\defaultParticle.xnb">
       <Link>Content\Textures\Particles\defaultParticle.xnb</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="..\..\MacOS\NetRumble\Content\Textures\Particles\particle.xnb">
+    <Content Include="Content\Textures\Particles\particle.xnb">
       <Link>Content\Textures\Particles\particle.xnb</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="..\..\MacOS\NetRumble\Content\Textures\Particles\smoke.xnb">
+    <Content Include="Content\Textures\Particles\smoke.xnb">
       <Link>Content\Textures\Particles\smoke.xnb</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="..\..\MacOS\NetRumble\Content\Textures\Particles\spark.xnb">
+    <Content Include="Content\Textures\Particles\spark.xnb">
       <Link>Content\Textures\Particles\spark.xnb</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
@@ -458,7 +458,7 @@
     <Folder Include="Effects\" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\..\MonoGame.Framework\MonoGame.Framework.Windows.csproj">
+    <ProjectReference Include="..\..\MonoGame.Framework\MonoGame.Framework.Windows.csproj">
       <Project>{7DE47032-A904-4C29-BD22-2D235E8D91BA}</Project>
       <Name>MonoGame.Framework.Windows</Name>
     </ProjectReference>

+ 2 - 2
NetRumble/Rendering/Starfield.cs

@@ -182,11 +182,11 @@ namespace NetRumble
         public void LoadContent()
         {
             // load the cloud texture
-            cloudTexture = contentManager.Load<Texture2D>("Textures/Clouds");
+            cloudTexture = contentManager.Load<Texture2D>("Textures/clouds");
 
             // load the cloud effect
             cloudEffect = contentManager.Load<Effect>("Effects/Clouds");
-			//cloudEffect = new CloudsEffect(graphicsDevice); 
+			//cloudEffect = new CloudsEffect(graphicsDevice);
             cloudEffectPosition = cloudEffect.Parameters["Position"];
       
             // create the star texture

+ 1 - 1
NetworkPrediction/NetworkPrediction.MacOS.csproj

@@ -38,7 +38,7 @@
     <Reference Include="MonoMac" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="Info.plist" />
+    <None Include="Info.plist"></None>
     <None Include="Content\Font.spritefont" />
     <None Include="Content\Tank.tga" />
     <None Include="Content\Turret.tga" />

+ 7 - 7
NetworkPrediction/NetworkPrediction.Windows.csproj

@@ -43,34 +43,34 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="..\..\MacOS\NetworkPrediction\NetworkPredictionGame.cs">
+    <Compile Include="NetworkPredictionGame.cs">
       <Link>NetworkPredictionGame.cs</Link>
     </Compile>
-    <Compile Include="..\..\MacOS\NetworkPrediction\RollingAverage.cs">
+    <Compile Include="RollingAverage.cs">
       <Link>RollingAverage.cs</Link>
     </Compile>
-    <Compile Include="..\..\MacOS\NetworkPrediction\Tank.cs">
+    <Compile Include="Tank.cs">
       <Link>Tank.cs</Link>
     </Compile>
     <Compile Include="Program.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\..\MonoGame.Framework\MonoGame.Framework.Windows.csproj">
+    <ProjectReference Include="..\..\MonoGame.Framework\MonoGame.Framework.Windows.csproj">
       <Project>{7DE47032-A904-4C29-BD22-2D235E8D91BA}</Project>
       <Name>MonoGame.Framework.Windows</Name>
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <Content Include="..\..\MacOS\NetworkPrediction\Content\Font.xnb">
+    <Content Include="Content\Font.xnb">
       <Link>Content\Font.xnb</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="..\..\MacOS\NetworkPrediction\Content\Tank.xnb">
+    <Content Include="Content\Tank.xnb">
       <Link>Content\Tank.xnb</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="..\..\MacOS\NetworkPrediction\Content\Turret.xnb">
+    <Content Include="Content\Turret.xnb">
       <Link>Content\Turret.xnb</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>

+ 35 - 35
NetworkStateManagement/NetworkStateManagement.Linux.csproj

@@ -40,76 +40,76 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="..\..\MacOS\NetworkStateManagement\Game.cs">
+    <Compile Include="Game.cs">
       <Link>Game.cs</Link>
     </Compile>
-    <Compile Include="..\..\MacOS\NetworkStateManagement\IMessageDisplay.cs">
+    <Compile Include="IMessageDisplay.cs">
       <Link>IMessageDisplay.cs</Link>
     </Compile>
-    <Compile Include="..\..\MacOS\NetworkStateManagement\MessageDisplayComponent.cs">
+    <Compile Include="MessageDisplayComponent.cs">
       <Link>MessageDisplayComponent.cs</Link>
     </Compile>
-    <Compile Include="..\..\MacOS\NetworkStateManagement\Networking\AvailableSessionMenuEntry.cs">
+    <Compile Include="Networking\AvailableSessionMenuEntry.cs">
       <Link>Networking\AvailableSessionMenuEntry.cs</Link>
     </Compile>
-    <Compile Include="..\..\MacOS\NetworkStateManagement\Networking\CreateOrFindSessionScreen.cs">
+    <Compile Include="Networking\CreateOrFindSessionScreen.cs">
       <Link>Networking\CreateOrFindSessionScreen.cs</Link>
     </Compile>
-    <Compile Include="..\..\MacOS\NetworkStateManagement\Networking\JoinSessionScreen.cs">
+    <Compile Include="Networking\JoinSessionScreen.cs">
       <Link>Networking\JoinSessionScreen.cs</Link>
     </Compile>
-    <Compile Include="..\..\MacOS\NetworkStateManagement\Networking\LobbyScreen.cs">
+    <Compile Include="Networking\LobbyScreen.cs">
       <Link>Networking\LobbyScreen.cs</Link>
     </Compile>
-    <Compile Include="..\..\MacOS\NetworkStateManagement\Networking\NetworkBusyScreen.cs">
+    <Compile Include="Networking\NetworkBusyScreen.cs">
       <Link>Networking\NetworkBusyScreen.cs</Link>
     </Compile>
-    <Compile Include="..\..\MacOS\NetworkStateManagement\Networking\NetworkErrorScreen.cs">
+    <Compile Include="Networking\NetworkErrorScreen.cs">
       <Link>Networking\NetworkErrorScreen.cs</Link>
     </Compile>
-    <Compile Include="..\..\MacOS\NetworkStateManagement\Networking\NetworkSessionComponent.cs">
+    <Compile Include="Networking\NetworkSessionComponent.cs">
       <Link>Networking\NetworkSessionComponent.cs</Link>
     </Compile>
-    <Compile Include="..\..\MacOS\NetworkStateManagement\Networking\OperationCompletedEventArgs.cs">
+    <Compile Include="Networking\OperationCompletedEventArgs.cs">
       <Link>Networking\OperationCompletedEventArgs.cs</Link>
     </Compile>
-    <Compile Include="..\..\MacOS\NetworkStateManagement\Networking\ProfileSignInScreen.cs">
+    <Compile Include="Networking\ProfileSignInScreen.cs">
       <Link>Networking\ProfileSignInScreen.cs</Link>
     </Compile>
-    <Compile Include="..\..\MacOS\NetworkStateManagement\ScreenManager\GameScreen.cs">
+    <Compile Include="ScreenManager\GameScreen.cs">
       <Link>ScreenManager\GameScreen.cs</Link>
     </Compile>
-    <Compile Include="..\..\MacOS\NetworkStateManagement\ScreenManager\InputState.cs">
+    <Compile Include="ScreenManager\InputState.cs">
       <Link>ScreenManager\InputState.cs</Link>
     </Compile>
-    <Compile Include="..\..\MacOS\NetworkStateManagement\ScreenManager\ScreenManager.cs">
+    <Compile Include="ScreenManager\ScreenManager.cs">
       <Link>ScreenManager\ScreenManager.cs</Link>
     </Compile>
-    <Compile Include="..\..\MacOS\NetworkStateManagement\Screens\BackgroundScreen.cs">
+    <Compile Include="Screens\BackgroundScreen.cs">
       <Link>Screens\BackgroundScreen.cs</Link>
     </Compile>
-    <Compile Include="..\..\MacOS\NetworkStateManagement\Screens\GameplayScreen.cs">
+    <Compile Include="Screens\GameplayScreen.cs">
       <Link>Screens\GameplayScreen.cs</Link>
     </Compile>
-    <Compile Include="..\..\MacOS\NetworkStateManagement\Screens\LoadingScreen.cs">
+    <Compile Include="Screens\LoadingScreen.cs">
       <Link>Screens\LoadingScreen.cs</Link>
     </Compile>
-    <Compile Include="..\..\MacOS\NetworkStateManagement\Screens\MainMenuScreen.cs">
+    <Compile Include="Screens\MainMenuScreen.cs">
       <Link>Screens\MainMenuScreen.cs</Link>
     </Compile>
-    <Compile Include="..\..\MacOS\NetworkStateManagement\Screens\MenuEntry.cs">
+    <Compile Include="Screens\MenuEntry.cs">
       <Link>Screens\MenuEntry.cs</Link>
     </Compile>
-    <Compile Include="..\..\MacOS\NetworkStateManagement\Screens\MenuScreen.cs">
+    <Compile Include="Screens\MenuScreen.cs">
       <Link>Screens\MenuScreen.cs</Link>
     </Compile>
-    <Compile Include="..\..\MacOS\NetworkStateManagement\Screens\MessageBoxScreen.cs">
+    <Compile Include="Screens\MessageBoxScreen.cs">
       <Link>Screens\MessageBoxScreen.cs</Link>
     </Compile>
-    <Compile Include="..\..\MacOS\NetworkStateManagement\Screens\PauseMenuScreen.cs">
+    <Compile Include="Screens\PauseMenuScreen.cs">
       <Link>Screens\PauseMenuScreen.cs</Link>
     </Compile>
-    <Compile Include="..\..\MacOS\NetworkStateManagement\Screens\PlayerIndexEventArgs.cs">
+    <Compile Include="Screens\PlayerIndexEventArgs.cs">
       <Link>Screens\PlayerIndexEventArgs.cs</Link>
     </Compile>
     <Compile Include="Program.cs" />
@@ -121,39 +121,39 @@
     </Compile>
   </ItemGroup>
   <ItemGroup>
-    <Content Include="..\..\MacOS\NetworkStateManagement\Content\background.xnb">
+    <Content Include="Content\background.xnb">
       <Link>Content\background.xnb</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="..\..\MacOS\NetworkStateManagement\Content\blank.xnb">
+    <Content Include="Content\blank.xnb">
       <Link>Content\blank.xnb</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="..\..\MacOS\NetworkStateManagement\Content\cat.xnb">
+    <Content Include="Content\cat.xnb">
       <Link>Content\cat.xnb</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="..\..\MacOS\NetworkStateManagement\Content\chat_able.xnb">
+    <Content Include="Content\chat_able.xnb">
       <Link>Content\chat_able.xnb</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="..\..\MacOS\NetworkStateManagement\Content\chat_mute.xnb">
+    <Content Include="Content\chat_mute.xnb">
       <Link>Content\chat_mute.xnb</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="..\..\MacOS\NetworkStateManagement\Content\chat_ready.xnb">
+    <Content Include="Content\chat_ready.xnb">
       <Link>Content\chat_ready.xnb</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="..\..\MacOS\NetworkStateManagement\Content\chat_talking.xnb">
+    <Content Include="Content\chat_talking.xnb">
       <Link>Content\chat_talking.xnb</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="..\..\MacOS\NetworkStateManagement\Content\gamefont.xnb">
+    <Content Include="Content\gamefont.xnb">
       <Link>Content\gamefont.xnb</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="..\..\MacOS\NetworkStateManagement\Content\gradient.xnb">
+    <Content Include="Content\gradient.xnb">
       <Link>Content\gradient.xnb</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
@@ -165,7 +165,7 @@
     </EmbeddedResource>
   </ItemGroup>
   <ItemGroup>
-    <Content Include="..\..\MacOS\NetworkStateManagement\Content\menufont.xnb">
+    <Content Include="Content\menufont.xnb">
       <Link>Content\menufont.xnb</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
@@ -179,7 +179,7 @@
   </Target>
   -->
   <ItemGroup>
-    <ProjectReference Include="..\..\..\MonoGame.Framework\MonoGame.Framework.Linux.csproj">
+    <ProjectReference Include="..\..\MonoGame.Framework\MonoGame.Framework.Linux.csproj">
       <Project>{35253CE1-C864-4CD3-8249-4D1319748E8F}</Project>
       <Name>MonoGame.Framework.Linux</Name>
     </ProjectReference>

+ 1 - 1
NetworkStateManagement/NetworkStateManagement.MacOS.csproj

@@ -38,7 +38,7 @@
     <Reference Include="MonoMac" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="Info.plist" />
+    <None Include="Info.plist"></None>
     <None Include="Content\background.png" />
     <None Include="Content\blank.png" />
     <None Include="Content\cat.tga" />

+ 35 - 35
NetworkStateManagement/NetworkStateManagement.Windows.csproj

@@ -41,76 +41,76 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="..\..\MacOS\NetworkStateManagement\Game.cs">
+    <Compile Include="Game.cs">
       <Link>Game.cs</Link>
     </Compile>
-    <Compile Include="..\..\MacOS\NetworkStateManagement\IMessageDisplay.cs">
+    <Compile Include="IMessageDisplay.cs">
       <Link>IMessageDisplay.cs</Link>
     </Compile>
-    <Compile Include="..\..\MacOS\NetworkStateManagement\MessageDisplayComponent.cs">
+    <Compile Include="MessageDisplayComponent.cs">
       <Link>MessageDisplayComponent.cs</Link>
     </Compile>
-    <Compile Include="..\..\MacOS\NetworkStateManagement\Networking\AvailableSessionMenuEntry.cs">
+    <Compile Include="Networking\AvailableSessionMenuEntry.cs">
       <Link>Networking\AvailableSessionMenuEntry.cs</Link>
     </Compile>
-    <Compile Include="..\..\MacOS\NetworkStateManagement\Networking\CreateOrFindSessionScreen.cs">
+    <Compile Include="Networking\CreateOrFindSessionScreen.cs">
       <Link>Networking\CreateOrFindSessionScreen.cs</Link>
     </Compile>
-    <Compile Include="..\..\MacOS\NetworkStateManagement\Networking\JoinSessionScreen.cs">
+    <Compile Include="Networking\JoinSessionScreen.cs">
       <Link>Networking\JoinSessionScreen.cs</Link>
     </Compile>
-    <Compile Include="..\..\MacOS\NetworkStateManagement\Networking\LobbyScreen.cs">
+    <Compile Include="Networking\LobbyScreen.cs">
       <Link>Networking\LobbyScreen.cs</Link>
     </Compile>
-    <Compile Include="..\..\MacOS\NetworkStateManagement\Networking\NetworkBusyScreen.cs">
+    <Compile Include="Networking\NetworkBusyScreen.cs">
       <Link>Networking\NetworkBusyScreen.cs</Link>
     </Compile>
-    <Compile Include="..\..\MacOS\NetworkStateManagement\Networking\NetworkErrorScreen.cs">
+    <Compile Include="Networking\NetworkErrorScreen.cs">
       <Link>Networking\NetworkErrorScreen.cs</Link>
     </Compile>
-    <Compile Include="..\..\MacOS\NetworkStateManagement\Networking\NetworkSessionComponent.cs">
+    <Compile Include="Networking\NetworkSessionComponent.cs">
       <Link>Networking\NetworkSessionComponent.cs</Link>
     </Compile>
-    <Compile Include="..\..\MacOS\NetworkStateManagement\Networking\OperationCompletedEventArgs.cs">
+    <Compile Include="Networking\OperationCompletedEventArgs.cs">
       <Link>Networking\OperationCompletedEventArgs.cs</Link>
     </Compile>
-    <Compile Include="..\..\MacOS\NetworkStateManagement\Networking\ProfileSignInScreen.cs">
+    <Compile Include="Networking\ProfileSignInScreen.cs">
       <Link>Networking\ProfileSignInScreen.cs</Link>
     </Compile>
-    <Compile Include="..\..\MacOS\NetworkStateManagement\ScreenManager\GameScreen.cs">
+    <Compile Include="ScreenManager\GameScreen.cs">
       <Link>ScreenManager\GameScreen.cs</Link>
     </Compile>
-    <Compile Include="..\..\MacOS\NetworkStateManagement\ScreenManager\InputState.cs">
+    <Compile Include="ScreenManager\InputState.cs">
       <Link>ScreenManager\InputState.cs</Link>
     </Compile>
-    <Compile Include="..\..\MacOS\NetworkStateManagement\ScreenManager\ScreenManager.cs">
+    <Compile Include="ScreenManager\ScreenManager.cs">
       <Link>ScreenManager\ScreenManager.cs</Link>
     </Compile>
-    <Compile Include="..\..\MacOS\NetworkStateManagement\Screens\BackgroundScreen.cs">
+    <Compile Include="Screens\BackgroundScreen.cs">
       <Link>Screens\BackgroundScreen.cs</Link>
     </Compile>
-    <Compile Include="..\..\MacOS\NetworkStateManagement\Screens\GameplayScreen.cs">
+    <Compile Include="Screens\GameplayScreen.cs">
       <Link>Screens\GameplayScreen.cs</Link>
     </Compile>
-    <Compile Include="..\..\MacOS\NetworkStateManagement\Screens\LoadingScreen.cs">
+    <Compile Include="Screens\LoadingScreen.cs">
       <Link>Screens\LoadingScreen.cs</Link>
     </Compile>
-    <Compile Include="..\..\MacOS\NetworkStateManagement\Screens\MainMenuScreen.cs">
+    <Compile Include="Screens\MainMenuScreen.cs">
       <Link>Screens\MainMenuScreen.cs</Link>
     </Compile>
-    <Compile Include="..\..\MacOS\NetworkStateManagement\Screens\MenuEntry.cs">
+    <Compile Include="Screens\MenuEntry.cs">
       <Link>Screens\MenuEntry.cs</Link>
     </Compile>
-    <Compile Include="..\..\MacOS\NetworkStateManagement\Screens\MenuScreen.cs">
+    <Compile Include="Screens\MenuScreen.cs">
       <Link>Screens\MenuScreen.cs</Link>
     </Compile>
-    <Compile Include="..\..\MacOS\NetworkStateManagement\Screens\MessageBoxScreen.cs">
+    <Compile Include="Screens\MessageBoxScreen.cs">
       <Link>Screens\MessageBoxScreen.cs</Link>
     </Compile>
-    <Compile Include="..\..\MacOS\NetworkStateManagement\Screens\PauseMenuScreen.cs">
+    <Compile Include="Screens\PauseMenuScreen.cs">
       <Link>Screens\PauseMenuScreen.cs</Link>
     </Compile>
-    <Compile Include="..\..\MacOS\NetworkStateManagement\Screens\PlayerIndexEventArgs.cs">
+    <Compile Include="Screens\PlayerIndexEventArgs.cs">
       <Link>Screens\PlayerIndexEventArgs.cs</Link>
     </Compile>
     <Compile Include="Program.cs" />
@@ -122,45 +122,45 @@
     </Compile>
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\..\MonoGame.Framework\MonoGame.Framework.Windows.csproj">
+    <ProjectReference Include="..\..\MonoGame.Framework\MonoGame.Framework.Windows.csproj">
       <Project>{7DE47032-A904-4C29-BD22-2D235E8D91BA}</Project>
       <Name>MonoGame.Framework.Windows</Name>
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <Content Include="..\..\MacOS\NetworkStateManagement\Content\background.xnb">
+    <Content Include="Content\background.xnb">
       <Link>Content\background.xnb</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="..\..\MacOS\NetworkStateManagement\Content\blank.xnb">
+    <Content Include="Content\blank.xnb">
       <Link>Content\blank.xnb</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="..\..\MacOS\NetworkStateManagement\Content\cat.xnb">
+    <Content Include="Content\cat.xnb">
       <Link>Content\cat.xnb</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="..\..\MacOS\NetworkStateManagement\Content\chat_able.xnb">
+    <Content Include="Content\chat_able.xnb">
       <Link>Content\chat_able.xnb</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="..\..\MacOS\NetworkStateManagement\Content\chat_mute.xnb">
+    <Content Include="Content\chat_mute.xnb">
       <Link>Content\chat_mute.xnb</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="..\..\MacOS\NetworkStateManagement\Content\chat_ready.xnb">
+    <Content Include="Content\chat_ready.xnb">
       <Link>Content\chat_ready.xnb</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="..\..\MacOS\NetworkStateManagement\Content\chat_talking.xnb">
+    <Content Include="Content\chat_talking.xnb">
       <Link>Content\chat_talking.xnb</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="..\..\MacOS\NetworkStateManagement\Content\gamefont.xnb">
+    <Content Include="Content\gamefont.xnb">
       <Link>Content\gamefont.xnb</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="..\..\MacOS\NetworkStateManagement\Content\gradient.xnb">
+    <Content Include="Content\gradient.xnb">
       <Link>Content\gradient.xnb</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
@@ -172,7 +172,7 @@
     </EmbeddedResource>
   </ItemGroup>
   <ItemGroup>
-    <Content Include="..\..\MacOS\NetworkStateManagement\Content\menufont.xnb">
+    <Content Include="Content\menufont.xnb">
       <Link>Content\menufont.xnb</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>

+ 6 - 8
Orientation/MonoGame.Samples.Orientation.iOS.csproj

@@ -63,29 +63,27 @@
     <Reference Include="OpenTK" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="Info.plist" />
+    <None Include="Info.iOS.plist"><Link>Info.plist</Link></None>
   </ItemGroup>
   <ItemGroup>
     <Compile Include="Main.cs" />
-    <Compile Include="..\..\Android\Orientation\LayoutSample.cs">
-      <Link>LayoutSample.cs</Link>
+    <Compile Include="LayoutSample.cs">
     </Compile>
-    <Compile Include="..\..\Android\Orientation\OrientationSample.cs">
-      <Link>OrientationSample.cs</Link>
+    <Compile Include="OrientationSample.cs">
     </Compile>
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <ItemGroup>
-    <ProjectReference Include="..\..\..\MonoGame.Framework\MonoGame.Framework.iOS.csproj">
+    <ProjectReference Include="..\..\MonoGame.Framework\MonoGame.Framework.iOS.csproj">
       <Project>{DB8508BB-9849-4CC2-BC0F-8EB5DACB3C47}</Project>
       <Name>MonoGame.Framework.iOS</Name>
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <Content Include="..\..\Android\Orientation\Assets\Content\directions.xnb">
+    <Content Include="Assets\Content\directions.xnb">
       <Link>Content\directions.xnb</Link>
     </Content>
-    <Content Include="..\..\Android\Orientation\Assets\Content\Font.xnb">
+    <Content Include="Assets\Content\Font.xnb">
       <Link>Content\Font.xnb</Link>
     </Content>
   </ItemGroup>

+ 1 - 1
Orientation/Orientation.Android.csproj

@@ -70,7 +70,7 @@
       <Project>{565129E0-4EE5-4F6F-B403-C3484C9740BE}</Project>
       <Name>Lidgren.Network.Android</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\MonoGame.Framework\MonoGame.Framework.Android.csproj">
+    <ProjectReference Include="..\..\MonoGame.Framework\MonoGame.Framework.Android.csproj">
       <Project>{BA9476CF-99BA-4D03-92F2-73D2C5E58883}</Project>
       <Name>MonoGame.Framework.Android</Name>
     </ProjectReference>

+ 1 - 1
Particle3DSample/Particle3DSample.MacOS.csproj

@@ -38,7 +38,7 @@
     <Reference Include="MonoMac" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="Info.plist" />
+    <None Include="Info.plist"></None>
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <Import Project="$(MSBuildExtensionsPath)\Mono\MonoMac\v0.0\Mono.MonoMac.targets" />

+ 1 - 1
Particle3DSample/ParticleSettings/ParticleSettings.csproj

@@ -43,7 +43,7 @@
     <Compile Include="ParticleSettings.cs" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\..\MonoGame.Framework\MonoGame.Framework.MacOS.csproj">
+    <ProjectReference Include="..\..\MonoGame.Framework\MonoGame.Framework.MacOS.csproj">
       <Project>{36C538E6-C32A-4A8D-A39C-566173D7118E}</Project>
       <Name>MonoGame.Framework.MacOS</Name>
     </ProjectReference>

+ 0 - 0
ParticleSample/Info.MacOS.plist → ParticleSample/Info.plist


+ 2 - 2
ParticleSample/MonoGame.Samples.ParticleSample.iOS.csproj

@@ -111,12 +111,12 @@
   </ItemGroup>
   <ItemGroup>
     <None Include="GameThumbnail.png" />
-    <None Include="Info.plist" />
+    <None Include="Info.iOS.plist"><Link>Info.plist</Link></None>
     <None Include="Content\explosion.png" />
     <None Include="Content\smoke.bmp" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\..\MonoGame.Framework\MonoGame.Framework.iOS.csproj">
+    <ProjectReference Include="..\..\MonoGame.Framework\MonoGame.Framework.iOS.csproj">
       <Project>{DB8508BB-9849-4CC2-BC0F-8EB5DACB3C47}</Project>
       <Name>MonoGame.Framework.iOS</Name>
     </ProjectReference>

+ 16 - 16
ParticleSample/ParticleSample.Linux.csproj

@@ -35,62 +35,62 @@
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <ItemGroup>
-    <None Include="..\..\MacOS\ParticleSample\Background.png">
+    <None Include="Background.png">
       <Link>Background.png</Link>
     </None>
-    <None Include="..\..\MacOS\ParticleSample\Game.ico">
+    <None Include="Game.ico">
       <Link>Game.ico</Link>
     </None>
-    <None Include="..\..\MacOS\ParticleSample\GameThumbnail.png">
+    <None Include="GameThumbnail.png">
       <Link>GameThumbnail.png</Link>
     </None>
-    <None Include="..\..\MacOS\ParticleSample\Content\explosion.png">
+    <None Include="Content\explosion.png">
       <Link>Content\explosion.png</Link>
     </None>
-    <None Include="..\..\MacOS\ParticleSample\Content\font.spritefont">
+    <None Include="Content\font.spritefont">
       <Link>Content\font.spritefont</Link>
     </None>
-    <None Include="..\..\MacOS\ParticleSample\Content\smoke.bmp">
+    <None Include="Content\smoke.bmp">
       <Link>Content\smoke.bmp</Link>
     </None>
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="..\..\MacOS\ParticleSample\ExplosionParticleSystem.cs">
+    <Compile Include="ExplosionParticleSystem.cs">
       <Link>ExplosionParticleSystem.cs</Link>
     </Compile>
-    <Compile Include="..\..\MacOS\ParticleSample\ExplosionSmokeParticleSystem.cs">
+    <Compile Include="ExplosionSmokeParticleSystem.cs">
       <Link>ExplosionSmokeParticleSystem.cs</Link>
     </Compile>
-    <Compile Include="..\..\MacOS\ParticleSample\Particle.cs">
+    <Compile Include="Particle.cs">
       <Link>Particle.cs</Link>
     </Compile>
-    <Compile Include="..\..\MacOS\ParticleSample\ParticleSampleGame.cs">
+    <Compile Include="ParticleSampleGame.cs">
       <Link>ParticleSampleGame.cs</Link>
     </Compile>
-    <Compile Include="..\..\MacOS\ParticleSample\ParticleSystem.cs">
+    <Compile Include="ParticleSystem.cs">
       <Link>ParticleSystem.cs</Link>
     </Compile>
-    <Compile Include="..\..\MacOS\ParticleSample\SmokePlumeParticleSystem.cs">
+    <Compile Include="SmokePlumeParticleSystem.cs">
       <Link>SmokePlumeParticleSystem.cs</Link>
     </Compile>
     <Compile Include="Program.cs" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\..\MonoGame.Framework\MonoGame.Framework.Linux.csproj">
+    <ProjectReference Include="..\..\MonoGame.Framework\MonoGame.Framework.Linux.csproj">
       <Project>{35253CE1-C864-4CD3-8249-4D1319748E8F}</Project>
       <Name>MonoGame.Framework.Linux</Name>
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <Content Include="..\..\MacOS\ParticleSample\Content\explosion.xnb">
+    <Content Include="Content\explosion.xnb">
       <Link>Content\explosion.xnb</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="..\..\MacOS\ParticleSample\Content\font.xnb">
+    <Content Include="Content\font.xnb">
       <Link>Content\font.xnb</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="..\..\MacOS\ParticleSample\Content\smoke.xnb">
+    <Content Include="Content\smoke.xnb">
       <Link>Content\smoke.xnb</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>

+ 1 - 1
ParticleSample/ParticleSample.MacOS.csproj

@@ -40,7 +40,7 @@
     <Reference Include="MonoMac" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="Info.plist" />
+    <None Include="Info.plist"></None>
     <None Include="Background.png" />
     <None Include="Game.ico" />
     <None Include="GameThumbnail.png" />

+ 0 - 0
Peer2PeerSample/Info.MacOS.plist → Peer2PeerSample/Info.plist


+ 7 - 7
Peer2PeerSample/MonoGame.Samples.Peer2Peer.Android.csproj

@@ -51,15 +51,15 @@
   <ItemGroup>
     <Compile Include="Activity1.cs" />
     <Compile Include="Resources\Resource.Designer.cs" />
-    <Compile Include="..\..\MacOS\Peer2PeerSample\PeerToPeerGame.cs">
+    <Compile Include="PeerToPeerGame.cs">
       <Link>PeerToPeerGame.cs</Link>
     </Compile>
-    <Compile Include="..\..\MacOS\Peer2PeerSample\Tank.cs">
+    <Compile Include="Tank.cs">
       <Link>Tank.cs</Link>
     </Compile>
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\..\MonoGame.Framework\MonoGame.Framework.Android.csproj">
+    <ProjectReference Include="..\..\MonoGame.Framework\MonoGame.Framework.Android.csproj">
       <Project>{BA9476CF-99BA-4D03-92F2-73D2C5E58883}</Project>
       <Name>MonoGame.Framework.Android</Name>
     </ProjectReference>
@@ -73,16 +73,16 @@
   </Target>
   -->
   <ItemGroup>
-    <AndroidAsset Include="..\..\MacOS\Peer2PeerSample\Content\Font.xnb">
+    <AndroidAsset Include="Content\Font.xnb">
       <Link>Assets\Content\Font.xnb</Link>
     </AndroidAsset>
-    <AndroidAsset Include="..\..\iOS\Peer2Peer\Content\gamepad.png">
+    <AndroidAsset Include="Content\gamepad.png">
       <Link>Assets\Content\gamepad.png</Link>
     </AndroidAsset>
-    <AndroidAsset Include="..\..\MacOS\Peer2PeerSample\Content\Tank.xnb">
+    <AndroidAsset Include="Content\Tank.xnb">
       <Link>Assets\Content\Tank.xnb</Link>
     </AndroidAsset>
-    <AndroidAsset Include="..\..\MacOS\Peer2PeerSample\Content\Turret.xnb">
+    <AndroidAsset Include="Content\Turret.xnb">
       <Link>Assets\Content\Turret.xnb</Link>
     </AndroidAsset>
   </ItemGroup>

+ 7 - 7
Peer2PeerSample/MonoGame.Samples.Peer2Peer.iOS.csproj

@@ -63,20 +63,20 @@
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <ItemGroup>
-    <ProjectReference Include="..\..\..\MonoGame.Framework\MonoGame.Framework.iOS.csproj">
+    <ProjectReference Include="..\..\MonoGame.Framework\MonoGame.Framework.iOS.csproj">
       <Project>{DB8508BB-9849-4CC2-BC0F-8EB5DACB3C47}</Project>
       <Name>MonoGame.Framework.iOS</Name>
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <None Include="Info.plist" />
+    <None Include="Info.iOS.plist"><Link>Info.plist</Link></None>
   </ItemGroup>
   <ItemGroup>
     <Compile Include="Program.cs" />
-    <Compile Include="..\..\MacOS\Peer2PeerSample\PeerToPeerGame.cs">
+    <Compile Include="PeerToPeerGame.cs">
       <Link>PeerToPeerGame.cs</Link>
     </Compile>
-    <Compile Include="..\..\MacOS\Peer2PeerSample\Tank.cs">
+    <Compile Include="Tank.cs">
       <Link>Tank.cs</Link>
     </Compile>
   </ItemGroup>
@@ -84,13 +84,13 @@
     <Content Include="Content\gamepad.png">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="..\..\MacOS\Peer2PeerSample\Content\Tank.xnb">
+    <Content Include="Content\Tank.xnb">
       <Link>Content\Tank.xnb</Link>
     </Content>
-    <Content Include="..\..\MacOS\Peer2PeerSample\Content\Font.xnb">
+    <Content Include="Content\Font.xnb">
       <Link>Content\Font.xnb</Link>
     </Content>
-    <Content Include="..\..\MacOS\Peer2PeerSample\Content\Turret.xnb">
+    <Content Include="Content\Turret.xnb">
       <Link>Content\Turret.xnb</Link>
     </Content>
   </ItemGroup>

+ 7 - 7
Peer2PeerSample/MonoGame.Samples.Peer2PeerSample.Linux.csproj

@@ -40,36 +40,36 @@
     <Reference Include="System.Drawing" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="..\..\MacOS\Peer2PeerSample\PeerToPeerGame.cs">
+    <Compile Include="PeerToPeerGame.cs">
       <Link>PeerToPeerGame.cs</Link>
     </Compile>
-    <Compile Include="..\..\MacOS\Peer2PeerSample\Tank.cs">
+    <Compile Include="Tank.cs">
       <Link>Tank.cs</Link>
     </Compile>
     <Compile Include="Program.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup>
-    <Content Include="..\..\MacOS\Peer2PeerSample\Content\Font.spritefont">
+    <Content Include="Content\Font.spritefont">
       <Link>Content\Font.spritefont</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="..\..\MacOS\Peer2PeerSample\Content\Font.xnb">
+    <Content Include="Content\Font.xnb">
       <Link>Content\Font.xnb</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="..\..\MacOS\Peer2PeerSample\Content\Tank.xnb">
+    <Content Include="Content\Tank.xnb">
       <Link>Content\Tank.xnb</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="..\..\MacOS\Peer2PeerSample\Content\Turret.xnb">
+    <Content Include="Content\Turret.xnb">
       <Link>Content\Turret.xnb</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\..\MonoGame.Framework\MonoGame.Framework.Linux.csproj">
+    <ProjectReference Include="..\..\MonoGame.Framework\MonoGame.Framework.Linux.csproj">
       <Project>{35253CE1-C864-4CD3-8249-4D1319748E8F}</Project>
       <Name>MonoGame.Framework.Linux</Name>
     </ProjectReference>

+ 1 - 1
Peer2PeerSample/Peer2PeerSample.MacOS.csproj

@@ -38,7 +38,7 @@
     <Reference Include="MonoMac" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="Info.plist" />
+    <None Include="Info.plist"></None>
     <None Include="Content\Font.spritefont" />
     <None Include="Content\Tank.tga" />
     <None Include="Content\Turret.tga" />

+ 7 - 7
Peer2PeerSample/Peer2PeerSample.Windows.csproj

@@ -47,36 +47,36 @@
     </Reference>
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="..\..\MacOS\Peer2PeerSample\PeerToPeerGame.cs">
+    <Compile Include="PeerToPeerGame.cs">
       <Link>PeerToPeerGame.cs</Link>
     </Compile>
-    <Compile Include="..\..\MacOS\Peer2PeerSample\Tank.cs">
+    <Compile Include="Tank.cs">
       <Link>Tank.cs</Link>
     </Compile>
     <Compile Include="Program.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup>
-    <Content Include="..\..\MacOS\Peer2PeerSample\Content\Font.spritefont">
+    <Content Include="Content\Font.spritefont">
       <Link>Content\Font.spritefont</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="..\..\MacOS\Peer2PeerSample\Content\Font.xnb">
+    <Content Include="Content\Font.xnb">
       <Link>Content\Font.xnb</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="..\..\MacOS\Peer2PeerSample\Content\Tank.xnb">
+    <Content Include="Content\Tank.xnb">
       <Link>Content\Tank.xnb</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="..\..\MacOS\Peer2PeerSample\Content\Turret.xnb">
+    <Content Include="Content\Turret.xnb">
       <Link>Content\Turret.xnb</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\..\MonoGame.Framework\MonoGame.Framework.Windows.csproj">
+    <ProjectReference Include="..\..\MonoGame.Framework\MonoGame.Framework.Windows.csproj">
       <Project>{7DE47032-A904-4C29-BD22-2D235E8D91BA}</Project>
       <Name>MonoGame.Framework.Windows</Name>
     </ProjectReference>

+ 0 - 0
PerPixelCollisionSample/Info.MacOS.plist → PerPixelCollisionSample/Info.plist


+ 8 - 8
PerPixelCollisionSample/MonoGame.Samples.PerPixelCollision.iOS.csproj

@@ -61,35 +61,35 @@
     <Reference Include="OpenTK" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="Info.plist" />
-    <None Include="..\..\MacOS\PerPixelCollisionSample\GameThumbnail.png">
+    <None Include="Info.iOS.plist"><Link>Info.plist</Link></None>
+    <None Include="GameThumbnail.png">
       <Link>GameThumbnail.png</Link>
     </None>
-    <None Include="..\..\MacOS\PerPixelCollisionSample\Content\Block.bmp">
+    <None Include="Content\Block.bmp">
       <Link>Content\Block.bmp</Link>
     </None>
-    <None Include="..\..\MacOS\PerPixelCollisionSample\Content\Person.bmp">
+    <None Include="Content\Person.bmp">
       <Link>Content\Person.bmp</Link>
     </None>
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <ItemGroup>
-    <Compile Include="..\..\MacOS\PerPixelCollisionSample\Game1.cs">
+    <Compile Include="Game1.cs">
       <Link>Game1.cs</Link>
     </Compile>
     <Compile Include="Program.cs" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\..\MonoGame.Framework\MonoGame.Framework.iOS.csproj">
+    <ProjectReference Include="..\..\MonoGame.Framework\MonoGame.Framework.iOS.csproj">
       <Project>{DB8508BB-9849-4CC2-BC0F-8EB5DACB3C47}</Project>
       <Name>MonoGame.Framework.iOS</Name>
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <Content Include="..\..\MacOS\PerPixelCollisionSample\Content\Block.xnb">
+    <Content Include="Content\Block.xnb">
       <Link>Content\Block.xnb</Link>
     </Content>
-    <Content Include="..\..\MacOS\PerPixelCollisionSample\Content\Person.xnb">
+    <Content Include="Content\Person.xnb">
       <Link>Content\Person.xnb</Link>
     </Content>
   </ItemGroup>

+ 1 - 1
PerPixelCollisionSample/PerPixelCollisionSample.MacOS.csproj

@@ -38,7 +38,7 @@
     <Reference Include="MonoMac" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="Info.plist" />
+    <None Include="Info.plist"></None>
     <None Include="Game.ico" />
     <None Include="GameThumbnail.png" />
   </ItemGroup>

+ 0 - 16
Primitives/Info.MacOS.plist

@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>CFBundleIdentifier</key>
-	<string>com.yourcompany.Primitives</string>
-	<key>CFBundleName</key>
-	<string>Primitives</string>
-	<key>CFBundleVersion</key>
-	<string>1</string>
-	<key>LSMinimumSystemVersion</key>
-	<string>10.6</string>
-	<key>NSPrincipalClass</key>
-	<string>NSApplication</string>
-</dict>
-</plist>

+ 12 - 0
Primitives/Info.iOS.plist

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>UISupportedInterfaceOrientations</key>
+	<array>
+		<string>UIInterfaceOrientationPortrait</string>
+		<string>UIInterfaceOrientationLandscapeLeft</string>
+		<string>UIInterfaceOrientationLandscapeRight</string>
+	</array>
+</dict>
+</plist>

+ 10 - 6
Primitives/Info.plist

@@ -2,11 +2,15 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
-	<key>UISupportedInterfaceOrientations</key>
-	<array>
-		<string>UIInterfaceOrientationPortrait</string>
-		<string>UIInterfaceOrientationLandscapeLeft</string>
-		<string>UIInterfaceOrientationLandscapeRight</string>
-	</array>
+	<key>CFBundleIdentifier</key>
+	<string>com.yourcompany.Primitives</string>
+	<key>CFBundleName</key>
+	<string>Primitives</string>
+	<key>CFBundleVersion</key>
+	<string>1</string>
+	<key>LSMinimumSystemVersion</key>
+	<string>10.6</string>
+	<key>NSPrincipalClass</key>
+	<string>NSApplication</string>
 </dict>
 </plist>

+ 1 - 1
Primitives/MonoGame.Samples.Primitives.Android.csproj

@@ -65,7 +65,7 @@
   </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath)\Novell\Novell.MonoDroid.CSharp.targets" />
   <ItemGroup>
-    <ProjectReference Include="..\..\..\MonoGame.Framework\MonoGame.Framework.Android.csproj">
+    <ProjectReference Include="..\..\MonoGame.Framework\MonoGame.Framework.Android.csproj">
       <Project>{BA9476CF-99BA-4D03-92F2-73D2C5E58883}</Project>
       <Name>MonoGame.Framework.Android</Name>
     </ProjectReference>

+ 6 - 6
Primitives/MonoGame.Samples.Primitives.iOS.csproj

@@ -60,28 +60,28 @@
     <Reference Include="monotouch" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="Info.plist" />
-    <None Include="..\..\MacOS\Primitives\Game.ico">
+    <None Include="Info.iOS.plist"><Link>Info.plist</Link></None>
+    <None Include="Game.ico">
       <Link>Game.ico</Link>
     </None>
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <ItemGroup>
     <Compile Include="Program.cs" />
-    <Compile Include="..\..\MacOS\Primitives\PrimitiveBatch.cs">
+    <Compile Include="PrimitiveBatch.cs">
       <Link>PrimitiveBatch.cs</Link>
     </Compile>
-    <Compile Include="..\..\MacOS\Primitives\PrimitivesSampleGame.cs">
+    <Compile Include="PrimitivesSampleGame.cs">
       <Link>PrimitivesSampleGame.cs</Link>
     </Compile>
   </ItemGroup>
   <ItemGroup>
-    <Content Include="..\..\MacOS\Primitives\GameThumbnail.png">
+    <Content Include="GameThumbnail.png">
       <Link>GameThumbnail.png</Link>
     </Content>
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\..\MonoGame.Framework\MonoGame.Framework.iOS.csproj">
+    <ProjectReference Include="..\..\MonoGame.Framework\MonoGame.Framework.iOS.csproj">
       <Project>{DB8508BB-9849-4CC2-BC0F-8EB5DACB3C47}</Project>
       <Name>MonoGame.Framework.iOS</Name>
     </ProjectReference>

+ 1 - 1
Primitives/Primitives.MacOS.csproj

@@ -38,7 +38,7 @@
     <Reference Include="MonoMac" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="Info.plist" />
+    <None Include="Info.plist"></None>
     <None Include="Game.ico" />
     <None Include="GameThumbnail.png" />
   </ItemGroup>

+ 0 - 0
RectangleCollisionSample/Info.MacOS.plist → RectangleCollisionSample/Info.plist


+ 8 - 8
RectangleCollisionSample/MonoGame.Samples.RectangleCollision.iOS.csproj

@@ -61,35 +61,35 @@
     <Reference Include="OpenTK" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="Info.plist" />
-    <None Include="..\..\MacOS\RectangleCollisionSample\Content\Block.bmp">
+    <None Include="Info.iOS.plist"><Link>Info.plist</Link></None>
+    <None Include="Content\Block.bmp">
       <Link>Content\Block.bmp</Link>
     </None>
-    <None Include="..\..\MacOS\RectangleCollisionSample\Content\Person.bmp">
+    <None Include="Content\Person.bmp">
       <Link>Content\Person.bmp</Link>
     </None>
-    <None Include="..\..\MacOS\RectangleCollisionSample\GameThumbnail.png">
+    <None Include="GameThumbnail.png">
       <Link>GameThumbnail.png</Link>
     </None>
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <ItemGroup>
-    <ProjectReference Include="..\..\..\MonoGame.Framework\MonoGame.Framework.iOS.csproj">
+    <ProjectReference Include="..\..\MonoGame.Framework\MonoGame.Framework.iOS.csproj">
       <Project>{DB8508BB-9849-4CC2-BC0F-8EB5DACB3C47}</Project>
       <Name>MonoGame.Framework.iOS</Name>
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <Content Include="..\..\MacOS\RectangleCollisionSample\Content\Block.xnb">
+    <Content Include="Content\Block.xnb">
       <Link>Content\Block.xnb</Link>
     </Content>
-    <Content Include="..\..\MacOS\RectangleCollisionSample\Content\Person.xnb">
+    <Content Include="Content\Person.xnb">
       <Link>Content\Person.xnb</Link>
     </Content>
   </ItemGroup>
   <ItemGroup>
     <Compile Include="Program.cs" />
-    <Compile Include="..\..\MacOS\RectangleCollisionSample\Game1.cs">
+    <Compile Include="Game1.cs">
       <Link>Game1.cs</Link>
     </Compile>
   </ItemGroup>

+ 1 - 1
RectangleCollisionSample/RectangleCollisionSample.MacOS.csproj

@@ -38,7 +38,7 @@
     <Reference Include="MonoMac" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="Info.plist" />
+    <None Include="Info.plist"></None>
     <None Include="Game.ico" />
     <None Include="GameThumbnail.png" />
     <None Include="Content\Block.bmp" />

+ 0 - 0
RenderTarget2DSample/Info.MacOS.plist → RenderTarget2DSample/Info.plist


+ 4 - 4
RenderTarget2DSample/MonoGame.Samples.RenderTarget2D.Android.csproj

@@ -49,7 +49,7 @@
     <Compile Include="Activity1.cs" />
     <Compile Include="Resources\Resource.designer.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="..\..\MacOS\RenderTarget2DSample\Game1.cs">
+    <Compile Include="Game1.cs">
       <Link>Game1.cs</Link>
     </Compile>
   </ItemGroup>
@@ -59,15 +59,15 @@
   </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath)\Novell\Novell.MonoDroid.CSharp.targets" />
   <ItemGroup>
-    <AndroidAsset Include="..\..\MacOS\RenderTarget2DSample\Content\MooTheMerciless.xnb">
+    <AndroidAsset Include="Content\MooTheMerciless.xnb">
       <Link>Assets\Content\MooTheMerciless.xnb</Link>
     </AndroidAsset>
-    <AndroidAsset Include="..\..\MacOS\RenderTarget2DSample\Content\wood.xnb">
+    <AndroidAsset Include="Content\wood.xnb">
       <Link>Assets\Content\wood.xnb</Link>
     </AndroidAsset>
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\..\MonoGame.Framework\MonoGame.Framework.Android.csproj">
+    <ProjectReference Include="..\..\MonoGame.Framework\MonoGame.Framework.Android.csproj">
       <Project>{BA9476CF-99BA-4D03-92F2-73D2C5E58883}</Project>
       <Name>MonoGame.Framework.Android</Name>
     </ProjectReference>

Деякі файли не було показано, через те що забагато файлів було змінено