Intern release 0.4-14

Assets/MainMenu.unity

@@ -2607,7 +2607,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 1, y: 1}
-  m_AnchoredPosition: {x: -0.000045776367, y: 0.0031971508}
+  m_AnchoredPosition: {x: -0.000045776367, y: 18.181007}
   m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0.5, y: 1}
 --- !u!114 &321314050
@@ -5560,7 +5560,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 1, y: 1}
-  m_AnchoredPosition: {x: -0.000015258789, y: 0.0031971508}
+  m_AnchoredPosition: {x: -0.000015258789, y: 18.181007}
   m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0.5, y: 1}
 --- !u!114 &777178507
@@ -7227,7 +7227,7 @@ MonoBehaviour:
   m_HandleRect: {fileID: 761483706}
   m_Direction: 2
   m_Value: 0
-  m_Size: 0.9999778
+  m_Size: 0.8998975
   m_NumberOfSteps: 0
   m_OnValueChanged:
     m_PersistentCalls:
@@ -8435,7 +8435,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 0, y: 0.0031517653}
+  m_AnchoredPosition: {x: 0, y: 18.180979}
   m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0, y: 1}
 --- !u!114 &1273003562
@@ -10712,7 +10712,7 @@ MonoBehaviour:
   m_HandleRect: {fileID: 359479519}
   m_Direction: 2
   m_Value: 0
-  m_Size: 0.9999778
+  m_Size: 0.8998975
   m_NumberOfSteps: 0
   m_OnValueChanged:
     m_PersistentCalls:
@@ -12149,7 +12149,7 @@ MonoBehaviour:
   m_HandleRect: {fileID: 974731452}
   m_Direction: 2
   m_Value: 0
-  m_Size: 0.9999734
+  m_Size: 0.8798521
   m_NumberOfSteps: 0
   m_OnValueChanged:
     m_PersistentCalls:

Assets/Scripts/Database/OnlineDatabase.cs

@@ -588,9 +588,11 @@ public class OnlineDatabase : MonoBehaviour {
             // Show result
             string jsonData = www.downloadHandler.text;
 
-            jsonData = "{\"usernamesList\" :  " + jsonData + " }";
+            if (!jsonData.Equals("")) {
+                jsonData = "{\"usernamesList\" :  " + jsonData + " }";
 
-            JsonUtility.FromJsonOverwrite(jsonData, uNames);
+                JsonUtility.FromJsonOverwrite(jsonData, uNames);
+            }
         }
         // TODO handle empty
         return uNames.usernamesList;

Assets/Scripts/Login/Register.cs

@@ -102,7 +102,6 @@ public class Register : MonoBehaviour {
         byte[] pass = sha1.ComputeHash(pwd);
 
         string postUrl = registerUserUrl + "name=" + UnityWebRequest.EscapeURL(Username) + "&password=" + UnityWebRequest.EscapeURL(Convert.ToBase64String(pass)) + "&email=" + UnityWebRequest.EscapeURL(Email) + "&s=" + UnityWebRequest.EscapeURL(salt) + "&did=" + deviceId + "&os=" + UnityWebRequest.EscapeURL(os);
-        Debug.Log(postUrl);
         UnityWebRequest www = UnityWebRequest.Get(postUrl);
         yield return www.SendWebRequest();
 

Assets/Scripts/MainMenu.cs

@@ -159,7 +159,7 @@ public class MainMenu : MonoBehaviour {
         panelCG.blocksRaycasts = (isVisible ? true : false);
     }
 
-    private void HideNewGamesPanel() {
+    public void HideNewGamesPanel() {
         SetPanelVisibility("LocalGameSettings", false);
         SetPanelVisibility("OnlineGameSettings", false);
 

Assets/Scripts/NewOnlineGame.cs

@@ -48,8 +48,9 @@ public class NewOnlineGame : MonoBehaviour
         int correctToWin = GetInputFieldValue(correctAnswersToWin);
         List<InviteSearchResult> inviteUsers = ips.GetSelectedUsersForInvite();
         OnlineDatabase.Instance.SetupNewOnlineGame(timeLimitQuestion, timeLimitPlayer, correctToWin, inviteUsers);
-        
+
         // Reload Online Games panel, new prefab Online game pending.
+        Hide();
     }
 
     private int GetInputFieldValue(InputField inputField) {
@@ -68,4 +69,8 @@ public class NewOnlineGame : MonoBehaviour
     private void OpenInvitePanel() {
         GameObject.Find("InvitePanel").GetComponent<InvitePanelScript>().ShowPanel();
     }
+
+    private void Hide() {
+        GameObject.Find("Main Panel").GetComponent<MainMenu>().HideNewGamesPanel();
+    }
 }

Assets/Scripts/OnlineGameScript.cs

@@ -94,7 +94,7 @@ public class OnlineGameScript : MonoBehaviour {
         } else if ("INVITED".Equals(status)) {
             image.color = statusColors[4];
         } else if ("ACTIVE".Equals(status)) {
-            if (CurrentPlayer.Equals(Database.Instance.GetSignedInUser().Value)) {
+            if (CurrentPlayer.Equals(Database.Instance.GetSignedInUser().Value, StringComparison.InvariantCultureIgnoreCase)) {
                 image.color = statusColors[2];
             } else {
                 image.color = statusColors[1];

Assets/Scripts/OnlinePlayerInfoScript.cs

@@ -31,10 +31,14 @@ public class OnlinePlayerInfoScript : MonoBehaviour
 
     private void DeclineGame() {
         OnlineDatabase.Instance.DeclineOnlineGame(playerName.text, gameId);
+        SetPlayerStatus("DECLINED");
+        HideDecitionButtons();
     }
 
     private void AcceptGame() {
         OnlineDatabase.Instance.AcceptOnlineGame(playerName.text, gameId);
+        SetPlayerStatus("ACCEPTED");
+        HideDecitionButtons();
     }
 
     public void SetPlayerName(string name) {
@@ -63,4 +67,13 @@ public class OnlinePlayerInfoScript : MonoBehaviour
         buttonCanvasGroup.interactable = true;
         buttonCanvasGroup.blocksRaycasts = true;
     }
+
+    internal void HideDecitionButtons() {
+        statusPanel.GetComponent<CanvasGroup>().alpha = 1f;
+        CanvasGroup buttonCanvasGroup = buttonPanel.GetComponent<CanvasGroup>();
+
+        buttonCanvasGroup.alpha = 0f;
+        buttonCanvasGroup.interactable = false;
+        buttonCanvasGroup.blocksRaycasts = false;
+    }
 }

Assets/Scripts/ScrollViewScript.cs

@@ -65,7 +65,7 @@ public class ScrollViewScript : MonoBehaviour, IDropHandler {
     }
 
     public void CheckActiveUserLoggedIn() {
-        if (!Database.Instance.GetSignedInUser().Value.Equals(currentPlayer)) {
+        if (!Database.Instance.GetSignedInUser().Value.Equals(currentPlayer, StringComparison.InvariantCultureIgnoreCase)) {
             GameObject.Find("NewQuestionButtonPanel").GetComponent<RoundButtonsScript>().HidePanel();
             if (nq != null) {
                 CanvasGroup newQuestionCanvasGroup = nq.GetComponent<CanvasGroup>();
@@ -76,7 +76,7 @@ public class ScrollViewScript : MonoBehaviour, IDropHandler {
     }
 
     private void ShowRoundButtons(bool ShowNextPlayer) {
-        if (GetGameMode().Equals("Local") || Database.Instance.GetSignedInUser().Value.Equals(currentPlayer)) {
+        if (GetGameMode().Equals("Local") || Database.Instance.GetSignedInUser().Value.Equals(currentPlayer, StringComparison.InvariantCultureIgnoreCase)) {
             RoundButtonsScript rbs = GameObject.Find("NewQuestionButtonPanel").GetComponent<RoundButtonsScript>();
 
             if (ShowNextPlayer) {

ProjectSettings/ProjectSettings.asset

@@ -3,7 +3,7 @@
 --- !u!129 &1
 PlayerSettings:
   m_ObjectHideFlags: 0
-  serializedVersion: 17
+  serializedVersion: 19
   productGUID: 5d0f18a4388c98c4d8e652b762b36524
   AndroidProfiler: 0
   AndroidFilterTouchesWhenObscured: 0
@@ -52,8 +52,7 @@ PlayerSettings:
   m_StackTraceTypes: 010000000100000001000000010000000100000001000000
   iosShowActivityIndicatorOnLoading: -1
   androidShowActivityIndicatorOnLoading: -1
-  iosAppInBackgroundBehavior: 0
-  displayResolutionDialog: 1
+  iosUseCustomAppBackgroundBehavior: 0
   iosAllowHTTPDownload: 1
   allowedAutorotateToPortrait: 0
   allowedAutorotateToPortraitUpsideDown: 0
@@ -85,7 +84,6 @@ PlayerSettings:
   useMacAppStoreValidation: 0
   macAppStoreCategory: public.app-category.games
   gpuSkinning: 0
-  graphicsJobs: 0
   xboxPIXTextureCapture: 0
   xboxEnableAvatar: 0
   xboxEnableKinect: 0
@@ -156,6 +154,7 @@ PlayerSettings:
   protectGraphicsMemory: 0
   enableFrameTimingStats: 0
   useHDRDisplay: 0
+  D3DHDRBitDepth: 0
   m_ColorGamuts: 00000000
   targetPixelDensity: 30
   resolutionScalingMode: 0
@@ -164,7 +163,7 @@ PlayerSettings:
   applicationIdentifier:
     Android: se.axelnordh.narkampen
   buildNumber: {}
-  AndroidBundleVersionCode: 13
+  AndroidBundleVersionCode: 14
   AndroidMinSdkVersion: 19
   AndroidTargetSdkVersion: 0
   AndroidPreferredInstallLocation: 1
@@ -180,10 +179,10 @@ PlayerSettings:
   StripUnusedMeshComponents: 0
   VertexChannelCompressionMask: 214
   iPhoneSdkVersion: 988
-  iOSTargetOSVersionString: 9.0
+  iOSTargetOSVersionString: 10.0
   tvOSSdkVersion: 0
   tvOSRequireExtendedGameController: 0
-  tvOSTargetOSVersionString: 9.0
+  tvOSTargetOSVersionString: 10.0
   uIPrerenderedIcon: 0
   uIRequiresPersistentWiFi: 0
   uIRequiresFullScreen: 1
@@ -273,7 +272,6 @@ PlayerSettings:
   androidGamepadSupportLevel: 0
   AndroidValidateAppBundleSize: 1
   AndroidAppBundleSizeToValidate: 100
-  resolutionDialogBanner: {fileID: 0}
   m_BuildTargetIcons:
   - m_BuildTarget: 
     m_Icons:
@@ -388,6 +386,33 @@ PlayerSettings:
       m_Kind: 1
       m_SubKind: 
   m_BuildTargetBatching: []
+  m_BuildTargetGraphicsJobs:
+  - m_BuildTarget: MacStandaloneSupport
+    m_GraphicsJobs: 0
+  - m_BuildTarget: Switch
+    m_GraphicsJobs: 0
+  - m_BuildTarget: MetroSupport
+    m_GraphicsJobs: 0
+  - m_BuildTarget: AppleTVSupport
+    m_GraphicsJobs: 0
+  - m_BuildTarget: BJMSupport
+    m_GraphicsJobs: 0
+  - m_BuildTarget: LinuxStandaloneSupport
+    m_GraphicsJobs: 0
+  - m_BuildTarget: PS4Player
+    m_GraphicsJobs: 0
+  - m_BuildTarget: iOSSupport
+    m_GraphicsJobs: 0
+  - m_BuildTarget: WindowsStandaloneSupport
+    m_GraphicsJobs: 0
+  - m_BuildTarget: XboxOnePlayer
+    m_GraphicsJobs: 0
+  - m_BuildTarget: LuminSupport
+    m_GraphicsJobs: 0
+  - m_BuildTarget: AndroidPlayer
+    m_GraphicsJobs: 0
+  - m_BuildTarget: WebGLSupport
+    m_GraphicsJobs: 0
   m_BuildTargetGraphicsAPIs: []
   m_BuildTargetVRSettings: []
   openGLRequireES31: 0
@@ -719,13 +744,6 @@ PlayerSettings:
   luminVersion:
     m_VersionCode: 1
     m_VersionName: 
-  facebookSdkVersion: 7.9.1
-  facebookAppId: 
-  facebookCookies: 1
-  facebookLogging: 1
-  facebookStatus: 1
-  facebookXfbml: 0
-  facebookFrictionlessRequests: 1
   apiCompatibilityLevel: 6
   cloudProjectId: 30feeaa3-f24a-494f-b331-082b64359a05
   framebufferDepthMemorylessMode: 0

dbFiles/NewOnlineGame.php

@@ -66,7 +66,7 @@
 	$result = mysqli_query($conn,$playerSql);
 	$error = mysqli_error($conn);
 	if ($error !== "") {
-		echo $error;
+		echo $error . " from sql " . $playerSql;
 	}
 
 ?>

dbFiles/OnlineGames.php

@@ -82,10 +82,10 @@
 				$data = $questionIdResult->fetch_assoc();
 				$values = "";
 				foreach ($playerIds AS $playerId) {
-					$values .= "($gameId, (SELECT name FROM users WHERE id = $playerId), " . $data['id'] . "),";
+					$values .= "($gameId, (SELECT username FROM users WHERE id = $playerId), " . $data['id'] . "),";
 				}
 				$values = rtrim($values, ",");
-				$insertRandomStartQuestion = "INSERT INTO userLockedQuestions (gameId, playerName, questionId) VALUES $values";
+				$insertRandomStartQuestion = "INSERT INTO usersLockedQuestions (gameId, playerName, questionId) VALUES $values";
 				$result = $conn->query($insertRandomStartQuestion);
 				if (!$result) {
 					echo "Something wrong with inserting starting question error: " . $conn->error;

dbFiles/PlayerSearch.php

@@ -28,7 +28,7 @@
 		$jsonString = json_encode($json);
 		echo $jsonString;
 	} else {
-		echo json_encode(array('result'=>'EMPTY'));
+		echo "";
 	}
 
 ?>