Merge branch 'feat/swordrigging' into 'staging' (00fc09dc) · 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
00fc09dc

Commit 00fc09dc authored 1 year ago by

Kelvin Rayhan

Downloads
- Plain Diff

Merge branch 'feat/swordrigging' into 'staging'

Feat/swordrigging

See merge request !44

parents 6f284f1e a86dcd91

Changes 7

Hide whitespace changes

Inline Side-by-side

Showing

Assets/Animation/SwordSwing.anim 5 additions, 343 deletions

Assets/Animation/SwordSwing.anim
Assets/Animation/sword point.controller 12 additions, 0 deletions

Assets/Animation/sword point.controller
Assets/Animation/sword point.controller.meta 8 additions, 0 deletions

Assets/Animation/sword point.controller.meta
Assets/Prefabs/Player/Player.prefab 102 additions, 4 deletions

Assets/Prefabs/Player/Player.prefab
Assets/Script/Weapon/GunSystem.cs 2 additions, 1 deletion

Assets/Script/Weapon/GunSystem.cs
Assets/Script/Weapon/Sword.cs 1 addition, 0 deletions

Assets/Script/Weapon/Sword.cs
Assets/Script/Weapon/WeaponManager.cs 2 additions, 2 deletions

Assets/Script/Weapon/WeaponManager.cs

with 132 additions and 350 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