Browse Source

Merged Changes

CartBlanche 13 years ago
parent
commit
cfcfa4bf56

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

@@ -5,7 +5,7 @@
     <Platform Condition=" '$(Platform)' == '' ">x86</Platform>
     <ProductVersion>9.0.21022</ProductVersion>
     <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{86A219E2-C8F0-452B-B762-C69D5BB07C98}</ProjectGuid>
+    <ProjectGuid>{9522776F-02BA-4BED-B8BB-6BAE580F4068}</ProjectGuid>
     <OutputType>Exe</OutputType>
     <RootNamespace>AsteroidBeltAssault</RootNamespace>
     <AssemblyName>FloodControl</AssemblyName>

BIN
Samples/Linux/NetworkStateManagement/Resources.resources


BIN
Samples/MacOS/GameStateManagement/Content/menufont.xnb


+ 5 - 5
Samples/MacOS/ParticleSample/ParticleSample.csproj

@@ -59,11 +59,6 @@
     <Compile Include="Program.cs" />
     <Compile Include="SmokePlumeParticleSystem.cs" />
   </ItemGroup>
-  <ItemGroup>
-    <Content Include="Content\explosion.xnb" />
-    <Content Include="Content\font.xnb" />
-    <Content Include="Content\smoke.xnb" />
-  </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\..\..\MonoGame\MonoGame.Framework\MonoGame.Framework.MacOS.csproj">
       <Project>{36C538E6-C32A-4A8D-A39C-566173D7118E}</Project>
@@ -74,4 +69,9 @@
       <Name>Lidgren.Network.MacOS</Name>
     </ProjectReference>
   </ItemGroup>
+  <ItemGroup>
+    <Content Include="Content\explosion.xnb" />
+    <Content Include="Content\font.xnb" />
+    <Content Include="Content\smoke.xnb" />
+  </ItemGroup>
 </Project>

+ 119 - 0
Samples/MonoGame.Samples.Linux.sln

@@ -29,6 +29,18 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GooCursor", "Linux\GooCurso
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RenderTarget2DSample", "Linux\RenderTarget2DSample\RenderTarget2DSample.csproj", "{DED4371E-B92B-46FC-B4A3-B56BCAE12477}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "BookSourceCode", "BookSourceCode", "{A28FF8DB-5350-4D08-A94D-93C3C67FCB63}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MonoGame.Samples.RobotRampage.Linux", "Linux\BookSourceCode\XNAGameDevelopmentbyExampleCode\RobotRampage\MonoGame.Samples.RobotRampage.Linux.csproj", "{9522776F-02BA-4BED-B8BB-6BAE580F4068}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Tile Engine", "Linux\BookSourceCode\XNAGameDevelopmentbyExampleCode\GemstoneHunter\TileEngine\Tile Engine.csproj", "{521972FD-1A9B-4CFD-A435-EB2224985131}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GemstoneHunter", "Linux\BookSourceCode\XNAGameDevelopmentbyExampleCode\GemstoneHunter\GemstoneHunter.csproj", "{86A219E2-C8F0-452B-B762-C69D5BB07C98}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MonoGame.Samples.AsteroidBeltAssault.Linux", "Linux\BookSourceCode\XNAGameDevelopmentbyExampleCode\AsteroidBeltAssault\MonoGame.Samples.AsteroidBeltAssault.Linux.csproj", "{86A219E2-C8F0-452B-B762-C69D5BB07C99}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MonoGame.Samples.FloodControl.Linux", "Linux\BookSourceCode\XNAGameDevelopmentbyExampleCode\FloodControl\MonoGame.Samples.FloodControl.Linux.csproj", "{86A219E2-C8F1-422B-C762-C69D5BB07C98}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -63,6 +75,26 @@ Global
 		{35253CE1-C864-4CD3-8249-4D1319748E8F}.Release|Mixed Platforms.Build.0 = Release|x86
 		{35253CE1-C864-4CD3-8249-4D1319748E8F}.Release|x86.ActiveCfg = Release|x86
 		{35253CE1-C864-4CD3-8249-4D1319748E8F}.Release|x86.Build.0 = Release|x86
+		{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|iPhone.ActiveCfg = Debug|Any CPU
+		{521972FD-1A9B-4CFD-A435-EB2224985131}.Debug|iPhone.Build.0 = Debug|Any CPU
+		{521972FD-1A9B-4CFD-A435-EB2224985131}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{521972FD-1A9B-4CFD-A435-EB2224985131}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{521972FD-1A9B-4CFD-A435-EB2224985131}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{521972FD-1A9B-4CFD-A435-EB2224985131}.Debug|Mixed Platforms.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}.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|iPhone.ActiveCfg = Release|Any CPU
+		{521972FD-1A9B-4CFD-A435-EB2224985131}.Release|iPhone.Build.0 = Release|Any CPU
+		{521972FD-1A9B-4CFD-A435-EB2224985131}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{521972FD-1A9B-4CFD-A435-EB2224985131}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
+		{521972FD-1A9B-4CFD-A435-EB2224985131}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{521972FD-1A9B-4CFD-A435-EB2224985131}.Release|Mixed Platforms.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|x86
 		{52735207-2136-433B-A3E4-4C082728EED8}.Debug|Any CPU.Build.0 = Debug|x86
 		{52735207-2136-433B-A3E4-4C082728EED8}.Debug|iPhone.ActiveCfg = Debug|x86
@@ -83,6 +115,66 @@ Global
 		{52735207-2136-433B-A3E4-4C082728EED8}.Release|Mixed Platforms.Build.0 = Release|x86
 		{52735207-2136-433B-A3E4-4C082728EED8}.Release|x86.ActiveCfg = Release|x86
 		{52735207-2136-433B-A3E4-4C082728EED8}.Release|x86.Build.0 = Release|x86
+		{86A219E2-C8F0-452B-B762-C69D5BB07C98}.Debug|Any CPU.ActiveCfg = Debug|x86
+		{86A219E2-C8F0-452B-B762-C69D5BB07C98}.Debug|Any CPU.Build.0 = Debug|x86
+		{86A219E2-C8F0-452B-B762-C69D5BB07C98}.Debug|iPhone.ActiveCfg = Debug|x86
+		{86A219E2-C8F0-452B-B762-C69D5BB07C98}.Debug|iPhone.Build.0 = Debug|x86
+		{86A219E2-C8F0-452B-B762-C69D5BB07C98}.Debug|iPhoneSimulator.ActiveCfg = Debug|x86
+		{86A219E2-C8F0-452B-B762-C69D5BB07C98}.Debug|iPhoneSimulator.Build.0 = Debug|x86
+		{86A219E2-C8F0-452B-B762-C69D5BB07C98}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
+		{86A219E2-C8F0-452B-B762-C69D5BB07C98}.Debug|Mixed Platforms.Build.0 = Debug|x86
+		{86A219E2-C8F0-452B-B762-C69D5BB07C98}.Debug|x86.ActiveCfg = Debug|x86
+		{86A219E2-C8F0-452B-B762-C69D5BB07C98}.Debug|x86.Build.0 = Debug|x86
+		{86A219E2-C8F0-452B-B762-C69D5BB07C98}.Release|Any CPU.ActiveCfg = Release|x86
+		{86A219E2-C8F0-452B-B762-C69D5BB07C98}.Release|Any CPU.Build.0 = Release|x86
+		{86A219E2-C8F0-452B-B762-C69D5BB07C98}.Release|iPhone.ActiveCfg = Release|x86
+		{86A219E2-C8F0-452B-B762-C69D5BB07C98}.Release|iPhone.Build.0 = Release|x86
+		{86A219E2-C8F0-452B-B762-C69D5BB07C98}.Release|iPhoneSimulator.ActiveCfg = Release|x86
+		{86A219E2-C8F0-452B-B762-C69D5BB07C98}.Release|iPhoneSimulator.Build.0 = Release|x86
+		{86A219E2-C8F0-452B-B762-C69D5BB07C98}.Release|Mixed Platforms.ActiveCfg = Release|x86
+		{86A219E2-C8F0-452B-B762-C69D5BB07C98}.Release|Mixed Platforms.Build.0 = Release|x86
+		{86A219E2-C8F0-452B-B762-C69D5BB07C98}.Release|x86.ActiveCfg = Release|x86
+		{86A219E2-C8F0-452B-B762-C69D5BB07C98}.Release|x86.Build.0 = Release|x86
+		{86A219E2-C8F0-452B-B762-C69D5BB07C99}.Debug|Any CPU.ActiveCfg = Debug|x86
+		{86A219E2-C8F0-452B-B762-C69D5BB07C99}.Debug|Any CPU.Build.0 = Debug|x86
+		{86A219E2-C8F0-452B-B762-C69D5BB07C99}.Debug|iPhone.ActiveCfg = Debug|x86
+		{86A219E2-C8F0-452B-B762-C69D5BB07C99}.Debug|iPhone.Build.0 = Debug|x86
+		{86A219E2-C8F0-452B-B762-C69D5BB07C99}.Debug|iPhoneSimulator.ActiveCfg = Debug|x86
+		{86A219E2-C8F0-452B-B762-C69D5BB07C99}.Debug|iPhoneSimulator.Build.0 = Debug|x86
+		{86A219E2-C8F0-452B-B762-C69D5BB07C99}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
+		{86A219E2-C8F0-452B-B762-C69D5BB07C99}.Debug|Mixed Platforms.Build.0 = Debug|x86
+		{86A219E2-C8F0-452B-B762-C69D5BB07C99}.Debug|x86.ActiveCfg = Debug|x86
+		{86A219E2-C8F0-452B-B762-C69D5BB07C99}.Debug|x86.Build.0 = Debug|x86
+		{86A219E2-C8F0-452B-B762-C69D5BB07C99}.Release|Any CPU.ActiveCfg = Release|x86
+		{86A219E2-C8F0-452B-B762-C69D5BB07C99}.Release|Any CPU.Build.0 = Release|x86
+		{86A219E2-C8F0-452B-B762-C69D5BB07C99}.Release|iPhone.ActiveCfg = Release|x86
+		{86A219E2-C8F0-452B-B762-C69D5BB07C99}.Release|iPhone.Build.0 = Release|x86
+		{86A219E2-C8F0-452B-B762-C69D5BB07C99}.Release|iPhoneSimulator.ActiveCfg = Release|x86
+		{86A219E2-C8F0-452B-B762-C69D5BB07C99}.Release|iPhoneSimulator.Build.0 = Release|x86
+		{86A219E2-C8F0-452B-B762-C69D5BB07C99}.Release|Mixed Platforms.ActiveCfg = Release|x86
+		{86A219E2-C8F0-452B-B762-C69D5BB07C99}.Release|Mixed Platforms.Build.0 = Release|x86
+		{86A219E2-C8F0-452B-B762-C69D5BB07C99}.Release|x86.ActiveCfg = Release|x86
+		{86A219E2-C8F0-452B-B762-C69D5BB07C99}.Release|x86.Build.0 = Release|x86
+		{86A219E2-C8F1-422B-C762-C69D5BB07C98}.Debug|Any CPU.ActiveCfg = Debug|x86
+		{86A219E2-C8F1-422B-C762-C69D5BB07C98}.Debug|Any CPU.Build.0 = Debug|x86
+		{86A219E2-C8F1-422B-C762-C69D5BB07C98}.Debug|iPhone.ActiveCfg = Debug|x86
+		{86A219E2-C8F1-422B-C762-C69D5BB07C98}.Debug|iPhone.Build.0 = Debug|x86
+		{86A219E2-C8F1-422B-C762-C69D5BB07C98}.Debug|iPhoneSimulator.ActiveCfg = Debug|x86
+		{86A219E2-C8F1-422B-C762-C69D5BB07C98}.Debug|iPhoneSimulator.Build.0 = Debug|x86
+		{86A219E2-C8F1-422B-C762-C69D5BB07C98}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
+		{86A219E2-C8F1-422B-C762-C69D5BB07C98}.Debug|Mixed Platforms.Build.0 = Debug|x86
+		{86A219E2-C8F1-422B-C762-C69D5BB07C98}.Debug|x86.ActiveCfg = Debug|x86
+		{86A219E2-C8F1-422B-C762-C69D5BB07C98}.Debug|x86.Build.0 = Debug|x86
+		{86A219E2-C8F1-422B-C762-C69D5BB07C98}.Release|Any CPU.ActiveCfg = Release|x86
+		{86A219E2-C8F1-422B-C762-C69D5BB07C98}.Release|Any CPU.Build.0 = Release|x86
+		{86A219E2-C8F1-422B-C762-C69D5BB07C98}.Release|iPhone.ActiveCfg = Release|x86
+		{86A219E2-C8F1-422B-C762-C69D5BB07C98}.Release|iPhone.Build.0 = Release|x86
+		{86A219E2-C8F1-422B-C762-C69D5BB07C98}.Release|iPhoneSimulator.ActiveCfg = Release|x86
+		{86A219E2-C8F1-422B-C762-C69D5BB07C98}.Release|iPhoneSimulator.Build.0 = Release|x86
+		{86A219E2-C8F1-422B-C762-C69D5BB07C98}.Release|Mixed Platforms.ActiveCfg = Release|x86
+		{86A219E2-C8F1-422B-C762-C69D5BB07C98}.Release|Mixed Platforms.Build.0 = Release|x86
+		{86A219E2-C8F1-422B-C762-C69D5BB07C98}.Release|x86.ActiveCfg = Release|x86
+		{86A219E2-C8F1-422B-C762-C69D5BB07C98}.Release|x86.Build.0 = Release|x86
 		{86A619E2-C8D0-452B-B762-C69D5BB07C98}.Debug|Any CPU.ActiveCfg = Debug|x86
 		{86A619E2-C8D0-452B-B762-C69D5BB07C98}.Debug|Any CPU.Build.0 = Debug|x86
 		{86A619E2-C8D0-452B-B762-C69D5BB07C98}.Debug|iPhone.ActiveCfg = Debug|x86
@@ -223,6 +315,26 @@ Global
 		{8CFEF2EE-5E32-43EB-A730-EB3AACDC77B1}.Release|Mixed Platforms.Build.0 = Release|x86
 		{8CFEF2EE-5E32-43EB-A730-EB3AACDC77B1}.Release|x86.ActiveCfg = Release|x86
 		{8CFEF2EE-5E32-43EB-A730-EB3AACDC77B1}.Release|x86.Build.0 = Release|x86
+		{9522776F-02BA-4BED-B8BB-6BAE580F4068}.Debug|Any CPU.ActiveCfg = Debug|x86
+		{9522776F-02BA-4BED-B8BB-6BAE580F4068}.Debug|Any CPU.Build.0 = Debug|x86
+		{9522776F-02BA-4BED-B8BB-6BAE580F4068}.Debug|iPhone.ActiveCfg = Debug|x86
+		{9522776F-02BA-4BED-B8BB-6BAE580F4068}.Debug|iPhone.Build.0 = Debug|x86
+		{9522776F-02BA-4BED-B8BB-6BAE580F4068}.Debug|iPhoneSimulator.ActiveCfg = Debug|x86
+		{9522776F-02BA-4BED-B8BB-6BAE580F4068}.Debug|iPhoneSimulator.Build.0 = Debug|x86
+		{9522776F-02BA-4BED-B8BB-6BAE580F4068}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
+		{9522776F-02BA-4BED-B8BB-6BAE580F4068}.Debug|Mixed Platforms.Build.0 = Debug|x86
+		{9522776F-02BA-4BED-B8BB-6BAE580F4068}.Debug|x86.ActiveCfg = Debug|x86
+		{9522776F-02BA-4BED-B8BB-6BAE580F4068}.Debug|x86.Build.0 = Debug|x86
+		{9522776F-02BA-4BED-B8BB-6BAE580F4068}.Release|Any CPU.ActiveCfg = Release|x86
+		{9522776F-02BA-4BED-B8BB-6BAE580F4068}.Release|Any CPU.Build.0 = Release|x86
+		{9522776F-02BA-4BED-B8BB-6BAE580F4068}.Release|iPhone.ActiveCfg = Release|x86
+		{9522776F-02BA-4BED-B8BB-6BAE580F4068}.Release|iPhone.Build.0 = Release|x86
+		{9522776F-02BA-4BED-B8BB-6BAE580F4068}.Release|iPhoneSimulator.ActiveCfg = Release|x86
+		{9522776F-02BA-4BED-B8BB-6BAE580F4068}.Release|iPhoneSimulator.Build.0 = Release|x86
+		{9522776F-02BA-4BED-B8BB-6BAE580F4068}.Release|Mixed Platforms.ActiveCfg = Release|x86
+		{9522776F-02BA-4BED-B8BB-6BAE580F4068}.Release|Mixed Platforms.Build.0 = Release|x86
+		{9522776F-02BA-4BED-B8BB-6BAE580F4068}.Release|x86.ActiveCfg = Release|x86
+		{9522776F-02BA-4BED-B8BB-6BAE580F4068}.Release|x86.Build.0 = Release|x86
 		{AE483C29-042E-4226-BA52-D247CE7676DA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{AE483C29-042E-4226-BA52-D247CE7676DA}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{AE483C29-042E-4226-BA52-D247CE7676DA}.Debug|iPhone.ActiveCfg = Debug|Any CPU
@@ -324,6 +436,13 @@ Global
 		{EB1F36EC-5DB8-41AC-AB99-E9337239A9F9}.Release|x86.ActiveCfg = Release|Any CPU
 		{EB1F36EC-5DB8-41AC-AB99-E9337239A9F9}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
+	GlobalSection(NestedProjects) = preSolution
+		{9522776F-02BA-4BED-B8BB-6BAE580F4068} = {A28FF8DB-5350-4D08-A94D-93C3C67FCB63}
+		{521972FD-1A9B-4CFD-A435-EB2224985131} = {A28FF8DB-5350-4D08-A94D-93C3C67FCB63}
+		{86A219E2-C8F0-452B-B762-C69D5BB07C98} = {A28FF8DB-5350-4D08-A94D-93C3C67FCB63}
+		{86A219E2-C8F0-452B-B762-C69D5BB07C99} = {A28FF8DB-5350-4D08-A94D-93C3C67FCB63}
+		{86A219E2-C8F1-422B-C762-C69D5BB07C98} = {A28FF8DB-5350-4D08-A94D-93C3C67FCB63}
+	EndGlobalSection
 	GlobalSection(MonoDevelopProperties) = preSolution
 		StartupItem = Linux\RenderTarget2DSample\RenderTarget2DSample.csproj
 	EndGlobalSection

+ 1 - 1
Samples/MonoGame.Samples.iOS.sln

@@ -313,6 +313,6 @@ Global
 		{F5FA28E2-53B2-482B-8723-71588DF50BB6}.Release|iPhoneSimulator.Build.0 = Release|iPhoneSimulator
 	EndGlobalSection
 	GlobalSection(MonoDevelopProperties) = preSolution
-		StartupItem = iOS\RenderTarget2D\MonoGame.Samples.RenderTarget2D.csproj
+		StartupItem = iOS\GameStateManagement\MonoGame.Samples.GameStateManagement.csproj
 	EndGlobalSection
 EndGlobal

+ 10 - 1
Samples/iOS/Aiming/MonoGame.Samples.Aiming.csproj

@@ -6,10 +6,13 @@
     <ProductVersion>9.0.21022</ProductVersion>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{E4C7960D-E564-4CD5-85D6-2B7B0B3DA5BA}</ProjectGuid>
-    <ProjectTypeGuids>{6BC8ED88-2882-458C-8E55-DFD12B67127B};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
+    <ProjectTypeGuids>{E613F3A2-FE9C-494F-B74E-F63BCB86FEA6};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <OutputType>Exe</OutputType>
     <RootNamespace>MonoGame.Samples.Aiming</RootNamespace>
     <TargetFrameworkVersion>v1.0</TargetFrameworkVersion>
+    <BundleDisplayName>Aiming</BundleDisplayName>
+    <BundleIcon>GameThumbnail.png</BundleIcon>
+    <BundleIdentifier>project.MonoGame.Aiming</BundleIdentifier>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|iPhoneSimulator' ">
     <DebugSymbols>true</DebugSymbols>
@@ -28,6 +31,7 @@
     <MtouchUseArmv7>false</MtouchUseArmv7>
     <MtouchUseThumb>false</MtouchUseThumb>
     <MtouchUseSGen>false</MtouchUseSGen>
+    <MtouchMinimumOS>3.1</MtouchMinimumOS>
     <MtouchArch>ARMv6</MtouchArch>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|iPhoneSimulator' ">
@@ -47,6 +51,7 @@
     <MtouchUseThumb>false</MtouchUseThumb>
     <MtouchUseSGen>false</MtouchUseSGen>
     <MtouchSdkVersion>3.0</MtouchSdkVersion>
+    <MtouchMinimumOS>3.0</MtouchMinimumOS>
     <MtouchArch>ARMv6</MtouchArch>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|iPhone' ">
@@ -67,6 +72,7 @@
     <MtouchUseThumb>false</MtouchUseThumb>
     <MtouchUseSGen>false</MtouchUseSGen>
     <MtouchSdkVersion>3.0</MtouchSdkVersion>
+    <MtouchMinimumOS>3.0</MtouchMinimumOS>
     <MtouchArch>ARMv6</MtouchArch>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|iPhone' ">
@@ -84,6 +90,7 @@
     <MtouchUseThumb>false</MtouchUseThumb>
     <MtouchUseSGen>false</MtouchUseSGen>
     <MtouchSdkVersion>3.0</MtouchSdkVersion>
+    <MtouchMinimumOS>3.0</MtouchMinimumOS>
     <MtouchArch>ARMv6</MtouchArch>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Distribution|iPhone' ">
@@ -101,6 +108,7 @@
     <MtouchUseThumb>false</MtouchUseThumb>
     <MtouchUseSGen>false</MtouchUseSGen>
     <MtouchSdkVersion>3.0</MtouchSdkVersion>
+    <MtouchMinimumOS>3.0</MtouchMinimumOS>
     <MtouchArch>ARMv6</MtouchArch>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Distribution|iPhoneSimulator' ">
@@ -109,6 +117,7 @@
     <OutputPath>bin\Distribution</OutputPath>
     <WarningLevel>4</WarningLevel>
     <MtouchUseSGen>false</MtouchUseSGen>
+    <MtouchMinimumOS>3.0</MtouchMinimumOS>
     <MtouchDebug>False</MtouchDebug>
     <AssemblyName>MonoGameSamplesAiming</AssemblyName>
     <MtouchUseLlvm>false</MtouchUseLlvm>

+ 0 - 1
Samples/iOS/BouncingBox/MonoGame.Samples.BouncingBox.csproj

@@ -69,7 +69,6 @@
     <OutputPath>bin\iPhone\Release</OutputPath>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
-    <MtouchDebug>False</MtouchDebug>
     <MtouchI18n />
     <CodesignKey>iPhone Developer</CodesignKey>
     <MtouchSdkVersion>4.0</MtouchSdkVersion>

+ 0 - 1
Samples/iOS/Draw2D/MonoGame.Samples.Draw2D.csproj

@@ -8,7 +8,6 @@
     <ProjectGuid>{DEC435F4-9E84-490B-9890-72E5F514B8D0}</ProjectGuid>
     <ProjectTypeGuids>{6BC8ED88-2882-458C-8E55-DFD12B67127B};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <OutputType>Exe</OutputType>
-    <TargetFrameworkVersion>v1.0</TargetFrameworkVersion>
     <RootNamespace>MonoGame.Samples.Draw2D</RootNamespace>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|iPhoneSimulator' ">

+ 0 - 1
Samples/iOS/GameComponents/MonoGame.Samples.GameComponents.csproj

@@ -9,7 +9,6 @@
     <ProjectTypeGuids>{6BC8ED88-2882-458C-8E55-DFD12B67127B};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <OutputType>Exe</OutputType>
     <RootNamespace>MonoGame.Samples.GameComponents</RootNamespace>
-    <TargetFrameworkVersion>v1.0</TargetFrameworkVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|iPhoneSimulator' ">
     <DebugSymbols>true</DebugSymbols>

BIN
Samples/iOS/GameStateManagement/.DS_Store


+ 1 - 3
Samples/iOS/GameStateManagement/MonoGame.Samples.GameStateManagement.csproj

@@ -128,9 +128,7 @@
     <Content Include="Content\gradient.png">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="Content\menufont.xnb">
-      <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. 

BIN
Samples/iOS/ParticleSample/.DS_Store


BIN
Samples/iOS/ParticleSample/Content/Arial.xnb


BIN
Samples/iOS/ParticleSample/Content/explosion.xnb


BIN
Samples/iOS/ParticleSample/Content/font.xnb


BIN
Samples/iOS/ParticleSample/Content/smoke.xnb


+ 5 - 3
Samples/iOS/ParticleSample/MonoGame.Samples.ParticleSample.csproj

@@ -105,13 +105,15 @@
     <Content Include="Default.png">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="Content\Arial.xnb" />
-    <Content Include="Content\explosion.png" />
-    <Content Include="Content\smoke.bmp" />
+    <Content Include="Content\explosion.xnb" />
+    <Content Include="Content\smoke.xnb" />
+    <Content Include="Content\font.xnb" />
   </ItemGroup>
   <ItemGroup>
     <None Include="GameThumbnail.png" />
     <None Include="Info.plist" />
+    <None Include="Content\explosion.png" />
+    <None Include="Content\smoke.bmp" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\..\..\MonoGame\MonoGame.Framework\MonoGame.Framework.iOS.csproj">

+ 1 - 1
Samples/iOS/ParticleSample/ParticleSampleGame.cs

@@ -124,7 +124,7 @@ namespace ParticleSample
         protected override void LoadContent()
         {
             spriteBatch = new SpriteBatch(graphics.GraphicsDevice);
-            arialFont = Content.Load<SpriteFont>("Arial");
+            arialFont = Content.Load<SpriteFont>("font");
         }
 
         #endregion