From: Ben Beltran Date: Tue, 11 Feb 2014 04:14:10 +0000 (-0600) Subject: Works in win, compiles in mac X-Git-Url: https://git.r.bdr.sh/rbdr/super-polarity/commitdiff_plain/63419029fbda7d3f2f3d5984c3d2c77f341dbd79?ds=sidebyside;hp=10980f9b5db812487ecc118fa8f8255024624e9a Works in win, compiles in mac --- diff --git a/SuperPolarity.userprefs b/SuperPolarity.userprefs index 943644f..2c82115 100644 --- a/SuperPolarity.userprefs +++ b/SuperPolarity.userprefs @@ -1,8 +1,11 @@ - + - + - + + + + diff --git a/SuperPolarity/Content/Sound/bomb.xnb b/SuperPolarity/Content/Sound/bomb.xnb new file mode 100644 index 0000000..71b6dd1 Binary files /dev/null and b/SuperPolarity/Content/Sound/bomb.xnb differ diff --git a/SuperPolarity/Content/Sound/bullet.xnb b/SuperPolarity/Content/Sound/bullet.xnb new file mode 100644 index 0000000..2b59972 Binary files /dev/null and b/SuperPolarity/Content/Sound/bullet.xnb differ diff --git a/SuperPolarity/Content/Sound/gameover.xnb b/SuperPolarity/Content/Sound/gameover.xnb new file mode 100644 index 0000000..8afc574 Binary files /dev/null and b/SuperPolarity/Content/Sound/gameover.xnb differ diff --git a/SuperPolarity/Content/Sound/hit.xnb b/SuperPolarity/Content/Sound/hit.xnb new file mode 100644 index 0000000..52af38d Binary files /dev/null and b/SuperPolarity/Content/Sound/hit.xnb differ diff --git a/SuperPolarity/Content/Sound/life.xnb b/SuperPolarity/Content/Sound/life.xnb new file mode 100644 index 0000000..3c1cad8 Binary files /dev/null and b/SuperPolarity/Content/Sound/life.xnb differ diff --git a/SuperPolarity/Content/Sound/polaritychange.xnb b/SuperPolarity/Content/Sound/polaritychange.xnb new file mode 100644 index 0000000..2cfbc68 Binary files /dev/null and b/SuperPolarity/Content/Sound/polaritychange.xnb differ diff --git a/SuperPolarity/Content/Sound/polaritytheme.wma b/SuperPolarity/Content/Sound/polaritytheme.wma new file mode 100644 index 0000000..e4ea8b8 Binary files /dev/null and b/SuperPolarity/Content/Sound/polaritytheme.wma differ diff --git a/SuperPolarity/Content/Sound/polaritytheme.xnb b/SuperPolarity/Content/Sound/polaritytheme.xnb new file mode 100644 index 0000000..d2c29f9 Binary files /dev/null and b/SuperPolarity/Content/Sound/polaritytheme.xnb differ 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 @@ SuperPolarity SuperPolarity 512 + publish\ + true + Disk + false + Foreground + 7 + Days + false + false + true + 0 + 1.0.0.%2a + false + false + true x86 @@ -34,6 +49,10 @@ Icon.ico + + + + @@ -64,50 +83,55 @@ + + False + ..\..\..\..\..\Program Files (x86)\MonoGame\v3.0\Assemblies\WindowsGL\MonoGame.Framework.dll + ..\..\..\..\..\..\..\Program Files (x86)\MSBuild\..\MonoGame\v3.0\Assemblies\WindowsGL\OpenTK.dll - - ..\..\..\..\..\..\..\Program Files (x86)\MSBuild\..\MonoGame\v3.0\Assemblies\WindowsGL\MonoGame.Framework.dll - ..\..\..\..\..\..\..\Program Files (x86)\MSBuild\..\MonoGame\v3.0\Assemblies\WindowsGL\Lidgren.Network.dll - - ..\..\..\..\..\..\..\Program Files (x86)\MSBuild\..\MonoGame\v3.0\Assemblies\WindowsGL\Tao.Sdl.dll - + SDL.dll Always - - Always - - - Always - - - Always - - - Always - - - Always - - + Always - + Always - + + + False + Microsoft .NET Framework 4 %28x86 and x64%29 + true + + + False + .NET Framework 3.5 SP1 Client Profile + false + + + False + .NET Framework 3.5 SP1 + false + + + False + Windows Installer 4.5 + true + + Always @@ -160,6 +184,27 @@ Always + + Always + + + Always + + + Always + + + Always + + + Always + + + Always + + + Always + Always diff --git a/SuperPolarity/Content/Sound/bomb.wav b/SuperPolarityContent/SuperPolarityContentContent/Sound/bomb.wav similarity index 100% rename from SuperPolarity/Content/Sound/bomb.wav rename to SuperPolarityContent/SuperPolarityContentContent/Sound/bomb.wav diff --git a/SuperPolarity/Content/Sound/bullet.wav b/SuperPolarityContent/SuperPolarityContentContent/Sound/bullet.wav similarity index 100% rename from SuperPolarity/Content/Sound/bullet.wav rename to SuperPolarityContent/SuperPolarityContentContent/Sound/bullet.wav diff --git a/SuperPolarity/Content/Sound/gameover.wav b/SuperPolarityContent/SuperPolarityContentContent/Sound/gameover.wav similarity index 100% rename from SuperPolarity/Content/Sound/gameover.wav rename to SuperPolarityContent/SuperPolarityContentContent/Sound/gameover.wav diff --git a/SuperPolarity/Content/Sound/hit.wav b/SuperPolarityContent/SuperPolarityContentContent/Sound/hit.wav similarity index 100% rename from SuperPolarity/Content/Sound/hit.wav rename to SuperPolarityContent/SuperPolarityContentContent/Sound/hit.wav diff --git a/SuperPolarity/Content/Sound/life.wav b/SuperPolarityContent/SuperPolarityContentContent/Sound/life.wav similarity index 100% rename from SuperPolarity/Content/Sound/life.wav rename to SuperPolarityContent/SuperPolarityContentContent/Sound/life.wav diff --git a/SuperPolarity/Content/Sound/polaritychange.wav b/SuperPolarityContent/SuperPolarityContentContent/Sound/polaritychange.wav similarity index 100% rename from SuperPolarity/Content/Sound/polaritychange.wav rename to SuperPolarityContent/SuperPolarityContentContent/Sound/polaritychange.wav diff --git a/SuperPolarityContent/SuperPolarityContentContent/SuperPolarityContentContent.contentproj b/SuperPolarityContent/SuperPolarityContentContent/SuperPolarityContentContent.contentproj index 12417a2..3e3d270 100644 --- a/SuperPolarityContent/SuperPolarityContentContent/SuperPolarityContentContent.contentproj +++ b/SuperPolarityContent/SuperPolarityContentContent/SuperPolarityContentContent.contentproj @@ -180,6 +180,38 @@ FontTextureProcessor + + + bomb + WavImporter + SoundEffectProcessor + + + bullet + WavImporter + SoundEffectProcessor + + + gameover + WavImporter + SoundEffectProcessor + + + hit + WavImporter + SoundEffectProcessor + + + life + WavImporter + SoundEffectProcessor + + + polaritychange + WavImporter + SoundEffectProcessor + +