more renaming

calebperkins · Dec 6, 2011 · c239ec8 · c239ec8
1 parent bfe47b6
commit c239ec8
Show file tree

Hide file tree

Showing 31 changed files with 35 additions and 34 deletions.
diff --git a/EnsemPro/EnsemPro/Components/AudioManager.cs b/EnsemPro/EnsemPro/Components/AudioManager.cs
@@ -1,7 +1,7 @@
 using Microsoft.Xna.Framework;
 using Microsoft.Xna.Framework.Media;
 
-namespace EnsemPro.Components
+namespace Ensembler.Components
 {
     class AudioManager : GameComponent
     {

diff --git a/EnsemPro/EnsemPro/Components/SaveManager.cs b/EnsemPro/EnsemPro/Components/SaveManager.cs
@@ -7,7 +7,7 @@
 using Microsoft.Xna.Framework.GamerServices;
 using Microsoft.Xna.Framework.Storage;
 
-namespace EnsemPro.Components
+namespace Ensembler.Components
 {
     /// <summary>
     /// This is a game component that saves the game asynchronously (mostly).

diff --git a/EnsemPro/EnsemPro/Components/ScreenManager.cs b/EnsemPro/EnsemPro/Components/ScreenManager.cs
@@ -1,6 +1,6 @@
 using Microsoft.Xna.Framework;
 
-namespace EnsemPro.Components
+namespace Ensembler.Components
 {
     // TODO: add state management here
     class ScreenManager : GameComponent

diff --git a/EnsemPro/EnsemPro/Controllers/DialogController.cs b/EnsemPro/EnsemPro/Controllers/DialogController.cs
@@ -8,7 +8,7 @@
 using XnaColor = Microsoft.Xna.Framework.Color;
 
 
-namespace EnsemPro
+namespace Ensembler
 {
     public class DialogController
     {

diff --git a/EnsemPro/EnsemPro/Controllers/GameEngine.cs b/EnsemPro/EnsemPro/Controllers/GameEngine.cs
@@ -2,7 +2,7 @@
 using Microsoft.Xna.Framework.GamerServices;
 using Microsoft.Xna.Framework.Graphics;
 
-namespace EnsemPro
+namespace Ensembler
 {
     /// <summary>
     /// This is the main type for your game

diff --git a/EnsemPro/EnsemPro/Controllers/Input/InputController.cs b/EnsemPro/EnsemPro/Controllers/Input/InputController.cs
@@ -1,6 +1,6 @@
 using Microsoft.Xna.Framework;
 
-namespace EnsemPro
+namespace Ensembler
 {
     /// <summary>
     /// This is a game component that implements IUpdateable.

diff --git a/EnsemPro/EnsemPro/Controllers/Input/MouseController.cs b/EnsemPro/EnsemPro/Controllers/Input/MouseController.cs
@@ -3,7 +3,7 @@
 using Microsoft.Xna.Framework.Input;
 
 
-namespace EnsemPro
+namespace Ensembler
 {
     public class MouseController : InputController
     {

diff --git a/EnsemPro/EnsemPro/Controllers/Input/WiiController.cs b/EnsemPro/EnsemPro/Controllers/Input/WiiController.cs
@@ -1,7 +1,7 @@
 using System;
 using Microsoft.Xna.Framework;
 
-namespace EnsemPro
+namespace Ensembler
 {
     public class WiiController : InputController
     {

diff --git a/EnsemPro/EnsemPro/Controllers/LevelSelectController.cs b/EnsemPro/EnsemPro/Controllers/LevelSelectController.cs
@@ -5,7 +5,7 @@
 using Microsoft.Xna.Framework.Media;
 using System;
 
-namespace EnsemPro
+namespace Ensembler
 {
     class LevelSelectController
     {

diff --git a/EnsemPro/EnsemPro/Controllers/MenuController.cs b/EnsemPro/EnsemPro/Controllers/MenuController.cs
@@ -4,7 +4,7 @@
 using Microsoft.Xna.Framework.Graphics;
 using Microsoft.Xna.Framework.Input;
 
-namespace EnsemPro
+namespace Ensembler
 {
     class MenuController : IUpdateable
     {

diff --git a/EnsemPro/EnsemPro/Controllers/PlayLevel.cs b/EnsemPro/EnsemPro/Controllers/PlayLevel.cs
@@ -8,7 +8,7 @@
 using Microsoft.Xna.Framework.Input;
 using Microsoft.Xna.Framework.Media;
 
-namespace EnsemPro
+namespace Ensembler
 {
     public class PlayLevel : DrawableGameComponent
     {

diff --git a/EnsemPro/EnsemPro/Controllers/WorldMapController.cs b/EnsemPro/EnsemPro/Controllers/WorldMapController.cs
@@ -7,7 +7,7 @@
 using Microsoft.Xna.Framework.Input;
 using Microsoft.Xna.Framework.Media;
 
-namespace EnsemPro
+namespace Ensembler
 {
     class WorldMapController
     {

diff --git a/EnsemPro/EnsemPro/Ensembler.csproj b/EnsemPro/EnsemPro/Ensembler.csproj
@@ -7,7 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">x86</Platform>
     <OutputType>WinExe</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>EnsemPro</RootNamespace>
+    <RootNamespace>Ensembler</RootNamespace>
     <AssemblyName>EnsemPro</AssemblyName>
     <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
     <TargetFrameworkProfile>Client</TargetFrameworkProfile>
@@ -153,9 +153,10 @@
       <Project>{57D880B7-17CB-41FA-825E-BB6408093DE0}</Project>
       <Name>DataTypes</Name>
     </ProjectReference>
-    <ProjectReference Include="..\EnsemProContent\EnsemProContent.contentproj">
-      <Name>EnsemProContent</Name>
+    <ProjectReference Include="..\EnsemProContent\EnsemblerContent.contentproj">
+      <Name>EnsemblerContent %28Content%29</Name>
       <XnaReferenceType>Content</XnaReferenceType>
+      <Project>{81B4C940-B261-49D4-BF51-7FF754B67067}</Project>
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>

diff --git a/EnsemPro/EnsemPro/Models/City.cs b/EnsemPro/EnsemPro/Models/City.cs
@@ -1,6 +1,6 @@
 using Microsoft.Xna.Framework;
 
-namespace EnsemPro.Models
+namespace Ensembler.Models
 {
     public class City
     {

diff --git a/EnsemPro/EnsemPro/Models/DialogModel.cs b/EnsemPro/EnsemPro/Models/DialogModel.cs
@@ -1,6 +1,6 @@
 using Microsoft.Xna.Framework.Content;
 
-namespace EnsemPro
+namespace Ensembler
 {
     public class DialogModel
     {

diff --git a/EnsemPro/EnsemPro/Models/Function.cs b/EnsemPro/EnsemPro/Models/Function.cs
@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using Microsoft.Xna.Framework;
 
-namespace EnsemPro
+namespace Ensembler
 {
     public class Function
     {

diff --git a/EnsemPro/EnsemPro/Models/GameState.cs b/EnsemPro/EnsemPro/Models/GameState.cs
@@ -3,7 +3,7 @@
 using Microsoft.Xna.Framework.Content;
 using Microsoft.Xna.Framework.Graphics;
 
-namespace EnsemPro
+namespace Ensembler
 {
     /// <summary>
     /// Provides getters and setters for "global" game properties, such as the current resolution and screen.

diff --git a/EnsemPro/EnsemPro/Models/InputBuffer.cs b/EnsemPro/EnsemPro/Models/InputBuffer.cs
@@ -2,7 +2,7 @@
 using Microsoft.Xna.Framework;
 using Microsoft.Xna.Framework.Input;
 
-namespace EnsemPro
+namespace Ensembler
 {
     public class InputBuffer
     {

diff --git a/EnsemPro/EnsemPro/Models/Movement.cs b/EnsemPro/EnsemPro/Models/Movement.cs
@@ -3,7 +3,7 @@
 using Microsoft.Xna.Framework.Content;
 using Microsoft.Xna.Framework.Graphics;
 
-namespace EnsemPro
+namespace Ensembler
 {
     public class Movement
     {

diff --git a/EnsemPro/EnsemPro/Models/MovementEvaluator.cs b/EnsemPro/EnsemPro/Models/MovementEvaluator.cs
@@ -1,7 +1,7 @@
 using System;
 using Microsoft.Xna.Framework;
 
-namespace EnsemPro
+namespace Ensembler
 {
     public class MovementEvaluator
     {

diff --git a/EnsemPro/EnsemPro/Models/SatisfactionQueue.cs b/EnsemPro/EnsemPro/Models/SatisfactionQueue.cs
@@ -3,7 +3,7 @@
 using Microsoft.Xna.Framework.Content;
 using Microsoft.Xna.Framework.Graphics;
 
-namespace EnsemPro
+namespace Ensembler
 {
     /// <summary>
     /// The stars following the baton

diff --git a/EnsemPro/EnsemPro/Models/World.cs b/EnsemPro/EnsemPro/Models/World.cs
@@ -1,5 +1,5 @@
 
-namespace EnsemPro.Models
+namespace Ensembler.Models
 {
     class World
     {

diff --git a/EnsemPro/EnsemPro/Program.cs b/EnsemPro/EnsemPro/Program.cs
@@ -1,5 +1,5 @@
 
-namespace EnsemPro
+namespace Ensembler
 {
 #if WINDOWS || XBOX
     static class Program

diff --git a/EnsemPro/EnsemPro/Views/BatonView.cs b/EnsemPro/EnsemPro/Views/BatonView.cs
@@ -1,7 +1,7 @@
 using Microsoft.Xna.Framework;
 using Microsoft.Xna.Framework.Graphics;
 
-namespace EnsemPro
+namespace Ensembler
 {
     public class BatonView : DrawableGameComponent
     {

diff --git a/EnsemPro/EnsemPro/Views/DialogView.cs b/EnsemPro/EnsemPro/Views/DialogView.cs
@@ -3,7 +3,7 @@
 using Microsoft.Xna.Framework.Content;
 using Microsoft.Xna.Framework.Graphics;
 
-namespace EnsemPro
+namespace Ensembler
 {
     public class DialogView
     {

diff --git a/EnsemPro/EnsemPro/Views/LevelSelectView.cs b/EnsemPro/EnsemPro/Views/LevelSelectView.cs
@@ -3,7 +3,7 @@
 using Microsoft.Xna.Framework.Graphics;
 using Microsoft.Xna.Framework.Media;
 
-namespace EnsemPro
+namespace Ensembler
 {
     class LevelSelectView
     {

diff --git a/EnsemPro/EnsemPro/Views/MenuView.cs b/EnsemPro/EnsemPro/Views/MenuView.cs
@@ -3,7 +3,7 @@
 using Microsoft.Xna.Framework.Graphics;
 using Microsoft.Xna.Framework.Media;
 
-namespace EnsemPro
+namespace Ensembler
 {
     class MenuView
     {

diff --git a/EnsemPro/EnsemPro/Views/Musician.cs b/EnsemPro/EnsemPro/Views/Musician.cs
@@ -4,7 +4,7 @@
 using Microsoft.Xna.Framework.Content;
 using Microsoft.Xna.Framework.Graphics;
 
-namespace EnsemPro
+namespace Ensembler
 {
     class Musician
     {

diff --git a/EnsemPro/EnsemPro/Views/PauseScreen.cs b/EnsemPro/EnsemPro/Views/PauseScreen.cs
@@ -2,7 +2,7 @@
 using Microsoft.Xna.Framework.Graphics;
 
 
-namespace EnsemPro
+namespace Ensembler
 {
     /// <summary>
     /// This is a game component that implements IUpdateable.

diff --git a/EnsemPro/EnsemPro/Views/WorldMapView.cs b/EnsemPro/EnsemPro/Views/WorldMapView.cs
@@ -3,7 +3,7 @@
 using Microsoft.Xna.Framework.Content;
 using Microsoft.Xna.Framework.Graphics;
 
-namespace EnsemPro
+namespace Ensembler
 {
     class WorldMapView
     {

diff --git a/Ensembler.sln b/Ensembler.sln
@@ -1,9 +1,9 @@
 
 Microsoft Visual Studio Solution File, Format Version 11.00
 # Visual Studio 2010
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EnsemPro", "EnsemPro\EnsemPro\EnsemPro.csproj", "{C87D0383-7523-4D4B-BEB8-68DC61C7BA56}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Ensembler", "EnsemPro\EnsemPro\Ensembler.csproj", "{C87D0383-7523-4D4B-BEB8-68DC61C7BA56}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EnsemProContent", "EnsemPro\EnsemProContent\EnsemProContent.contentproj", "{81B4C940-B261-49D4-BF51-7FF754B67067}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EnsemblerContent", "EnsemPro\EnsemProContent\EnsemblerContent.contentproj", "{81B4C940-B261-49D4-BF51-7FF754B67067}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DataTypes", "DataTypes\DataTypes.csproj", "{57D880B7-17CB-41FA-825E-BB6408093DE0}"
 EndProject