More last minute art changes

TadCordle · Jul 18, 2014 · 2f78d2a · 2f78d2a
1 parent 98ff1b9
commit 2f78d2a
Show file tree

Hide file tree

Showing 19 changed files with 36 additions and 8 deletions.
diff --git a/Badminton.suo b/Badminton.suo
diff --git a/Badminton/Badminton/Badminton.csproj.Debug.cachefile b/Badminton/Badminton/Badminton.csproj.Debug.cachefile
@@ -59,6 +59,9 @@ Content\textures\octopus.xnb
 Content\textures\graveyard.xnb
 Content\textures\circus.xnb
 Content\textures\clocktower.xnb
+Content\textures\circus foreground.xnb
+Content\octopus music.xnb
 Content\castle music.wma
 Content\menu music.wma
 Content\pillar music.wma
+Content\octopus music.wma
diff --git a/Badminton/Badminton/bin/x86/Debug/Badminton.exe b/Badminton/Badminton/bin/x86/Debug/Badminton.exe
diff --git a/Badminton/Badminton/bin/x86/Debug/Badminton.exe.locked b/Badminton/Badminton/bin/x86/Debug/Badminton.exe.locked
diff --git a/Badminton/Badminton/bin/x86/Debug/Badminton.pdb b/Badminton/Badminton/bin/x86/Debug/Badminton.pdb
diff --git a/Badminton/Badminton/bin/x86/Release/Badminton.exe b/Badminton/Badminton/bin/x86/Release/Badminton.exe
diff --git a/Badminton/Badminton/bin/x86/Release/Badminton.exe.locked b/Badminton/Badminton/bin/x86/Release/Badminton.exe.locked
diff --git a/Badminton/Badminton/bin/x86/Release/Badminton.pdb b/Badminton/Badminton/bin/x86/Release/Badminton.pdb
diff --git a/Badminton/Badminton/obj/x86/Debug/Badminton.csproj.FileListAbsolute.txt b/Badminton/Badminton/obj/x86/Debug/Badminton.csproj.FileListAbsolute.txt
@@ -285,3 +285,6 @@ C:\Users\Tad\Desktop\Documents\Visual Studio 2010\Projects\Project Jack\Badminto
 C:\Users\Tad\Desktop\Documents\Visual Studio 2010\Projects\Project Jack\Badminton\Badminton\bin\x86\Debug\Content\textures\graveyard.xnb
 C:\Users\Tad\Desktop\Documents\Visual Studio 2010\Projects\Project Jack\Badminton\Badminton\bin\x86\Debug\Content\textures\circus.xnb
 C:\Users\Tad\Desktop\Documents\Visual Studio 2010\Projects\Project Jack\Badminton\Badminton\bin\x86\Debug\Content\textures\clocktower.xnb
+C:\Users\Tad\Desktop\Documents\Visual Studio 2010\Projects\Project Jack\Badminton\Badminton\bin\x86\Debug\Content\textures\circus foreground.xnb
+C:\Users\Tad\Desktop\Documents\Visual Studio 2010\Projects\Project Jack\Badminton\Badminton\bin\x86\Debug\Content\octopus music.xnb
+C:\Users\Tad\Desktop\Documents\Visual Studio 2010\Projects\Project Jack\Badminton\Badminton\bin\x86\Debug\Content\octopus music.wma
diff --git a/Badminton/Badminton/obj/x86/Debug/Badminton.exe b/Badminton/Badminton/obj/x86/Debug/Badminton.exe
diff --git a/Badminton/Badminton/obj/x86/Debug/Badminton.pdb b/Badminton/Badminton/obj/x86/Debug/Badminton.pdb
diff --git a/...n/Badminton/obj/x86/Debug/cachefile-{C6E1D1CA-80EA-49DD-97C2-836B74CB33EB}-targetpath.txt b/...n/Badminton/obj/x86/Debug/cachefile-{C6E1D1CA-80EA-49DD-97C2-836B74CB33EB}-targetpath.txt
@@ -62,3 +62,6 @@ Content\textures\octopus.xnb
 Content\textures\graveyard.xnb
 Content\textures\circus.xnb
 Content\textures\clocktower.xnb
+Content\textures\circus foreground.xnb
+Content\octopus music.xnb
+Content\octopus music.wma
diff --git a/Badminton/Badminton/obj/x86/Release/Badminton.exe b/Badminton/Badminton/obj/x86/Release/Badminton.exe
diff --git a/Badminton/Badminton/obj/x86/Release/Badminton.pdb b/Badminton/Badminton/obj/x86/Release/Badminton.pdb
diff --git a/Badminton/BadmintonContent/obj/x86/Debug/ContentPipeline.xml b/Badminton/BadmintonContent/obj/x86/Debug/ContentPipeline.xml
@@ -134,7 +134,7 @@
       <Processor>TextureProcessor</Processor>
       <Options>None</Options>
       <Output>C:\Users\Tad\Desktop\Documents\Visual Studio 2010\Projects\Project Jack\Badminton\Badminton\bin\x86\Debug\Content\textures\menu assets\logo.xnb</Output>
-      <Time>2014-04-15T19:50:15.7203809-04:00</Time>
+      <Time>2014-07-17T22:59:36.2954456-04:00</Time>
     </Item>
     <Item>
       <Source>textures\menu assets\ps_blank.png</Source>
@@ -269,7 +269,7 @@
       <Processor>TextureProcessor</Processor>
       <Options>None</Options>
       <Output>C:\Users\Tad\Desktop\Documents\Visual Studio 2010\Projects\Project Jack\Badminton\Badminton\bin\x86\Debug\Content\textures\menu assets\up.xnb</Output>
-      <Time>2014-04-15T19:50:15.8383877-04:00</Time>
+      <Time>2014-07-17T22:56:25.418528-04:00</Time>
     </Item>
     <Item>
       <Source>textures\heart.png</Source>
@@ -505,7 +505,7 @@
       <Processor>TextureProcessor</Processor>
       <Options>None</Options>
       <Output>C:\Users\Tad\Desktop\Documents\Visual Studio 2010\Projects\Project Jack\Badminton\Badminton\bin\x86\Debug\Content\textures\pillar.xnb</Output>
-      <Time>2014-07-11T19:39:01.8283953-04:00</Time>
+      <Time>2014-07-18T07:43:35.0340332-04:00</Time>
     </Item>
     <Item>
       <Source>pillar music.mp3</Source>
@@ -524,7 +524,7 @@
       <Processor>TextureProcessor</Processor>
       <Options>None</Options>
       <Output>C:\Users\Tad\Desktop\Documents\Visual Studio 2010\Projects\Project Jack\Badminton\Badminton\bin\x86\Debug\Content\textures\octopus.xnb</Output>
-      <Time>2014-07-15T20:48:58.5813015-04:00</Time>
+      <Time>2014-07-17T22:01:24.3737191-04:00</Time>
     </Item>
     <Item>
       <Source>textures\graveyard.png</Source>
@@ -542,7 +542,7 @@
       <Processor>TextureProcessor</Processor>
       <Options>None</Options>
       <Output>C:\Users\Tad\Desktop\Documents\Visual Studio 2010\Projects\Project Jack\Badminton\Badminton\bin\x86\Debug\Content\textures\circus.xnb</Output>
-      <Time>2014-07-15T21:42:01.6013599-04:00</Time>
+      <Time>2014-07-17T22:04:17.9296459-04:00</Time>
     </Item>
     <Item>
       <Source>textures\clocktower.png</Source>
@@ -553,6 +553,25 @@
       <Output>C:\Users\Tad\Desktop\Documents\Visual Studio 2010\Projects\Project Jack\Badminton\Badminton\bin\x86\Debug\Content\textures\clocktower.xnb</Output>
       <Time>2014-07-15T21:42:33.1761658-04:00</Time>
     </Item>
+    <Item>
+      <Source>textures\circus foreground.png</Source>
+      <Name>textures\circus foreground</Name>
+      <Importer>TextureImporter</Importer>
+      <Processor>TextureProcessor</Processor>
+      <Options>None</Options>
+      <Output>C:\Users\Tad\Desktop\Documents\Visual Studio 2010\Projects\Project Jack\Badminton\Badminton\bin\x86\Debug\Content\textures\circus foreground.xnb</Output>
+      <Time>2014-07-17T22:37:35.8899227-04:00</Time>
+    </Item>
+    <Item>
+      <Source>octopus music.mp3</Source>
+      <Name>octopus music</Name>
+      <Importer>Mp3Importer</Importer>
+      <Processor>SongProcessor</Processor>
+      <Options>None</Options>
+      <Output>C:\Users\Tad\Desktop\Documents\Visual Studio 2010\Projects\Project Jack\Badminton\Badminton\bin\x86\Debug\Content\octopus music.xnb</Output>
+      <Extra>C:\Users\Tad\Desktop\Documents\Visual Studio 2010\Projects\Project Jack\Badminton\Badminton\bin\x86\Debug\Content\octopus music.wma</Extra>
+      <Time>2014-07-16T20:08:08.575068-04:00</Time>
+    </Item>
     <BuildSuccessful>true</BuildSuccessful>
     <Settings>
       <TargetPlatform>Windows</TargetPlatform>

diff --git a/Badminton/BadmintonContent/obj/x86/Release/ContentPipeline.xml b/Badminton/BadmintonContent/obj/x86/Release/ContentPipeline.xml
@@ -170,7 +170,7 @@
       <Processor>TextureProcessor</Processor>
       <Options>None</Options>
       <Output>C:\Users\Tad\Desktop\Documents\Visual Studio 2010\Projects\Project Jack\Badminton\Badminton\bin\x86\Release\Content\textures\menu assets\logo.xnb</Output>
-      <Time>2014-04-15T19:50:15.7203809-04:00</Time>
+      <Time>2014-07-17T22:59:36.2954456-04:00</Time>
     </Item>
     <Item>
       <Source>textures\menu assets\ps_blank.png</Source>
@@ -314,7 +314,7 @@
       <Processor>TextureProcessor</Processor>
       <Options>None</Options>
       <Output>C:\Users\Tad\Desktop\Documents\Visual Studio 2010\Projects\Project Jack\Badminton\Badminton\bin\x86\Release\Content\textures\menu assets\up.xnb</Output>
-      <Time>2014-04-15T19:50:15.8383877-04:00</Time>
+      <Time>2014-07-17T22:56:25.418528-04:00</Time>
     </Item>
     <Item>
       <Source>textures\heart.png</Source>
@@ -505,7 +505,7 @@
       <Processor>TextureProcessor</Processor>
       <Options>None</Options>
       <Output>C:\Users\Tad\Desktop\Documents\Visual Studio 2010\Projects\Project Jack\Badminton\Badminton\bin\x86\Release\Content\textures\pillar.xnb</Output>
-      <Time>2014-07-11T19:39:01.8283953-04:00</Time>
+      <Time>2014-07-18T07:43:35.0340332-04:00</Time>
     </Item>
     <Item>
       <Source>pillar music.mp3</Source>

diff --git a/Badminton/BadmintonContent/textures/menu assets/logo.png b/Badminton/BadmintonContent/textures/menu assets/logo.png
diff --git a/Badminton/BadmintonContent/textures/menu assets/up.png b/Badminton/BadmintonContent/textures/menu assets/up.png
diff --git a/Badminton/BadmintonContent/textures/pillar.png b/Badminton/BadmintonContent/textures/pillar.png