Merge branch 'feature/upgrade-weapon' into 'main' (d723d2c8) · Commits · Bryan Rinaldo / IF3210-2022-Unity-48 · GitLab

Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

I

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

Snippets Groups Projects

Admin message

GitLab now enforces expiry dates on tokens that originally had no set expiration date. Those tokens were given an expiration date of one year later. Please review your personal access tokens, project access tokens, and group access tokens to ensure you are aware of upcoming expirations. Administrators of GitLab can find more information on how to identify and mitigate interruption in our documentation.

Bryan Rinaldo
IF3210-2022-Unity-48
Commits
d723d2c8

Commit d723d2c8 authored 3 years ago 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

Changes 11

Hide 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

0% or .

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

Finish editing this message first!

Please register or sign in to comment