From 63419029fbda7d3f2f3d5984c3d2c77f341dbd79 Mon Sep 17 00:00:00 2001 From: Ben Beltran Date: Mon, 10 Feb 2014 22:14:10 -0600 Subject: Works in win, compiles in mac --- SuperPolarity.userprefs | 9 +- SuperPolarity/Content/Sound/bomb.wav | Bin 403244 -> 0 bytes SuperPolarity/Content/Sound/bomb.xnb | Bin 0 -> 403305 bytes SuperPolarity/Content/Sound/bullet.wav | Bin 201644 -> 0 bytes SuperPolarity/Content/Sound/bullet.xnb | Bin 0 -> 201705 bytes SuperPolarity/Content/Sound/gameover.wav | Bin 1612844 -> 0 bytes SuperPolarity/Content/Sound/gameover.xnb | Bin 0 -> 1612905 bytes SuperPolarity/Content/Sound/hit.wav | Bin 403244 -> 0 bytes SuperPolarity/Content/Sound/hit.xnb | Bin 0 -> 403305 bytes SuperPolarity/Content/Sound/life.wav | Bin 403244 -> 0 bytes SuperPolarity/Content/Sound/life.xnb | Bin 0 -> 403305 bytes SuperPolarity/Content/Sound/polaritychange.wav | Bin 403244 -> 0 bytes SuperPolarity/Content/Sound/polaritychange.xnb | Bin 0 -> 403305 bytes SuperPolarity/Content/Sound/polaritytheme.wma | Bin 0 -> 6617551 bytes SuperPolarity/Content/Sound/polaritytheme.xnb | Bin 0 -> 131 bytes SuperPolarity/Properties/AssemblyInfo.cs | 2 +- SuperPolarity/SuperPolarity.cs | 3 +- SuperPolarity/SuperPolarity.csproj | 93 ++++++--- .../SuperPolarityContentContent/Sound/bomb.wav | Bin 0 -> 403244 bytes .../SuperPolarityContentContent/Sound/bullet.wav | Bin 0 -> 201644 bytes .../SuperPolarityContentContent/Sound/gameover.wav | Bin 0 -> 1612844 bytes .../SuperPolarityContentContent/Sound/hit.wav | Bin 0 -> 403244 bytes .../SuperPolarityContentContent/Sound/life.wav | Bin 0 -> 403244 bytes .../Sound/polaritychange.wav | Bin 0 -> 403244 bytes .../SuperPolarityContentContent.contentproj | 32 +++ SuperPolarityMac/Content/logo.png | Bin 0 -> 8994 bytes SuperPolarityMac/Game1.cs | 110 +++++++++++ SuperPolarityMac/Info.plist | 17 ++ SuperPolarityMac/Main.cs | 44 +++++ SuperPolarityMac/Program.cs | 56 ++++-- SuperPolarityMac/Project.cs | 0 SuperPolarityMac/Properties/AssemblyInfo.cs | 27 +++ SuperPolarityMac/SuperPolarityMac.csproj | 220 +++++++++++++++++++-- SuperPolarityMac/SuperPolarityMac.sln | 23 +++ SuperPolarityMac/SuperPolarityMac.userprefs | 13 ++ 35 files changed, 588 insertions(+), 61 deletions(-) delete mode 100644 SuperPolarity/Content/Sound/bomb.wav create mode 100644 SuperPolarity/Content/Sound/bomb.xnb delete mode 100644 SuperPolarity/Content/Sound/bullet.wav create mode 100644 SuperPolarity/Content/Sound/bullet.xnb delete mode 100644 SuperPolarity/Content/Sound/gameover.wav create mode 100644 SuperPolarity/Content/Sound/gameover.xnb delete mode 100644 SuperPolarity/Content/Sound/hit.wav create mode 100644 SuperPolarity/Content/Sound/hit.xnb delete mode 100644 SuperPolarity/Content/Sound/life.wav create mode 100644 SuperPolarity/Content/Sound/life.xnb delete mode 100644 SuperPolarity/Content/Sound/polaritychange.wav create mode 100644 SuperPolarity/Content/Sound/polaritychange.xnb create mode 100644 SuperPolarity/Content/Sound/polaritytheme.wma create mode 100644 SuperPolarity/Content/Sound/polaritytheme.xnb create mode 100644 SuperPolarityContent/SuperPolarityContentContent/Sound/bomb.wav create mode 100644 SuperPolarityContent/SuperPolarityContentContent/Sound/bullet.wav create mode 100644 SuperPolarityContent/SuperPolarityContentContent/Sound/gameover.wav create mode 100644 SuperPolarityContent/SuperPolarityContentContent/Sound/hit.wav create mode 100644 SuperPolarityContent/SuperPolarityContentContent/Sound/life.wav create mode 100644 SuperPolarityContent/SuperPolarityContentContent/Sound/polaritychange.wav create mode 100644 SuperPolarityMac/Content/logo.png create mode 100644 SuperPolarityMac/Game1.cs create mode 100644 SuperPolarityMac/Info.plist create mode 100644 SuperPolarityMac/Main.cs create mode 100644 SuperPolarityMac/Project.cs create mode 100644 SuperPolarityMac/Properties/AssemblyInfo.cs create mode 100644 SuperPolarityMac/SuperPolarityMac.sln create mode 100644 SuperPolarityMac/SuperPolarityMac.userprefs 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.wav b/SuperPolarity/Content/Sound/bomb.wav deleted file mode 100644 index 5af439b..0000000 Binary files a/SuperPolarity/Content/Sound/bomb.wav and /dev/null differ 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.wav b/SuperPolarity/Content/Sound/bullet.wav deleted file mode 100644 index 6586489..0000000 Binary files a/SuperPolarity/Content/Sound/bullet.wav and /dev/null 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.wav b/SuperPolarity/Content/Sound/gameover.wav deleted file mode 100644 index cac9d23..0000000 Binary files a/SuperPolarity/Content/Sound/gameover.wav and /dev/null 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.wav b/SuperPolarity/Content/Sound/hit.wav deleted file mode 100644 index 43433cd..0000000 Binary files a/SuperPolarity/Content/Sound/hit.wav and /dev/null 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.wav b/SuperPolarity/Content/Sound/life.wav deleted file mode 100644 index a1d0436..0000000 Binary files a/SuperPolarity/Content/Sound/life.wav and /dev/null 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.wav b/SuperPolarity/Content/Sound/polaritychange.wav deleted file mode 100644 index 25b59a4..0000000 Binary files a/SuperPolarity/Content/Sound/polaritychange.wav and /dev/null 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/SuperPolarityContent/SuperPolarityContentContent/Sound/bomb.wav b/SuperPolarityContent/SuperPolarityContentContent/Sound/bomb.wav new file mode 100644 index 0000000..5af439b Binary files /dev/null and b/SuperPolarityContent/SuperPolarityContentContent/Sound/bomb.wav differ diff --git a/SuperPolarityContent/SuperPolarityContentContent/Sound/bullet.wav b/SuperPolarityContent/SuperPolarityContentContent/Sound/bullet.wav new file mode 100644 index 0000000..6586489 Binary files /dev/null and b/SuperPolarityContent/SuperPolarityContentContent/Sound/bullet.wav differ diff --git a/SuperPolarityContent/SuperPolarityContentContent/Sound/gameover.wav b/SuperPolarityContent/SuperPolarityContentContent/Sound/gameover.wav new file mode 100644 index 0000000..cac9d23 Binary files /dev/null and b/SuperPolarityContent/SuperPolarityContentContent/Sound/gameover.wav differ diff --git a/SuperPolarityContent/SuperPolarityContentContent/Sound/hit.wav b/SuperPolarityContent/SuperPolarityContentContent/Sound/hit.wav new file mode 100644 index 0000000..43433cd Binary files /dev/null and b/SuperPolarityContent/SuperPolarityContentContent/Sound/hit.wav differ diff --git a/SuperPolarityContent/SuperPolarityContentContent/Sound/life.wav b/SuperPolarityContent/SuperPolarityContentContent/Sound/life.wav new file mode 100644 index 0000000..a1d0436 Binary files /dev/null and b/SuperPolarityContent/SuperPolarityContentContent/Sound/life.wav differ diff --git a/SuperPolarityContent/SuperPolarityContentContent/Sound/polaritychange.wav b/SuperPolarityContent/SuperPolarityContentContent/Sound/polaritychange.wav new file mode 100644 index 0000000..25b59a4 Binary files /dev/null and b/SuperPolarityContent/SuperPolarityContentContent/Sound/polaritychange.wav differ 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 + +