Skip to content
Snippets Groups Projects
Commit 8869eac3 authored by Marco Zimmer's avatar Marco Zimmer
Browse files

merge fix 1

parent adedc4b4
No related branches found
No related tags found
No related merge requests found
......@@ -163,12 +163,6 @@ public bool rename(string newLabel)
public abstract GameObject instantiateDisplay(GameObject prefab, Transform transform);
public static void Clear()
{
MaxLabelId = 0;
UnusedLabelIds.Clear();
}
public virtual void delete(bool keep_clean = true)
{
//TODO: MMT: delete over there
......
......@@ -9,15 +9,9 @@ public void LevelReset()
Loader.LoadStage(StageStatic.stage.name, !StageStatic.stage.use_install_folder, false);
}
<<<<<<< HEAD
Fact.Clear();
SceneManager.LoadSceneAsync(SceneManager.GetActiveScene().buildIndex);
=======
public void LoadMainMenue()
{
SceneManager.LoadScene("MainMenue");
>>>>>>> MaZiFAU
}
public void LoadStartScreen()
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment