Skip to content

Fixed Issue #192 #193

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 10 commits into from
Jan 25, 2017
Merged

Fixed Issue #192 #193

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
5dcb1aa
Fixed Issue #192
ereneld Jan 19, 2017
6e86d9a
Merge branch 'develop' into fix-192-sceneManagerWarning
mediumTaj Jan 20, 2017
6d884d2
Merge branch 'develop' into fix-192-sceneManagerWarning
mediumTaj Jan 23, 2017
90b2aec
Merge branch 'develop' into fix-192-sceneManagerWarning
mediumTaj Jan 24, 2017
17c84f8
encrypt config
mediumTaj Jan 24, 2017
770031f
merge in develop
mediumTaj Jan 24, 2017
35745bc
encrypt config
mediumTaj Jan 24, 2017
ab5bbac
encrypt config
mediumTaj Jan 25, 2017
163b857
merge in develop
mediumTaj Jan 25, 2017
8e9eabe
encrypt credentials
mediumTaj Jan 25, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file modified Config.json.enc
View file
Open in desktop
Binary file not shown.
15 changes: 13 additions & 2 deletions Scenes/UnitTests/Scripts/MainUI.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,16 @@ private static void UpdateNames(UnityEditor.MenuCommand command)
}
#endif

private void OnEnable()
{
SceneManager.sceneLoaded += SceneManager_sceneLoaded;
}

private void OnDisable()
{
SceneManager.sceneLoaded -= SceneManager_sceneLoaded;
}

private IEnumerator Start()
{
if (m_BackgroundUI == null)
Expand Down Expand Up @@ -141,11 +151,12 @@ private IEnumerator Start()

// create the buttons..
UpdateButtons();

}

private void OnLevelWasLoaded(int level)
void SceneManager_sceneLoaded (Scene arg0, LoadSceneMode arg1)
{
UpdateButtons();
UpdateButtons();
}

private void UpdateButtons()
Expand Down