Merge brnach solve conflict
Showing
- Assets/Scenes/Main.unity 555 additions, 5 deletionsAssets/Scenes/Main.unity
- Assets/Scripts/Enemy/EnemyHealth.cs 30 additions, 2 deletionsAssets/Scripts/Enemy/EnemyHealth.cs
- Assets/Scripts/Managers/CheatManager.cs 148 additions, 0 deletionsAssets/Scripts/Managers/CheatManager.cs
- Assets/Scripts/Managers/CheatManager.cs.meta 11 additions, 0 deletionsAssets/Scripts/Managers/CheatManager.cs.meta
- Assets/Scripts/Managers/HUDisplay.cs 51 additions, 0 deletionsAssets/Scripts/Managers/HUDisplay.cs
- Assets/Scripts/Managers/HUDisplay.cs.meta 11 additions, 0 deletionsAssets/Scripts/Managers/HUDisplay.cs.meta
- Assets/Scripts/Player/PlayerHealth.cs 10 additions, 2 deletionsAssets/Scripts/Player/PlayerHealth.cs
- Assets/Scripts/Player/PlayerMovement.cs 19 additions, 0 deletionsAssets/Scripts/Player/PlayerMovement.cs
- Assets/Scripts/States/GlobalStateManager.cs 40 additions, 0 deletionsAssets/Scripts/States/GlobalStateManager.cs
- Assets/Scripts/States/GlobalStateManager.cs.meta 11 additions, 0 deletionsAssets/Scripts/States/GlobalStateManager.cs.meta
- Assets/Scripts/States/SaveState.cs 37 additions, 0 deletionsAssets/Scripts/States/SaveState.cs
- Assets/Scripts/States/SaveState.cs.meta 11 additions, 0 deletionsAssets/Scripts/States/SaveState.cs.meta
- Packages/manifest.json 1 addition, 0 deletionsPackages/manifest.json
- Packages/packages-lock.json 7 additions, 0 deletionsPackages/packages-lock.json
Please register or sign in to comment