From 6016693851cc8ccf79c5bdd2bfaa6b24bd1b3d94 Mon Sep 17 00:00:00 2001 From: Nathan Adams Date: Wed, 16 May 2012 22:04:03 -0500 Subject: [PATCH] + * - Adding an extension to determine what side the objects collided on + * - Correcting misspelling of Extensions in String and Texture2D --- axios/AxiosEngine.cd | 18 +++++++++--------- axios/Axios_WP7.csproj | 1 + axios/Axios_Windows.csproj | 1 + axios/Axios_Xbox_360.csproj | 1 + axios/Axios_settings.cs | 2 ++ axios/Engine/Extensions/String.cs | 2 +- axios/Engine/Extensions/Texture2D.cs | 2 +- 7 files changed, 16 insertions(+), 11 deletions(-) diff --git a/axios/AxiosEngine.cd b/axios/AxiosEngine.cd index 5364a5b..c3005ff 100644 --- a/axios/AxiosEngine.cd +++ b/axios/AxiosEngine.cd @@ -45,7 +45,7 @@ - AARoEQCHAAACAggBACAAAgAICAAAAAAAIAAAAIIQAAQ= + AARoAQCHAgBCAghBACAAAgAICAAAAAABIAAAAIAQAAA= Engine\AxiosGameScreen.cs @@ -56,17 +56,17 @@ Engine\AxiosTimer.cs - + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACAAAA= Engine\Extensions\String.cs - + - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAQAAAAA= + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAQAgAAA= Engine\Extensions\Texture2D.cs @@ -95,7 +95,7 @@ - AAAAAAAAAgABAAQBAAAAAAAAAAAgAAAAAAAAAAAAAAA= + AAAAAAAAAgABAAQBAAAAIAAAAAAgAAAAAAAAAAAAAAA= Engine\File\AxiosFile.cs @@ -103,7 +103,7 @@ - AAAAAAAAAAABAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAA= + AAAAAAAAAAABAAAAAAAAIAAAAAAgAAAAAAAAAAAAAAA= Engine\File\AxiosIsolatedFile.cs @@ -111,7 +111,7 @@ - AAAAAAAAAAABAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAA= + AAAAAAAAAAABAAAAAAAAIAAAAAAgAAAAAAAAAAAAAAA= Engine\File\AxiosRegularFile.cs @@ -119,7 +119,7 @@ - AAAAAAAAAAABAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAA= + AAAAAAAAAAABAAAAAAAAIAAAAAAgAAAAAAAAAAAAAAA= Engine\File\AxiosTitleFile.cs @@ -169,7 +169,7 @@ - AAAAAAAAAAABAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAA= + AAAAAAAAAAABAAAAAAAAIAAAAAAgAAAAAAAAAAAAAAA= Engine\Interfaces\IAxiosFile.cs diff --git a/axios/Axios_WP7.csproj b/axios/Axios_WP7.csproj index d280c7f..8b2eaf3 100644 --- a/axios/Axios_WP7.csproj +++ b/axios/Axios_WP7.csproj @@ -166,6 +166,7 @@ + diff --git a/axios/Axios_Windows.csproj b/axios/Axios_Windows.csproj index b80928b..3fa789c 100644 --- a/axios/Axios_Windows.csproj +++ b/axios/Axios_Windows.csproj @@ -209,6 +209,7 @@ + diff --git a/axios/Axios_Xbox_360.csproj b/axios/Axios_Xbox_360.csproj index 9021116..df47048 100644 --- a/axios/Axios_Xbox_360.csproj +++ b/axios/Axios_Xbox_360.csproj @@ -159,6 +159,7 @@ + diff --git a/axios/Axios_settings.cs b/axios/Axios_settings.cs index 3b9af6c..c8b6153 100644 --- a/axios/Axios_settings.cs +++ b/axios/Axios_settings.cs @@ -79,6 +79,8 @@ * - Fixing path placement in Farseer * - Moving base.draw to last in AxiosGameScreen to make sure Farseer debug information is visible * - Removing old debugging code + * - Adding an extension to determine what side the objects collided on + * - Correcting misspelling of Extensions in String and Texture2D * */ diff --git a/axios/Engine/Extensions/String.cs b/axios/Engine/Extensions/String.cs index 3aab7cc..abd1195 100644 --- a/axios/Engine/Extensions/String.cs +++ b/axios/Engine/Extensions/String.cs @@ -1,5 +1,5 @@  -namespace Axios.Engine.Extenions +namespace Axios.Engine.Extensions { public static class AxiosExtensions_String { diff --git a/axios/Engine/Extensions/Texture2D.cs b/axios/Engine/Extensions/Texture2D.cs index cab554a..3a6b84d 100644 --- a/axios/Engine/Extensions/Texture2D.cs +++ b/axios/Engine/Extensions/Texture2D.cs @@ -3,7 +3,7 @@ using Microsoft.Xna.Framework; using Microsoft.Xna.Framework.Graphics; -namespace Axios.Engine.Extenions +namespace Axios.Engine.Extensions { public enum TextureUnionLocation { Right,