Skip to main content

Primary navigation

Project

IF3210-2022-Unity-48
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Terraform modules
- Incidents

Snippets Groups Projects

Bryan Rinaldo
IF3210-2022-Unity-48
Commits
d723d2c8

Commit d723d2c8 authored Apr 10, 2022 by Christopher Justine

Downloads
- Plain Diff

Merge branch 'feature/upgrade-weapon' into 'main'

feat: game mode weapon upgrade

See merge request !9

parents 9b086cca 27e62718

Branches

No related tags found

1 merge request!9feat: game mode weapon upgrade

Changes 11

Show whitespace changes

Inline Side-by-side

Showing

Assets/Scenes/Wave.unity 149 additions, 110 deletions

Assets/Scenes/Wave.unity
Assets/Scenes/Zen.unity 192 additions, 123 deletions

Assets/Scenes/Zen.unity
Assets/Scripts/Managers/TimerController.cs 1 addition, 2 deletions

Assets/Scripts/Managers/TimerController.cs
Assets/Scripts/Managers/WeaponManagerWave.cs 53 additions, 0 deletions

Assets/Scripts/Managers/WeaponManagerWave.cs
Assets/Scripts/Managers/WeaponManagerWave.cs.meta 11 additions, 0 deletions

Assets/Scripts/Managers/WeaponManagerWave.cs.meta
Assets/Scripts/Managers/WeaponManagerZen.cs 59 additions, 0 deletions

Assets/Scripts/Managers/WeaponManagerZen.cs
Assets/Scripts/Managers/WeaponManagerZen.cs.meta 11 additions, 0 deletions

Assets/Scripts/Managers/WeaponManagerZen.cs.meta
Assets/Scripts/Player/PlayerShooting.cs 3 additions, 13 deletions

Assets/Scripts/Player/PlayerShooting.cs
Assets/Scripts/Spawner/EnemySpawnerWave.cs 9 additions, 3 deletions

Assets/Scripts/Spawner/EnemySpawnerWave.cs
ProjectSettings/TagManager.asset 2 additions, 0 deletions

ProjectSettings/TagManager.asset
UserSettings/EditorUserSettings.asset 2 additions, 2 deletions

UserSettings/EditorUserSettings.asset

with 492 additions and 253 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please sign in to comment