diff options
| author | Ben Beltran <ben@nsovocal.com> | 2014-02-10 22:14:10 -0600 |
|---|---|---|
| committer | Ben Beltran <ben@nsovocal.com> | 2014-02-10 22:14:10 -0600 |
| commit | 63419029fbda7d3f2f3d5984c3d2c77f341dbd79 (patch) | |
| tree | f4c0a51017b957f2dfded3b4fc6b8ff3c3b58e45 /SuperPolarity | |
| parent | 10980f9b5db812487ecc118fa8f8255024624e9a (diff) | |
Works in win, compiles in mac
Diffstat (limited to 'SuperPolarity')
| -rw-r--r-- | SuperPolarity/Content/Sound/bomb.xnb (renamed from SuperPolarity/Content/Sound/bomb.wav) | bin | 403244 -> 403305 bytes | |||
| -rw-r--r-- | SuperPolarity/Content/Sound/bullet.xnb (renamed from SuperPolarity/Content/Sound/bullet.wav) | bin | 201644 -> 201705 bytes | |||
| -rw-r--r-- | SuperPolarity/Content/Sound/gameover.xnb (renamed from SuperPolarity/Content/Sound/gameover.wav) | bin | 1612844 -> 1612905 bytes | |||
| -rw-r--r-- | SuperPolarity/Content/Sound/hit.xnb (renamed from SuperPolarity/Content/Sound/hit.wav) | bin | 403244 -> 403305 bytes | |||
| -rw-r--r-- | SuperPolarity/Content/Sound/life.xnb (renamed from SuperPolarity/Content/Sound/life.wav) | bin | 403244 -> 403305 bytes | |||
| -rw-r--r-- | SuperPolarity/Content/Sound/polaritychange.xnb (renamed from SuperPolarity/Content/Sound/polaritychange.wav) | bin | 403244 -> 403305 bytes | |||
| -rw-r--r-- | SuperPolarity/Content/Sound/polaritytheme.wma | bin | 0 -> 6617551 bytes | |||
| -rw-r--r-- | SuperPolarity/Content/Sound/polaritytheme.xnb | bin | 0 -> 131 bytes | |||
| -rw-r--r-- | SuperPolarity/Properties/AssemblyInfo.cs | 2 | ||||
| -rw-r--r-- | SuperPolarity/SuperPolarity.cs | 3 | ||||
| -rw-r--r-- | SuperPolarity/SuperPolarity.csproj | 93 |
11 files changed, 72 insertions, 26 deletions
diff --git a/SuperPolarity/Content/Sound/bomb.wav b/SuperPolarity/Content/Sound/bomb.xnb Binary files differindex 5af439b..71b6dd1 100644 --- a/SuperPolarity/Content/Sound/bomb.wav +++ b/SuperPolarity/Content/Sound/bomb.xnb diff --git a/SuperPolarity/Content/Sound/bullet.wav b/SuperPolarity/Content/Sound/bullet.xnb Binary files differindex 6586489..2b59972 100644 --- a/SuperPolarity/Content/Sound/bullet.wav +++ b/SuperPolarity/Content/Sound/bullet.xnb diff --git a/SuperPolarity/Content/Sound/gameover.wav b/SuperPolarity/Content/Sound/gameover.xnb Binary files differindex cac9d23..8afc574 100644 --- a/SuperPolarity/Content/Sound/gameover.wav +++ b/SuperPolarity/Content/Sound/gameover.xnb diff --git a/SuperPolarity/Content/Sound/hit.wav b/SuperPolarity/Content/Sound/hit.xnb Binary files differindex 43433cd..52af38d 100644 --- a/SuperPolarity/Content/Sound/hit.wav +++ b/SuperPolarity/Content/Sound/hit.xnb diff --git a/SuperPolarity/Content/Sound/life.wav b/SuperPolarity/Content/Sound/life.xnb Binary files differindex a1d0436..3c1cad8 100644 --- a/SuperPolarity/Content/Sound/life.wav +++ b/SuperPolarity/Content/Sound/life.xnb diff --git a/SuperPolarity/Content/Sound/polaritychange.wav b/SuperPolarity/Content/Sound/polaritychange.xnb Binary files differindex 25b59a4..2cfbc68 100644 --- a/SuperPolarity/Content/Sound/polaritychange.wav +++ b/SuperPolarity/Content/Sound/polaritychange.xnb diff --git a/SuperPolarity/Content/Sound/polaritytheme.wma b/SuperPolarity/Content/Sound/polaritytheme.wma Binary files differnew file mode 100644 index 0000000..e4ea8b8 --- /dev/null +++ b/SuperPolarity/Content/Sound/polaritytheme.wma diff --git a/SuperPolarity/Content/Sound/polaritytheme.xnb b/SuperPolarity/Content/Sound/polaritytheme.xnb Binary files differnew file mode 100644 index 0000000..d2c29f9 --- /dev/null +++ b/SuperPolarity/Content/Sound/polaritytheme.xnb diff --git a/SuperPolarity/Properties/AssemblyInfo.cs b/SuperPolarity/Properties/AssemblyInfo.cs index bd24ce8..daa34e8 100644 --- a/SuperPolarity/Properties/AssemblyInfo.cs +++ b/SuperPolarity/Properties/AssemblyInfo.cs @@ -10,7 +10,7 @@ using System.Runtime.InteropServices; [assembly: AssemblyConfiguration("")] [assembly: AssemblyDescription("")] [assembly: AssemblyCompany("")] -[assembly: AssemblyCopyright("Copyright © 2013")] +[assembly: AssemblyCopyright("Copyright © 2014")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] diff --git a/SuperPolarity/SuperPolarity.cs b/SuperPolarity/SuperPolarity.cs index 9311d53..f5ff48e 100644 --- a/SuperPolarity/SuperPolarity.cs +++ b/SuperPolarity/SuperPolarity.cs @@ -10,6 +10,7 @@ using Microsoft.Xna.Framework.GamerServices; using Microsoft.Xna.Framework.Media; using Microsoft.Xna.Framework.Audio; using SuperPolarity; +using Tao.Sdl; #endregion namespace SuperPolarity @@ -41,7 +42,7 @@ namespace SuperPolarity graphics.PreferMultiSampling = true; graphics.PreferredBackBufferWidth = 1280; graphics.PreferredBackBufferHeight = 720; - graphics.ToggleFullScreen(); + //graphics.ToggleFullScreen(); Content.RootDirectory = "Content"; ActorFactory.SetGame(this); diff --git a/SuperPolarity/SuperPolarity.csproj b/SuperPolarity/SuperPolarity.csproj index 76124b7..aa96e8a 100644 --- a/SuperPolarity/SuperPolarity.csproj +++ b/SuperPolarity/SuperPolarity.csproj @@ -11,6 +11,21 @@ <RootNamespace>SuperPolarity</RootNamespace> <AssemblyName>SuperPolarity</AssemblyName> <FileAlignment>512</FileAlignment> + <PublishUrl>publish\</PublishUrl> + <Install>true</Install> + <InstallFrom>Disk</InstallFrom> + <UpdateEnabled>false</UpdateEnabled> + <UpdateMode>Foreground</UpdateMode> + <UpdateInterval>7</UpdateInterval> + <UpdateIntervalUnits>Days</UpdateIntervalUnits> + <UpdatePeriodically>false</UpdatePeriodically> + <UpdateRequired>false</UpdateRequired> + <MapFileExtensions>true</MapFileExtensions> + <ApplicationRevision>0</ApplicationRevision> + <ApplicationVersion>1.0.0.%2a</ApplicationVersion> + <IsWebBootstrapper>false</IsWebBootstrapper> + <UseApplicationTrust>false</UseApplicationTrust> + <BootstrapperEnabled>true</BootstrapperEnabled> </PropertyGroup> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' "> <PlatformTarget>x86</PlatformTarget> @@ -34,6 +49,10 @@ <PropertyGroup> <ApplicationIcon>Icon.ico</ApplicationIcon> </PropertyGroup> + <PropertyGroup> + <StartupObject> + </StartupObject> + </PropertyGroup> <ItemGroup> <Compile Include="ActorFactory.cs" /> <Compile Include="ActorManager.cs" /> @@ -64,50 +83,55 @@ <Compile Include="Widget.cs" /> </ItemGroup> <ItemGroup> + <Reference Include="MonoGame.Framework, Version=3.0.1.0, Culture=neutral, processorArchitecture=MSIL"> + <SpecificVersion>False</SpecificVersion> + <HintPath>..\..\..\..\..\Program Files (x86)\MonoGame\v3.0\Assemblies\WindowsGL\MonoGame.Framework.dll</HintPath> + </Reference> <Reference Include="OpenTK"> <HintPath>..\..\..\..\..\..\..\Program Files (x86)\MSBuild\..\MonoGame\v3.0\Assemblies\WindowsGL\OpenTK.dll</HintPath> </Reference> - <Reference Include="MonoGame.Framework"> - <HintPath>..\..\..\..\..\..\..\Program Files (x86)\MSBuild\..\MonoGame\v3.0\Assemblies\WindowsGL\MonoGame.Framework.dll</HintPath> - </Reference> <Reference Include="Lidgren.Network"> <HintPath>..\..\..\..\..\..\..\Program Files (x86)\MSBuild\..\MonoGame\v3.0\Assemblies\WindowsGL\Lidgren.Network.dll</HintPath> </Reference> - <Reference Include="Tao.Sdl"> - <HintPath>..\..\..\..\..\..\..\Program Files (x86)\MSBuild\..\MonoGame\v3.0\Assemblies\WindowsGL\Tao.Sdl.dll</HintPath> - </Reference> <Reference Include="System" /> <Reference Include="System.Xml" /> + <Reference Include="Tao.Sdl, Version=1.2.13.0, Culture=neutral, PublicKeyToken=9c7a200e36c0094e, processorArchitecture=MSIL" /> </ItemGroup> <ItemGroup> <Content Include="..\..\..\..\..\..\..\Program Files (x86)\MonoGame\v3.0\Assemblies\WindowsGL\SDL.dll"> <Link>SDL.dll</Link> <CopyToOutputDirectory>Always</CopyToOutputDirectory> </Content> - <Content Include="Content\Sound\bomb.wav"> - <CopyToOutputDirectory>Always</CopyToOutputDirectory> - </Content> - <Content Include="Content\Sound\bullet.wav"> - <CopyToOutputDirectory>Always</CopyToOutputDirectory> - </Content> - <Content Include="Content\Sound\gameover.wav"> - <CopyToOutputDirectory>Always</CopyToOutputDirectory> - </Content> - <Content Include="Content\Sound\hit.wav"> - <CopyToOutputDirectory>Always</CopyToOutputDirectory> - </Content> - <Content Include="Content\Sound\life.wav"> - <CopyToOutputDirectory>Always</CopyToOutputDirectory> - </Content> - <Content Include="Content\Sound\polaritychange.wav"> + <Content Include="Content\Sound\polaritytheme.wav"> <CopyToOutputDirectory>Always</CopyToOutputDirectory> </Content> - <Content Include="Content\Sound\polaritytheme.wav"> + <Content Include="Content\Sound\polaritytheme.wma"> <CopyToOutputDirectory>Always</CopyToOutputDirectory> </Content> <Content Include="Icon.ico" /> </ItemGroup> - <ItemGroup /> + <ItemGroup> + <BootstrapperPackage Include=".NETFramework,Version=v4.0"> + <Visible>False</Visible> + <ProductName>Microsoft .NET Framework 4 %28x86 and x64%29</ProductName> + <Install>true</Install> + </BootstrapperPackage> + <BootstrapperPackage Include="Microsoft.Net.Client.3.5"> + <Visible>False</Visible> + <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName> + <Install>false</Install> + </BootstrapperPackage> + <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1"> + <Visible>False</Visible> + <ProductName>.NET Framework 3.5 SP1</ProductName> + <Install>false</Install> + </BootstrapperPackage> + <BootstrapperPackage Include="Microsoft.Windows.Installer.4.5"> + <Visible>False</Visible> + <ProductName>Windows Installer 4.5</ProductName> + <Install>true</Install> + </BootstrapperPackage> + </ItemGroup> <ItemGroup> <None Include="Content\Fonts\bigfont.xnb"> <CopyToOutputDirectory>Always</CopyToOutputDirectory> @@ -160,6 +184,27 @@ <None Include="Content\Graphics\polaritydemotitle.xnb"> <CopyToOutputDirectory>Always</CopyToOutputDirectory> </None> + <None Include="Content\Sound\bomb.xnb"> + <CopyToOutputDirectory>Always</CopyToOutputDirectory> + </None> + <None Include="Content\Sound\bullet.xnb"> + <CopyToOutputDirectory>Always</CopyToOutputDirectory> + </None> + <None Include="Content\Sound\gameover.xnb"> + <CopyToOutputDirectory>Always</CopyToOutputDirectory> + </None> + <None Include="Content\Sound\hit.xnb"> + <CopyToOutputDirectory>Always</CopyToOutputDirectory> + </None> + <None Include="Content\Sound\life.xnb"> + <CopyToOutputDirectory>Always</CopyToOutputDirectory> + </None> + <None Include="Content\Sound\polaritychange.xnb"> + <CopyToOutputDirectory>Always</CopyToOutputDirectory> + </None> + <None Include="Content\Sound\polaritytheme.xnb"> + <CopyToOutputDirectory>Always</CopyToOutputDirectory> + </None> <None Include="neutral-supercruiser.xnb"> <CopyToOutputDirectory>Always</CopyToOutputDirectory> </None> |