Revert "Auto stash before merge of "main" and "origin/main""

This reverts commit b67f90fb29.
main
thoopchuk26 4 years ago committed by Ivy
parent b67f90fb29
commit 1ac5a21503

@ -192,6 +192,8 @@ public class GameManager : MonoBehaviour
powerUps.SetActive(true);
pauseButton.SetActive(true);
disableAllPowerups();
artActivated = new bool[artActivated.Length]; //Resets to [false,...]
player.SetActive(true);
LoadLevel(sceneToLoad, positionToLoad);
title.GetComponent<TextMeshProUGUI>().text = "Paused";
@ -284,7 +286,7 @@ public class GameManager : MonoBehaviour
healthbar.SetActive(true);
powerUps.SetActive(true);
artImage.SetActive(false);
dialogBox.SetActive(false);
dialogBox.SetActive(false);
Time.timeScale = 1;
}
}
@ -316,8 +318,7 @@ public class GameManager : MonoBehaviour
healthbar.SetActive(false);
powerUps.SetActive(false);
HideDialog();
Time.timeScale = 0;
}

Loading…
Cancel
Save