Skip to content
This repository
Browse code

Merge pull request #50 from gjl6931/master

built again
  • Loading branch information...
commit bfd6153072cfd85e5954c1d00608bb9028a7cbe9 2 parents 0044a28 + 5d2ef4e
Kansas authored February 29, 2012
BIN  Builds/WebPlayer/WebPlayer.unity3d
Binary file not shown
24  GoldRush/Assets/Scripts/GuiHandler.cs
@@ -156,12 +156,12 @@ public void ShowMenu()
156 156
 
157 157
         if (currentMenuState == MenuState.MAIN)
158 158
             mainMenu();
159  
-        else if (currentMenuState == MenuState.OPTIONS)
160  
-            optionsMenu();
161  
-        else if (currentMenuState == MenuState.RULES)
162  
-            showRules();
163  
-        else if (currentMenuState == MenuState.ABOUT)
164  
-            showAboutUs();
  159
+		else if (currentMenuState == MenuState.OPTIONS)
  160
+			optionsMenu(); 
  161
+		else if (currentMenuState == MenuState.RULES)
  162
+			showRules();
  163
+		else if (currentMenuState == MenuState.ABOUT)
  164
+			showAboutUs();
165 165
     }
166 166
 
167 167
     private void mainMenu()
@@ -191,12 +191,12 @@ private void mainMenu()
191 191
 			}
192 192
 
193 193
         }
194  
-        else if (GUILayout.Button("Options", options)) //load the options menu instead
195  
-            currentMenuState = MenuState.OPTIONS;
196  
-        else if (GUILayout.Button("How To Play", options)) // show the rules instead
197  
-            currentMenuState = MenuState.RULES;
198  
-        else if (GUILayout.Button("About the Developers", options))
199  
-            currentMenuState = MenuState.ABOUT;
  194
+		else if (GUILayout.Button("Options - Coming Soon", options)) //load the options menu instead
  195
+		{ /*currentMenuState = MenuState.OPTIONS; */ }
  196
+		else if (GUILayout.Button("How To Play", options)) // show the rules instead
  197
+			currentMenuState = MenuState.RULES;
  198
+		else if (GUILayout.Button("About the Developers", options))
  199
+			currentMenuState = MenuState.ABOUT;
200 200
 
201 201
         GUI.EndGroup();
202 202
     }
BIN  GoldRush/GoldRush-csharp.suo
Binary file not shown
BIN  GoldRush/Library/ScriptAssemblies/Assembly-CSharp-firstpass.dll
Binary file not shown
BIN  GoldRush/Library/ScriptAssemblies/Assembly-CSharp-firstpass.dll.mdb
Binary file not shown
BIN  GoldRush/Library/ScriptAssemblies/Assembly-CSharp.dll
Binary file not shown
BIN  GoldRush/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
Binary file not shown
BIN  GoldRush/Library/ScriptAssemblies/Assembly-UnityScript-firstpass.dll
Binary file not shown
BIN  GoldRush/Library/ScriptAssemblies/Assembly-UnityScript-firstpass.dll.mdb
Binary file not shown
BIN  GoldRush/Library/assetDatabase3
Binary file not shown
BIN  GoldRush/Library/cache/61/611a7b821c7ef1142bd74310c4efa0fa
Binary file not shown
BIN  GoldRush/obj/Debug/Assembly-CSharp-firstpass.dll
Binary file not shown
BIN  GoldRush/obj/Debug/Assembly-CSharp-firstpass.pdb
Binary file not shown
BIN  GoldRush/obj/Debug/Assembly-CSharp.dll
Binary file not shown
BIN  GoldRush/obj/Debug/Assembly-CSharp.pdb
Binary file not shown
BIN  GoldRush/obj/Debug/ResolveAssemblyReference.cache
Binary file not shown

0 notes on commit bfd6153

Please sign in to comment.
Something went wrong with that request. Please try again.