Merge branch 'feat/dev/game-over' into 'dev'
Feat/dev/game over See merge request !3
Showing
- Assets/Animation/PlayerAnimatorController.controller 80 additions, 60 deletionsAssets/Animation/PlayerAnimatorController.controller
- Assets/Scenes/Cutscene01.unity 3393 additions, 3369 deletionsAssets/Scenes/Cutscene01.unity
- Assets/Scenes/Level01.unity 1145 additions, 236 deletionsAssets/Scenes/Level01.unity
- Assets/Scenes/Level02.unity 5440 additions, 4511 deletionsAssets/Scenes/Level02.unity
- Assets/Scenes/Level03.unity 4626 additions, 3697 deletionsAssets/Scenes/Level03.unity
- Assets/Scenes/Level04.unity 5204 additions, 4275 deletionsAssets/Scenes/Level04.unity
- Assets/Scripts/Managers/GameOverManager.cs 30 additions, 20 deletionsAssets/Scripts/Managers/GameOverManager.cs
- Assets/Scripts/Managers/HUDCanvasManager.cs 2 additions, 2 deletionsAssets/Scripts/Managers/HUDCanvasManager.cs
- Assets/Scripts/Managers/MainMenuManager.cs 4 additions, 0 deletionsAssets/Scripts/Managers/MainMenuManager.cs
- Assets/Scripts/Managers/NewFile 0 additions, 0 deletionsAssets/Scripts/Managers/NewFile
- Assets/Scripts/Managers/NewFile.meta 7 additions, 0 deletionsAssets/Scripts/Managers/NewFile.meta
- Assets/Scripts/Managers/NextSceneManager.cs 0 additions, 3 deletionsAssets/Scripts/Managers/NextSceneManager.cs
- Assets/Scripts/Managers/PauseManager.cs 11 additions, 10 deletionsAssets/Scripts/Managers/PauseManager.cs
- Assets/Scripts/Player/PlayerHealth.cs 1 addition, 1 deletionAssets/Scripts/Player/PlayerHealth.cs
- Assets/Scripts/Player/PlayerShooting.cs 7 additions, 3 deletionsAssets/Scripts/Player/PlayerShooting.cs
- Assets/TextMesh Pro/Examples & Extras/Resources/Fonts & Materials/Roboto-Bold SDF.asset 57 additions, 30 deletions... Extras/Resources/Fonts & Materials/Roboto-Bold SDF.asset
Please register or sign in to comment