diff --git a/Assets/Scripts/SceneSwitcher.cs b/Assets/Scripts/SceneSwitcher.cs index a6e49ce..0b1dd43 100644 --- a/Assets/Scripts/SceneSwitcher.cs +++ b/Assets/Scripts/SceneSwitcher.cs @@ -7,22 +7,9 @@ public void GotoMainScene() { SceneManager.LoadScene("Level1"); } - public void GotoMenuScene() { - SceneManager.LoadScene("MainMenu"); - } - public void GoToInst() - { - SceneManager.LoadScene("Instructions"); - } - public void GotoCredits() - { - SceneManager.LoadScene("Credits"); - } - public void GotoStory() - { - SceneManager.LoadScene("Story"); + SceneManager.LoadScene("MainMenuRedux"); } public void doExitGame() { @@ -39,20 +26,5 @@ public bool IsOpen return isOpen; } } - void Start() - { - - } - // Update is called once per frame - void Update() - { - if (AwaitingConfirmation && Input.GetButton("PayRespects")) - { - AwaitingConfirmation = false; - }; - if (AwaitingConfirmation == false) - { - SceneManager.LoadScene("MainMenu"); - }; - } -} \ No newline at end of file +} + \ No newline at end of file diff --git a/ProjectSettings/InputManager.asset b/ProjectSettings/InputManager.asset index 2c0484b..772d315 100644 --- a/ProjectSettings/InputManager.asset +++ b/ProjectSettings/InputManager.asset @@ -90,7 +90,7 @@ InputManager: descriptiveName: descriptiveNegativeName: negativeButton: - positiveButton: + positiveButton: enter altNegativeButton: altPositiveButton: gravity: Infinity @@ -106,7 +106,7 @@ InputManager: descriptiveName: descriptiveNegativeName: negativeButton: - positiveButton: + positiveButton: escape altNegativeButton: altPositiveButton: gravity: Infinity diff --git a/RawArt/store.psd b/RawArt/store.psd new file mode 100644 index 0000000..3fcdcbe --- /dev/null +++ b/RawArt/store.psd @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1a69791dcf0b62d1843c3414dfd3e13fdf2a8d7af7a8f48d119d0c18990156e2 +size 347318