fix: conflict (7325b052) · Commits · Muhammad Fahmi Irfan / IF3210-2023-Unity-MDT · GitLab

Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

I

IF3210-2023-Unity-MDT
- 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.

Muhammad Fahmi Irfan
IF3210-2023-Unity-MDT
Commits
7325b052

Verified Commit 7325b052 authored 2 years ago by

Bayu Samudra

Downloads
- Plain Diff

fix: conflict

parents 96255bad 3d1a3b34

Changes 7

Hide whitespace changes

Inline Side-by-side

Showing

Assets/Prefabs/Player/Player.prefab 448 additions, 1 deletion

Assets/Prefabs/Player/Player.prefab
Assets/Scripts/Cheat/DebugController.cs 29 additions, 14 deletions

Assets/Scripts/Cheat/DebugController.cs
Assets/Scripts/Enemy/EnemyAttack.cs 6 additions, 12 deletions

Assets/Scripts/Enemy/EnemyAttack.cs
Assets/Scripts/Managers/MainManager.cs 0 additions, 1 deletion

Assets/Scripts/Managers/MainManager.cs
Assets/Scripts/Pets/PetHealth.cs 23 additions, 4 deletions

Assets/Scripts/Pets/PetHealth.cs
Assets/Scripts/Player/PlayerMovement.cs 1 addition, 1 deletion

Assets/Scripts/Player/PlayerMovement.cs
Assets/Scripts/Player/PlayerShooting.cs 2 additions, 2 deletions

Assets/Scripts/Player/PlayerShooting.cs

with 509 additions and 35 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