Przeglądaj źródła

Merge branch 'master' of github.com:CartBlanche/MonoGame-Samples

Dominique Louis 14 lat temu
rodzic
commit
31c590046c
48 zmienionych plików z 72 dodań i 50 usunięć
  1. 1 1
      Samples/MacOS/BookSourceCode/XNAGameDevelopmentbyExampleCode/AsteroidBeltAssault/AsteroidBeltAssault.csproj
  2. 1 1
      Samples/MacOS/BookSourceCode/XNAGameDevelopmentbyExampleCode/FloodControl/FloodControl.csproj
  3. 4 4
      Samples/MacOS/BookSourceCode/XNAGameDevelopmentbyExampleCode/GemstoneHunter/GemstoneHunter.csproj
  4. 1 1
      Samples/MacOS/BookSourceCode/XNAGameDevelopmentbyExampleCode/GemstoneHunter/TileEngine/Tile Engine.csproj
  5. 1 1
      Samples/MacOS/BookSourceCode/XNAGameDevelopmentbyExampleCode/RobotRampage/RobotRampage.csproj
  6. 1 1
      Samples/MacOS/BouncingBox/MonoGame.Samples.BouncingBox.MacOS.csproj
  7. 1 1
      Samples/MacOS/ChaseAndEvade/MonoGame.Samples.ChaseAndEvade.MacOS.csproj
  8. 1 1
      Samples/MacOS/Draw2D/MonoGame.Samples.Draw2D.MacOS.csproj
  9. BIN
      Samples/MacOS/Draw2D/bin/Debug/MonoGame.Samples.Draw2D.MacOS.app/Contents/Resources/Lidgren.Network.dll
  10. BIN
      Samples/MacOS/Draw2D/bin/Debug/MonoGame.Samples.Draw2D.MacOS.app/Contents/Resources/Lidgren.Network.dll.mdb
  11. BIN
      Samples/MacOS/Draw2D/bin/Debug/MonoGame.Samples.Draw2D.MacOS.app/Contents/Resources/MonoGame.Framework.MacOS.dll
  12. BIN
      Samples/MacOS/Draw2D/bin/Debug/MonoGame.Samples.Draw2D.MacOS.app/Contents/Resources/MonoGame.Framework.MacOS.dll.mdb
  13. BIN
      Samples/MacOS/Draw2D/bin/Debug/MonoGame.Samples.Draw2D.MacOS.app/Contents/Resources/MonoGame.Samples.Draw2D.MacOS.exe
  14. BIN
      Samples/MacOS/Draw2D/bin/Debug/MonoGame.Samples.Draw2D.MacOS.app/Contents/Resources/MonoGame.Samples.Draw2D.MacOS.exe.mdb
  15. BIN
      Samples/MacOS/Draw2D/bin/Debug/MonoGame.Samples.Draw2D.MacOS.app/Contents/Resources/MonoMac.dll
  16. BIN
      Samples/MacOS/Draw2D/bin/Debug/MonoGame.Samples.Draw2D.MacOS.app/Contents/Resources/MonoMac.dll.mdb
  17. 1 1
      Samples/MacOS/GameStateManagement/GameStateManagement.csproj
  18. 2 2
      Samples/MacOS/GooCursor/GooCursor.csproj
  19. BIN
      Samples/MacOS/GooCursor/bin/Debug/GooCursor.app/Contents/Resources/GooCursor.exe
  20. BIN
      Samples/MacOS/GooCursor/bin/Debug/GooCursor.app/Contents/Resources/GooCursor.exe.mdb
  21. BIN
      Samples/MacOS/GooCursor/bin/Debug/GooCursor.app/Contents/Resources/Lidgren.Network.dll
  22. BIN
      Samples/MacOS/GooCursor/bin/Debug/GooCursor.app/Contents/Resources/Lidgren.Network.dll.mdb
  23. BIN
      Samples/MacOS/GooCursor/bin/Debug/GooCursor.app/Contents/Resources/MonoGame.Framework.MacOS.dll
  24. BIN
      Samples/MacOS/GooCursor/bin/Debug/GooCursor.app/Contents/Resources/MonoGame.Framework.MacOS.dll.mdb
  25. BIN
      Samples/MacOS/GooCursor/bin/Debug/GooCursor.app/Contents/Resources/MonoMac.dll
  26. BIN
      Samples/MacOS/GooCursor/bin/Debug/GooCursor.app/Contents/Resources/MonoMac.dll.mdb
  27. BIN
      Samples/MacOS/GooCursor/bin/Debug/GooCursor.exe
  28. BIN
      Samples/MacOS/GooCursor/bin/Debug/GooCursor.exe.mdb
  29. BIN
      Samples/MacOS/GooCursor/bin/Debug/Lidgren.Network.dll
  30. BIN
      Samples/MacOS/GooCursor/bin/Debug/Lidgren.Network.dll.mdb
  31. BIN
      Samples/MacOS/GooCursor/bin/Debug/MonoGame.Framework.MacOS.dll
  32. BIN
      Samples/MacOS/GooCursor/bin/Debug/MonoGame.Framework.MacOS.dll.mdb
  33. BIN
      Samples/MacOS/GooCursor/bin/Debug/MonoMac.dll
  34. BIN
      Samples/MacOS/GooCursor/bin/Debug/MonoMac.dll.mdb
  35. 2 2
      Samples/MacOS/HoneycombRush/HoneycombRush.csproj
  36. 2 2
      Samples/MacOS/NetworkPrediction/NetworkPrediction.csproj
  37. 1 1
      Samples/MacOS/NetworkStateManagement/NetworkStateManagement.csproj
  38. 4 4
      Samples/MacOS/Particle3DSample/Particle3DSample.csproj
  39. 1 1
      Samples/MacOS/ParticleSettingsMac/ParticleSettingsMac.csproj
  40. 1 1
      Samples/MacOS/Peer2PeerSample/Peer2PeerSample.csproj
  41. 1 1
      Samples/MacOS/PerPixelCollisionSample/PerPixelCollisionSample.csproj
  42. 1 1
      Samples/MacOS/RectangleCollisionSample/RectangleCollisionSample.csproj
  43. 1 1
      Samples/MacOS/SpriteEffects/SpriteEffects.csproj
  44. 1 1
      Samples/MacOS/Tetris/MonoGame.Samples.Tetris.MacOS.csproj
  45. 1 1
      Samples/MacOS/TiledSprites/MonoGame.Samples.TiledSprites.MacOS.csproj
  46. 2 2
      Samples/MacOS/TransformedCollisionSample/TransformedCollisionSample.csproj
  47. 13 0
      Samples/MonoGame.Samples.MacOS.sln
  48. 27 18
      Samples/iOS/TiledSprites/TileGrid.cs

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

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

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

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

+ 4 - 4
Samples/MacOS/BookSourceCode/XNAGameDevelopmentbyExampleCode/GemstoneHunter/GemstoneHunter.csproj

@@ -46,14 +46,14 @@
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <Import Project="$(MSBuildExtensionsPath)\Mono\MonoMac\v0.0\Mono.MonoMac.targets" />
   <Import Project="$(MSBuildExtensionsPath)\Mono\MonoMac\v0.0\Mono.MonoMac.targets" />
   <ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\..\..\..\MonoGame.Framework\MonoGame.Framework.MacOS.csproj">
-      <Project>{36C538E6-C32A-4A8D-A39C-566173D7118E}</Project>
-      <Name>MonoGame.Framework.MacOS</Name>
-    </ProjectReference>
     <ProjectReference Include="TileEngine\Tile Engine.csproj">
     <ProjectReference Include="TileEngine\Tile Engine.csproj">
       <Project>{521972FD-1A9B-4CFD-A435-EB2224985131}</Project>
       <Project>{521972FD-1A9B-4CFD-A435-EB2224985131}</Project>
       <Name>Tile Engine</Name>
       <Name>Tile Engine</Name>
     </ProjectReference>
     </ProjectReference>
+    <ProjectReference Include="..\..\..\..\..\..\MonoGame\MonoGame.Framework\MonoGame.Framework.MacOS.csproj">
+      <Project>{36C538E6-C32A-4A8D-A39C-566173D7118E}</Project>
+      <Name>MonoGame.Framework.MacOS</Name>
+    </ProjectReference>
   </ItemGroup>
   </ItemGroup>
   <ItemGroup>
   <ItemGroup>
     <Folder Include="Content\" />
     <Folder Include="Content\" />

+ 1 - 1
Samples/MacOS/BookSourceCode/XNAGameDevelopmentbyExampleCode/GemstoneHunter/TileEngine/Tile Engine.csproj

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

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

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

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

@@ -64,7 +64,7 @@
     <None Include="Info.plist" />
     <None Include="Info.plist" />
   </ItemGroup>
   </ItemGroup>
   <ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\..\MonoGame.Framework\MonoGame.Framework.MacOS.csproj">
+    <ProjectReference Include="..\..\..\..\MonoGame\MonoGame.Framework\MonoGame.Framework.MacOS.csproj">
       <Project>{36C538E6-C32A-4A8D-A39C-566173D7118E}</Project>
       <Project>{36C538E6-C32A-4A8D-A39C-566173D7118E}</Project>
       <Name>MonoGame.Framework.MacOS</Name>
       <Name>MonoGame.Framework.MacOS</Name>
     </ProjectReference>
     </ProjectReference>

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

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

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

@@ -74,7 +74,7 @@
     <Content Include="monogameicon.png" />
     <Content Include="monogameicon.png" />
   </ItemGroup>
   </ItemGroup>
   <ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\..\MonoGame.Framework\MonoGame.Framework.MacOS.csproj">
+    <ProjectReference Include="..\..\..\..\MonoGame\MonoGame.Framework\MonoGame.Framework.MacOS.csproj">
       <Project>{36C538E6-C32A-4A8D-A39C-566173D7118E}</Project>
       <Project>{36C538E6-C32A-4A8D-A39C-566173D7118E}</Project>
       <Name>MonoGame.Framework.MacOS</Name>
       <Name>MonoGame.Framework.MacOS</Name>
     </ProjectReference>
     </ProjectReference>

BIN
Samples/MacOS/Draw2D/bin/Debug/MonoGame.Samples.Draw2D.MacOS.app/Contents/Resources/Lidgren.Network.dll


BIN
Samples/MacOS/Draw2D/bin/Debug/MonoGame.Samples.Draw2D.MacOS.app/Contents/Resources/Lidgren.Network.dll.mdb


BIN
Samples/MacOS/Draw2D/bin/Debug/MonoGame.Samples.Draw2D.MacOS.app/Contents/Resources/MonoGame.Framework.MacOS.dll


BIN
Samples/MacOS/Draw2D/bin/Debug/MonoGame.Samples.Draw2D.MacOS.app/Contents/Resources/MonoGame.Framework.MacOS.dll.mdb


BIN
Samples/MacOS/Draw2D/bin/Debug/MonoGame.Samples.Draw2D.MacOS.app/Contents/Resources/MonoGame.Samples.Draw2D.MacOS.exe


BIN
Samples/MacOS/Draw2D/bin/Debug/MonoGame.Samples.Draw2D.MacOS.app/Contents/Resources/MonoGame.Samples.Draw2D.MacOS.exe.mdb


BIN
Samples/MacOS/Draw2D/bin/Debug/MonoGame.Samples.Draw2D.MacOS.app/Contents/Resources/MonoMac.dll


BIN
Samples/MacOS/Draw2D/bin/Debug/MonoGame.Samples.Draw2D.MacOS.app/Contents/Resources/MonoMac.dll.mdb


+ 1 - 1
Samples/MacOS/GameStateManagement/GameStateManagement.csproj

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

+ 2 - 2
Samples/MacOS/GooCursor/GooCursor.csproj

@@ -50,11 +50,11 @@
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <Import Project="$(MSBuildExtensionsPath)\Mono\MonoMac\v0.0\Mono.MonoMac.targets" />
   <Import Project="$(MSBuildExtensionsPath)\Mono\MonoMac\v0.0\Mono.MonoMac.targets" />
   <ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\..\ThirdParty\Lidgren.Network\Lidgren.Network.MacOS.csproj">
+    <ProjectReference Include="..\..\..\..\MonoGame\ThirdParty\Lidgren.Network\Lidgren.Network.MacOS.csproj">
       <Project>{AE483C29-042E-4226-BA52-D247CE7676DA}</Project>
       <Project>{AE483C29-042E-4226-BA52-D247CE7676DA}</Project>
       <Name>Lidgren.Network.MacOS</Name>
       <Name>Lidgren.Network.MacOS</Name>
     </ProjectReference>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\MonoGame.Framework\MonoGame.Framework.MacOS.csproj">
+    <ProjectReference Include="..\..\..\..\MonoGame\MonoGame.Framework\MonoGame.Framework.MacOS.csproj">
       <Project>{36C538E6-C32A-4A8D-A39C-566173D7118E}</Project>
       <Project>{36C538E6-C32A-4A8D-A39C-566173D7118E}</Project>
       <Name>MonoGame.Framework.MacOS</Name>
       <Name>MonoGame.Framework.MacOS</Name>
     </ProjectReference>
     </ProjectReference>

BIN
Samples/MacOS/GooCursor/bin/Debug/GooCursor.app/Contents/Resources/GooCursor.exe


BIN
Samples/MacOS/GooCursor/bin/Debug/GooCursor.app/Contents/Resources/GooCursor.exe.mdb


BIN
Samples/MacOS/GooCursor/bin/Debug/GooCursor.app/Contents/Resources/Lidgren.Network.dll


BIN
Samples/MacOS/GooCursor/bin/Debug/GooCursor.app/Contents/Resources/Lidgren.Network.dll.mdb


BIN
Samples/MacOS/GooCursor/bin/Debug/GooCursor.app/Contents/Resources/MonoGame.Framework.MacOS.dll


BIN
Samples/MacOS/GooCursor/bin/Debug/GooCursor.app/Contents/Resources/MonoGame.Framework.MacOS.dll.mdb


BIN
Samples/MacOS/GooCursor/bin/Debug/GooCursor.app/Contents/Resources/MonoMac.dll


BIN
Samples/MacOS/GooCursor/bin/Debug/GooCursor.app/Contents/Resources/MonoMac.dll.mdb


BIN
Samples/MacOS/GooCursor/bin/Debug/GooCursor.exe


BIN
Samples/MacOS/GooCursor/bin/Debug/GooCursor.exe.mdb


BIN
Samples/MacOS/GooCursor/bin/Debug/Lidgren.Network.dll


BIN
Samples/MacOS/GooCursor/bin/Debug/Lidgren.Network.dll.mdb


BIN
Samples/MacOS/GooCursor/bin/Debug/MonoGame.Framework.MacOS.dll


BIN
Samples/MacOS/GooCursor/bin/Debug/MonoGame.Framework.MacOS.dll.mdb


BIN
Samples/MacOS/GooCursor/bin/Debug/MonoMac.dll


BIN
Samples/MacOS/GooCursor/bin/Debug/MonoMac.dll.mdb


+ 2 - 2
Samples/MacOS/HoneycombRush/HoneycombRush.csproj

@@ -90,11 +90,11 @@
     <Compile Include="GameDebugTools\TimeRuler.cs" />
     <Compile Include="GameDebugTools\TimeRuler.cs" />
   </ItemGroup>
   </ItemGroup>
   <ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\..\ThirdParty\Lidgren.Network\Lidgren.Network.MacOS.csproj">
+    <ProjectReference Include="..\..\..\..\MonoGame\ThirdParty\Lidgren.Network\Lidgren.Network.MacOS.csproj">
       <Project>{AE483C29-042E-4226-BA52-D247CE7676DA}</Project>
       <Project>{AE483C29-042E-4226-BA52-D247CE7676DA}</Project>
       <Name>Lidgren.Network.MacOS</Name>
       <Name>Lidgren.Network.MacOS</Name>
     </ProjectReference>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\MonoGame.Framework\MonoGame.Framework.MacOS.csproj">
+    <ProjectReference Include="..\..\..\..\MonoGame\MonoGame.Framework\MonoGame.Framework.MacOS.csproj">
       <Project>{36C538E6-C32A-4A8D-A39C-566173D7118E}</Project>
       <Project>{36C538E6-C32A-4A8D-A39C-566173D7118E}</Project>
       <Name>MonoGame.Framework.MacOS</Name>
       <Name>MonoGame.Framework.MacOS</Name>
     </ProjectReference>
     </ProjectReference>

+ 2 - 2
Samples/MacOS/NetworkPrediction/NetworkPrediction.csproj

@@ -54,11 +54,11 @@
     <Compile Include="Program.cs" />
     <Compile Include="Program.cs" />
   </ItemGroup>
   </ItemGroup>
   <ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\..\ThirdParty\Lidgren.Network\Lidgren.Network.MacOS.csproj">
+    <ProjectReference Include="..\..\..\..\MonoGame\ThirdParty\Lidgren.Network\Lidgren.Network.MacOS.csproj">
       <Project>{AE483C29-042E-4226-BA52-D247CE7676DA}</Project>
       <Project>{AE483C29-042E-4226-BA52-D247CE7676DA}</Project>
       <Name>Lidgren.Network.MacOS</Name>
       <Name>Lidgren.Network.MacOS</Name>
     </ProjectReference>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\MonoGame.Framework\MonoGame.Framework.MacOS.csproj">
+    <ProjectReference Include="..\..\..\..\MonoGame\MonoGame.Framework\MonoGame.Framework.MacOS.csproj">
       <Project>{36C538E6-C32A-4A8D-A39C-566173D7118E}</Project>
       <Project>{36C538E6-C32A-4A8D-A39C-566173D7118E}</Project>
       <Name>MonoGame.Framework.MacOS</Name>
       <Name>MonoGame.Framework.MacOS</Name>
     </ProjectReference>
     </ProjectReference>

+ 1 - 1
Samples/MacOS/NetworkStateManagement/NetworkStateManagement.csproj

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

+ 4 - 4
Samples/MacOS/Particle3DSample/Particle3DSample.csproj

@@ -43,14 +43,14 @@
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <Import Project="$(MSBuildExtensionsPath)\Mono\MonoMac\v0.0\Mono.MonoMac.targets" />
   <Import Project="$(MSBuildExtensionsPath)\Mono\MonoMac\v0.0\Mono.MonoMac.targets" />
   <ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\..\MonoGame.Framework\MonoGame.Framework.MacOS.csproj">
-      <Project>{36C538E6-C32A-4A8D-A39C-566173D7118E}</Project>
-      <Name>MonoGame.Framework.MacOS</Name>
-    </ProjectReference>
     <ProjectReference Include="..\ParticleSettingsMac\ParticleSettingsMac.csproj">
     <ProjectReference Include="..\ParticleSettingsMac\ParticleSettingsMac.csproj">
       <Project>{3388FF68-6F15-4F36-B226-7823E5309E92}</Project>
       <Project>{3388FF68-6F15-4F36-B226-7823E5309E92}</Project>
       <Name>ParticleSettingsMac</Name>
       <Name>ParticleSettingsMac</Name>
     </ProjectReference>
     </ProjectReference>
+    <ProjectReference Include="..\..\..\..\MonoGame\MonoGame.Framework\MonoGame.Framework.MacOS.csproj">
+      <Project>{36C538E6-C32A-4A8D-A39C-566173D7118E}</Project>
+      <Name>MonoGame.Framework.MacOS</Name>
+    </ProjectReference>
   </ItemGroup>
   </ItemGroup>
   <ItemGroup>
   <ItemGroup>
     <Compile Include="Program.cs" />
     <Compile Include="Program.cs" />

+ 1 - 1
Samples/MacOS/ParticleSettingsMac/ParticleSettingsMac.csproj

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

+ 1 - 1
Samples/MacOS/Peer2PeerSample/Peer2PeerSample.csproj

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

+ 1 - 1
Samples/MacOS/PerPixelCollisionSample/PerPixelCollisionSample.csproj

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

+ 1 - 1
Samples/MacOS/RectangleCollisionSample/RectangleCollisionSample.csproj

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

+ 1 - 1
Samples/MacOS/SpriteEffects/SpriteEffects.csproj

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

+ 1 - 1
Samples/MacOS/Tetris/MonoGame.Samples.Tetris.MacOS.csproj

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

+ 1 - 1
Samples/MacOS/TiledSprites/MonoGame.Samples.TiledSprites.MacOS.csproj

@@ -80,7 +80,7 @@
     <Content Include="GameThumbnail.png" />
     <Content Include="GameThumbnail.png" />
   </ItemGroup>
   </ItemGroup>
   <ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\..\MonoGame.Framework\MonoGame.Framework.MacOS.csproj">
+    <ProjectReference Include="..\..\..\..\MonoGame\MonoGame.Framework\MonoGame.Framework.MacOS.csproj">
       <Project>{36C538E6-C32A-4A8D-A39C-566173D7118E}</Project>
       <Project>{36C538E6-C32A-4A8D-A39C-566173D7118E}</Project>
       <Name>MonoGame.Framework.MacOS</Name>
       <Name>MonoGame.Framework.MacOS</Name>
     </ProjectReference>
     </ProjectReference>

+ 2 - 2
Samples/MacOS/TransformedCollisionSample/TransformedCollisionSample.csproj

@@ -53,11 +53,11 @@
     <Folder Include="Content\" />
     <Folder Include="Content\" />
   </ItemGroup>
   </ItemGroup>
   <ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\..\MonoGame.Framework\MonoGame.Framework.MacOS.csproj">
+    <ProjectReference Include="..\..\..\..\MonoGame\MonoGame.Framework\MonoGame.Framework.MacOS.csproj">
       <Project>{36C538E6-C32A-4A8D-A39C-566173D7118E}</Project>
       <Project>{36C538E6-C32A-4A8D-A39C-566173D7118E}</Project>
       <Name>MonoGame.Framework.MacOS</Name>
       <Name>MonoGame.Framework.MacOS</Name>
     </ProjectReference>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\ThirdParty\Lidgren.Network\Lidgren.Network.MacOS.csproj">
+    <ProjectReference Include="..\..\..\..\MonoGame\ThirdParty\Lidgren.Network\Lidgren.Network.MacOS.csproj">
       <Project>{AE483C29-042E-4226-BA52-D247CE7676DA}</Project>
       <Project>{AE483C29-042E-4226-BA52-D247CE7676DA}</Project>
       <Name>Lidgren.Network.MacOS</Name>
       <Name>Lidgren.Network.MacOS</Name>
     </ProjectReference>
     </ProjectReference>

+ 13 - 0
Samples/MonoGame.Samples.MacOS.sln

@@ -19,6 +19,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GemstoneHunter", "MacOS\Boo
 EndProject
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RobotRampage", "MacOS\BookSourceCode\XNAGameDevelopmentbyExampleCode\RobotRampage\RobotRampage.csproj", "{9522776F-02BA-4BED-B8BB-6BAE580F4068}"
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RobotRampage", "MacOS\BookSourceCode\XNAGameDevelopmentbyExampleCode\RobotRampage\RobotRampage.csproj", "{9522776F-02BA-4BED-B8BB-6BAE580F4068}"
 EndProject
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Tile Engine", "MacOS\BookSourceCode\XNAGameDevelopmentbyExampleCode\GemstoneHunter\TileEngine\Tile Engine.csproj", "{521972FD-1A9B-4CFD-A435-EB2224985131}"
+EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MonoGame.Samples.ChaseAndEvade.MacOS", "MacOS\ChaseAndEvade\MonoGame.Samples.ChaseAndEvade.MacOS.csproj", "{D03F3BAF-E4D0-4B6B-A567-9A0E2F882335}"
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MonoGame.Samples.ChaseAndEvade.MacOS", "MacOS\ChaseAndEvade\MonoGame.Samples.ChaseAndEvade.MacOS.csproj", "{D03F3BAF-E4D0-4B6B-A567-9A0E2F882335}"
 EndProject
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GameStateManagement", "MacOS\GameStateManagement\GameStateManagement.csproj", "{4AD6BC7A-DB9A-4A6F-9EE2-DAD9B0BBA2A8}"
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GameStateManagement", "MacOS\GameStateManagement\GameStateManagement.csproj", "{4AD6BC7A-DB9A-4A6F-9EE2-DAD9B0BBA2A8}"
@@ -176,6 +178,16 @@ Global
 		{4AD6BC7A-DB9A-4A6F-9EE2-DAD9B0BBA2A8}.Release|Any CPU.Build.0 = Release|Any CPU
 		{4AD6BC7A-DB9A-4A6F-9EE2-DAD9B0BBA2A8}.Release|Any CPU.Build.0 = Release|Any CPU
 		{4AD6BC7A-DB9A-4A6F-9EE2-DAD9B0BBA2A8}.Release|x86.ActiveCfg = Release|Any CPU
 		{4AD6BC7A-DB9A-4A6F-9EE2-DAD9B0BBA2A8}.Release|x86.ActiveCfg = Release|Any CPU
 		{4AD6BC7A-DB9A-4A6F-9EE2-DAD9B0BBA2A8}.Release|x86.Build.0 = Release|Any CPU
 		{4AD6BC7A-DB9A-4A6F-9EE2-DAD9B0BBA2A8}.Release|x86.Build.0 = Release|Any CPU
+		{521972FD-1A9B-4CFD-A435-EB2224985131}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{521972FD-1A9B-4CFD-A435-EB2224985131}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{521972FD-1A9B-4CFD-A435-EB2224985131}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{521972FD-1A9B-4CFD-A435-EB2224985131}.Debug|x86.Build.0 = Debug|Any CPU
+		{521972FD-1A9B-4CFD-A435-EB2224985131}.Distribution|Any CPU.ActiveCfg = Debug|Any CPU
+		{521972FD-1A9B-4CFD-A435-EB2224985131}.Distribution|Any CPU.Build.0 = Debug|Any CPU
+		{521972FD-1A9B-4CFD-A435-EB2224985131}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{521972FD-1A9B-4CFD-A435-EB2224985131}.Release|Any CPU.Build.0 = Release|Any CPU
+		{521972FD-1A9B-4CFD-A435-EB2224985131}.Release|x86.ActiveCfg = Release|Any CPU
+		{521972FD-1A9B-4CFD-A435-EB2224985131}.Release|x86.Build.0 = Release|Any CPU
 		{52735207-2136-433B-A3E4-4C082728EED8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{52735207-2136-433B-A3E4-4C082728EED8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{52735207-2136-433B-A3E4-4C082728EED8}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{52735207-2136-433B-A3E4-4C082728EED8}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{52735207-2136-433B-A3E4-4C082728EED8}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{52735207-2136-433B-A3E4-4C082728EED8}.Debug|x86.ActiveCfg = Debug|Any CPU
@@ -292,6 +304,7 @@ Global
 		{F3115910-E6D1-450D-97FB-A8168A5D622E} = {80262DC5-B246-4DF4-88CD-D1742CCF81BA}
 		{F3115910-E6D1-450D-97FB-A8168A5D622E} = {80262DC5-B246-4DF4-88CD-D1742CCF81BA}
 		{81313197-A8DF-4465-B503-2DD8248B80A9} = {80262DC5-B246-4DF4-88CD-D1742CCF81BA}
 		{81313197-A8DF-4465-B503-2DD8248B80A9} = {80262DC5-B246-4DF4-88CD-D1742CCF81BA}
 		{9522776F-02BA-4BED-B8BB-6BAE580F4068} = {80262DC5-B246-4DF4-88CD-D1742CCF81BA}
 		{9522776F-02BA-4BED-B8BB-6BAE580F4068} = {80262DC5-B246-4DF4-88CD-D1742CCF81BA}
+		{521972FD-1A9B-4CFD-A435-EB2224985131} = {80262DC5-B246-4DF4-88CD-D1742CCF81BA}
 	EndGlobalSection
 	EndGlobalSection
 	GlobalSection(MonoDevelopProperties) = preSolution
 	GlobalSection(MonoDevelopProperties) = preSolution
 		StartupItem = MacOS\Draw2D\MonoGame.Samples.Draw2D.MacOS.csproj
 		StartupItem = MacOS\Draw2D\MonoGame.Samples.Draw2D.MacOS.csproj

+ 27 - 18
Samples/iOS/TiledSprites/TileGrid.cs

@@ -66,9 +66,9 @@ namespace TiledSprites
 
 
 	#region Initialization
 	#region Initialization
 		public TileGrid (int tileWidth,int tileHeight,int numXTiles,int numYTiles,
 		public TileGrid (int tileWidth,int tileHeight,int numXTiles,int numYTiles,
-		Vector2 offset,SpriteSheet tileSheet,
-		GraphicsDeviceManager graphicsComponent)
-			{
+					Vector2 offset,SpriteSheet tileSheet,
+					GraphicsDeviceManager graphicsComponent)
+		{
 			if (graphicsComponent == null) {
 			if (graphicsComponent == null) {
 				throw new ArgumentNullException ("graphicsComponent");
 				throw new ArgumentNullException ("graphicsComponent");
 			}
 			}
@@ -93,22 +93,31 @@ namespace TiledSprites
 			scaleValue = Vector2.One;
 			scaleValue = Vector2.One;
 			zoomValue = 1.0f;
 			zoomValue = 1.0f;
 			CameraPosition = Vector2.Zero;
 			CameraPosition = Vector2.Zero;
+			graphicsComponent.DeviceReset += delegate(object sender, EventArgs e) {
+				displaySize.X = 320;
+				// TODO graphics.GraphicsDevice.PresentationParameters.BackBufferWidth;
+	
+				displaySize.Y = 480;
+				// TODO graphics.GraphicsDevice.PresentationParameters.BackBufferHeight;
+	
+				visibilityChanged = true;
+			};
+//			graphicsComponent.DeviceReset +=
+//		new EventHandler (OnGraphicsComponentDeviceReset);
+//
+//			OnGraphicsComponentDeviceReset (this, new EventArgs ());
+//		}
 
 
-			graphicsComponent.DeviceReset += 
-		new EventHandler (OnGraphicsComponentDeviceReset);
-
-			OnGraphicsComponentDeviceReset (this, new EventArgs ());
-		}
-
-		void OnGraphicsComponentDeviceReset (object sender, EventArgs e)
-		{
-			displaySize.X = 320;
-			// TODO graphics.GraphicsDevice.PresentationParameters.BackBufferWidth;
-
-			displaySize.Y = 480;
-			// TODO graphics.GraphicsDevice.PresentationParameters.BackBufferHeight;
-
-			visibilityChanged = true;
+//		void OnGraphicsComponentDeviceReset (object sender, EventArgs e)
+//		{
+//			displaySize.X = 320;
+//			// TODO graphics.GraphicsDevice.PresentationParameters.BackBufferWidth;
+//
+//			displaySize.Y = 480;
+//			// TODO graphics.GraphicsDevice.PresentationParameters.BackBufferHeight;
+//
+//			visibilityChanged = true;
+//		}
 		}
 		}
 
 
 	#endregion
 	#endregion