Merge branch 'master' of https://github.com/Hindi/C3P0GitHub

Hindi · Feb 10, 2015 · f60744a · f60744a
2 parents c7e37eb + ed332b1
commit f60744a
Show file tree

Hide file tree

Showing 7 changed files with 6 additions and 6 deletions.
diff --git a/Assets/MasterServer/MasterServer.exe b/Assets/MasterServer/MasterServer.exe
diff --git a/Assets/MasterServer.meta → Assets/Resources/MasterServer.meta b/Assets/MasterServer.meta → Assets/Resources/MasterServer.meta
diff --git a/Assets/MasterServer/MasterServer.exe.meta → ...ources/MasterServer/MasterServer.exe.meta b/Assets/MasterServer/MasterServer.exe.meta → ...ources/MasterServer/MasterServer.exe.meta
diff --git a/Assets/Scripts/Game specific/SpaceInvader/AliensManager.cs b/Assets/Scripts/Game specific/SpaceInvader/AliensManager.cs
@@ -163,7 +163,7 @@ public void onAlienDeath()
 		if (deathCount == alienCount)
         {
             EventManager<bool>.Raise(EnumEvent.RESTARTGAME, true);
-            victoryCount++;
+            victoryCount += 2;
         }
 	}
 

diff --git a/Assets/Scripts/Game/QuestionManager.cs b/Assets/Scripts/Game/QuestionManager.cs
@@ -380,7 +380,7 @@ public void update()
     {
         if(waitForAnswers)
         {
-            if(Time.time - questionSendTime > 5)
+            if(Time.time - questionSendTime > 15)
             {
                 checkClientsAnswers();
                 sendResults();

diff --git a/Assets/Scripts/Network/C3PONetwork.cs b/Assets/Scripts/Network/C3PONetwork.cs
@@ -212,7 +212,7 @@ public void broadCastSomething(string s)
 	public void createTeacherServer()
 	{
 		/* Launch MasterServer */
-        System.Diagnostics.Process.Start(Application.dataPath + @"\MasterServer\MasterServer.exe");
+        System.Diagnostics.Process.Start(Application.dataPath + @"\Resources\MasterServer\MasterServer.exe");
 
         /* Bind to it */
 		MasterServer.port = masterPort;

diff --git a/Assets/Scripts/UI/QuestionAnswerMenu.cs b/Assets/Scripts/UI/QuestionAnswerMenu.cs
@@ -29,7 +29,7 @@ public class QuestionAnswerMenu : MonoBehaviour {
 
     bool answered;
     private float startTime;
-    private const float questionTime = 5;
+    private const float questionTime = 15;
 
     public void setQuestionText(string q)
     {