Committing again...

JohnBean · Mar 30, 2013 · 168a875 · 168a875
1 parent d4fa36e
commit 168a875
Show file tree

Hide file tree

Showing 28 changed files with 8 additions and 8 deletions.
diff --git a/SiegeDefenseCode/Assembly-CSharp-vs.csproj b/SiegeDefenseCode/Assembly-CSharp-vs.csproj
@@ -45,6 +45,7 @@
   </ItemGroup>
   <ItemGroup>
      <Compile Include="Assets\BallControl.cs" />
+     <Compile Include="Assets\BlockGUIScript.cs" />
      <Compile Include="Assets\BlockScript.cs" />
      <Compile Include="Assets\GameEngine.cs" />
      <None Include="Assets\Standard Assets\Projectors\Guidelines.txt" />

diff --git a/SiegeDefenseCode/Assembly-CSharp.csproj b/SiegeDefenseCode/Assembly-CSharp.csproj
@@ -45,6 +45,7 @@
   </ItemGroup>
   <ItemGroup>
      <Compile Include="Assets\BallControl.cs" />
+     <Compile Include="Assets\BlockGUIScript.cs" />
      <Compile Include="Assets\BlockScript.cs" />
      <Compile Include="Assets\GameEngine.cs" />
      <None Include="Assets\Standard Assets\Projectors\Guidelines.txt" />

diff --git a/SiegeDefenseCode/Assembly-CSharp.pidb b/SiegeDefenseCode/Assembly-CSharp.pidb
diff --git a/SiegeDefenseCode/Library/InspectorExpandedItems.asset b/SiegeDefenseCode/Library/InspectorExpandedItems.asset
diff --git a/SiegeDefenseCode/Library/ScriptAssemblies/Assembly-CSharp-firstpass.dll b/SiegeDefenseCode/Library/ScriptAssemblies/Assembly-CSharp-firstpass.dll
diff --git a/SiegeDefenseCode/Library/ScriptAssemblies/Assembly-CSharp-firstpass.dll.mdb b/SiegeDefenseCode/Library/ScriptAssemblies/Assembly-CSharp-firstpass.dll.mdb
diff --git a/SiegeDefenseCode/Library/ScriptAssemblies/Assembly-CSharp.dll b/SiegeDefenseCode/Library/ScriptAssemblies/Assembly-CSharp.dll
diff --git a/SiegeDefenseCode/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb b/SiegeDefenseCode/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
diff --git a/SiegeDefenseCode/Library/ScriptAssemblies/Assembly-UnityScript-firstpass.dll b/SiegeDefenseCode/Library/ScriptAssemblies/Assembly-UnityScript-firstpass.dll
diff --git a/SiegeDefenseCode/Library/ScriptAssemblies/Assembly-UnityScript-firstpass.dll.mdb b/SiegeDefenseCode/Library/ScriptAssemblies/Assembly-UnityScript-firstpass.dll.mdb
diff --git a/SiegeDefenseCode/Library/ScriptAssemblies/Assembly-UnityScript.dll b/SiegeDefenseCode/Library/ScriptAssemblies/Assembly-UnityScript.dll
diff --git a/SiegeDefenseCode/Library/ScriptAssemblies/Assembly-UnityScript.dll.mdb b/SiegeDefenseCode/Library/ScriptAssemblies/Assembly-UnityScript.dll.mdb
diff --git a/SiegeDefenseCode/Library/assetDatabase3 b/SiegeDefenseCode/Library/assetDatabase3
diff --git a/SiegeDefenseCode/Library/guidmapper b/SiegeDefenseCode/Library/guidmapper
diff --git a/SiegeDefenseCode/Library/metadata/20/20ab1af2b033be8418ab17c33c55306b b/SiegeDefenseCode/Library/metadata/20/20ab1af2b033be8418ab17c33c55306b
diff --git a/SiegeDefenseCode/Library/metadata/24/24df48f0b59ae5f4386e95375b2ee488 b/SiegeDefenseCode/Library/metadata/24/24df48f0b59ae5f4386e95375b2ee488
diff --git a/SiegeDefenseCode/Library/metadata/44/449b48f7eb5d87a4baaa5fb73f875a59 b/SiegeDefenseCode/Library/metadata/44/449b48f7eb5d87a4baaa5fb73f875a59
diff --git a/SiegeDefenseCode/Library/metadata/45/4570e3d088d337c44bc094b28cce4674 b/SiegeDefenseCode/Library/metadata/45/4570e3d088d337c44bc094b28cce4674
diff --git a/SiegeDefenseCode/Library/metadata/8b/8bc44804e19e12f48822294e9cf95253 b/SiegeDefenseCode/Library/metadata/8b/8bc44804e19e12f48822294e9cf95253
diff --git a/SiegeDefenseCode/Library/metadata/b5/b56123842c221154584a050c155dbd9a b/SiegeDefenseCode/Library/metadata/b5/b56123842c221154584a050c155dbd9a
diff --git a/SiegeDefenseCode/Library/metadata/d4/d4b9ad2a1c1b63740adcb691d142104c b/SiegeDefenseCode/Library/metadata/d4/d4b9ad2a1c1b63740adcb691d142104c
diff --git a/SiegeDefenseCode/Library/metadata/dc/dcfbb5ce2c9247a4aa7da751a4b7b716 b/SiegeDefenseCode/Library/metadata/dc/dcfbb5ce2c9247a4aa7da751a4b7b716
diff --git a/SiegeDefenseCode/Library/metadata/f0/f0afabb54d1d8ea4c940f60d38842b9d b/SiegeDefenseCode/Library/metadata/f0/f0afabb54d1d8ea4c940f60d38842b9d
diff --git a/SiegeDefenseCode/Library/metadata/f1/f15f1664e463a8e4f8df43861c32955b b/SiegeDefenseCode/Library/metadata/f1/f15f1664e463a8e4f8df43861c32955b
diff --git a/SiegeDefenseCode/Library/metadata/fa/fa1557ec25b29454ba5ba7f6f8350368 b/SiegeDefenseCode/Library/metadata/fa/fa1557ec25b29454ba5ba7f6f8350368
diff --git a/SiegeDefenseCode/SiegeDefenseCode-csharp.sln b/SiegeDefenseCode/SiegeDefenseCode-csharp.sln
@@ -23,7 +23,7 @@ Global
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
-																GlobalSection(MonoDevelopProperties) = preSolution
+																										GlobalSection(MonoDevelopProperties) = preSolution
 		StartupItem = Assembly-CSharp.csproj
 		Policies = $0
 		$0.TextStylePolicy = $1

diff --git a/SiegeDefenseCode/SiegeDefenseCode.sln b/SiegeDefenseCode/SiegeDefenseCode.sln
@@ -35,7 +35,7 @@ Global
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
-															GlobalSection(MonoDevelopProperties) = preSolution
+																									GlobalSection(MonoDevelopProperties) = preSolution
 		StartupItem = Assembly-CSharp.csproj
 		Policies = $0
 		$0.TextStylePolicy = $1

diff --git a/SiegeDefenseCode/SiegeDefenseCode.userprefs b/SiegeDefenseCode/SiegeDefenseCode.userprefs
@@ -1,12 +1,10 @@
 <Properties>
   <MonoDevelop.Ide.Workspace ActiveConfiguration="Debug" />
-  <MonoDevelop.Ide.Workbench ActiveDocument="Assets\GameEngine.cs">
+  <MonoDevelop.Ide.Workbench ActiveDocument="Assets\BlockGUIScript.cs">
     <Files>
-      <File FileName="Assets\GameEngine.cs" Line="99" Column="15" />
-      <File FileName="..\..\Locomorph\DiseaseDestroyer\Assets\Disease Destroyer Assets\Scripts\playerMovement.js" Line="12" Column="24" />
-      <File FileName="..\..\Locomorph\DiseaseDestroyer\Assets\Disease Destroyer Assets\Scripts\HUDHandler.js" Line="218" Column="3" />
-      <File FileName="Assets\Standard Assets\Toon Shading\Sources\Shaders\Toony-Basic.shader" Line="1" Column="1" />
-      <File FileName="Assets\BallControl.cs" Line="1" Column="1" />
+      <File FileName="..\..\..\..\..\..\Matt\Documents\SeniorResearch\Assets\Scripts\CreationScript.cs" Line="850" Column="35" />
+      <File FileName="Assets\BlockScript.cs" Line="67" Column="4" />
+      <File FileName="Assets\BlockGUIScript.cs" Line="31" Column="4" />
     </Files>
   </MonoDevelop.Ide.Workbench>
   <MonoDevelop.Ide.DebuggingService.Breakpoints>