Skip to content

Commit

Permalink
Merge pull request #177 from Kapim/devel
Browse files Browse the repository at this point in the history
Firebase temporarily removed as it caused troubles with android builds
  • Loading branch information
Kapim authored Oct 23, 2020
2 parents a4f9900 + 1c20d3e commit ec4506d
Show file tree
Hide file tree
Showing 2 changed files with 95 additions and 95 deletions.
6 changes: 3 additions & 3 deletions arcor2_AREditor/Assets/BASE/Scripts/GameManager.cs
Original file line number Diff line number Diff line change
Expand Up @@ -293,7 +293,7 @@ public bool SceneInteractable {
}


private Firebase.FirebaseApp app;
//private Firebase.FirebaseApp app;

/// <summary>
/// Determines whether the application is in correct state (scene or project editor) and
Expand Down Expand Up @@ -616,7 +616,7 @@ private void Start() {
SetDefaultFramerate();
#if (UNITY_ANDROID || UNITY_IOS) && !UNITY_EDITOR
ARSession.enabled = false;
Firebase.FirebaseApp.CheckAndFixDependenciesAsync().ContinueWith(task => {
/*Firebase.FirebaseApp.CheckAndFixDependenciesAsync().ContinueWith(task => {
var dependencyStatus = task.Result;
if (dependencyStatus == Firebase.DependencyStatus.Available) {
// Create and hold a reference to your FirebaseApp,
Expand All @@ -629,7 +629,7 @@ private void Start() {
"Could not resolve all Firebase dependencies: {0}", dependencyStatus));
// Firebase Unity SDK is not safe to use here.
}
});
});*/
#endif
VersionInfo.text = Application.version;
Scene.SetActive(false);
Expand Down
Loading

0 comments on commit ec4506d

Please sign in to comment.