HUD
This commit is contained in:
parent
e67d56d6bf
commit
2e4a17edfa
1 changed files with 1 additions and 5 deletions
|
@ -14,13 +14,9 @@ using DangerousD.GameCore.Managers;
|
||||||
namespace DangerousD.GameCore
|
namespace DangerousD.GameCore
|
||||||
{
|
{
|
||||||
public enum MultiPlayerStatus { SinglePlayer, Host, Client }
|
public enum MultiPlayerStatus { SinglePlayer, Host, Client }
|
||||||
<<<<<<< HEAD
|
public enum GameState { Menu, Options, Lobby, Game, Login, Death, HUD,
|
||||||
public enum GameState { Menu, Options, Lobby, Game, Login, Death, HUD }
|
|
||||||
=======
|
|
||||||
public enum GameState { Menu, Options, Lobby, Game, Login, Death,
|
|
||||||
GameOver
|
GameOver
|
||||||
}
|
}
|
||||||
>>>>>>> e6d0f2b8a092647a5c02741fd70194bfb376b202
|
|
||||||
public class AppManager : Game
|
public class AppManager : Game
|
||||||
{
|
{
|
||||||
public static AppManager Instance { get; private set; }
|
public static AppManager Instance { get; private set; }
|
||||||
|
|
Loading…
Add table
Reference in a new issue