Merge branch 'fix/damage-powerup' into 'staging' (00673739) · Commits · Ahmad Nadil / IF3210-2024-Unity-SGK · GitLab

Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

I

IF3210-2024-Unity-SGK
- 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.

Ahmad Nadil
IF3210-2024-Unity-SGK
Commits
00673739

Commit 00673739 authored 1 year ago by

Ahmad Nadil

Downloads
- Plain Diff

Merge branch 'fix/damage-powerup' into 'staging'

fix: damage powerups

See merge request !49

parents e7aa0b82 8c352ed5

Changes 7

Hide whitespace changes

Inline Side-by-side

Showing

Assets/Resources/Prefabs/Orb/SpeedOrb.prefab 3 additions, 3 deletions

Assets/Resources/Prefabs/Orb/SpeedOrb.prefab
Assets/Scenes/FinalStage.unity 25 additions, 0 deletions

Assets/Scenes/FinalStage.unity
Assets/Script/Bot/Enemy/Enemy.cs 1 addition, 1 deletion

Assets/Script/Bot/Enemy/Enemy.cs
Assets/Script/Player/CheatManager.cs 3 additions, 11 deletions

Assets/Script/Player/CheatManager.cs
Assets/Script/Player/PlayerHealth.cs 1 addition, 0 deletions

Assets/Script/Player/PlayerHealth.cs
Assets/Script/Player/PlayerPowerUp.cs 2 additions, 15 deletions

Assets/Script/Player/PlayerPowerUp.cs
Assets/Script/Weapon/GunSystem.cs 5 additions, 1 deletion

Assets/Script/Weapon/GunSystem.cs

with 40 additions and 31 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