fix: conflict (7aab1f2d) · Commits · Rasyid Rasyid / IF3210-2024-Unity-BBC · GitLab

Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

I

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

Rasyid Rasyid
IF3210-2024-Unity-BBC
Commits
7aab1f2d

Commit 7aab1f2d authored 1 year ago by

mrsyaban

Downloads
- Plain Diff

fix: conflict

parents 1f533827 0949ad36

Changes 13

Hide whitespace changes

Inline Side-by-side

Showing

Assets/ImportPackage/DavePixel/PirateCoin/Prefabs/PirateCoin.prefab.meta 1 addition, 1 deletion

...ckage/DavePixel/PirateCoin/Prefabs/PirateCoin.prefab.meta
Assets/Prefabs/Enemy/Jendral.prefab 1 addition, 0 deletions

Assets/Prefabs/Enemy/Jendral.prefab
Assets/Prefabs/Enemy/KepalaKroco.prefab 2 additions, 2 deletions

Assets/Prefabs/Enemy/KepalaKroco.prefab
Assets/Prefabs/Enemy/Kroco.prefab 1 addition, 0 deletions

Assets/Prefabs/Enemy/Kroco.prefab
Assets/Prefabs/Particle/PirateCoin.prefab 337 additions, 0 deletions

Assets/Prefabs/Particle/PirateCoin.prefab
Assets/Prefabs/Particle/PirateCoin.prefab.meta 1 addition, 1 deletion

Assets/Prefabs/Particle/PirateCoin.prefab.meta
Assets/Prefabs/PirateCoin Variant.prefab 0 additions, 185 deletions

Assets/Prefabs/PirateCoin Variant.prefab
Assets/Scenes/GameMenuScene.unity 1 addition, 1 deletion

Assets/Scenes/GameMenuScene.unity
Assets/Scenes/Level02.unity 16 additions, 96 deletions

Assets/Scenes/Level02.unity
Assets/Scenes/Level03.unity 12 additions, 1 deletion

Assets/Scenes/Level03.unity
Assets/Scenes/Level04.unity 15 additions, 0 deletions

Assets/Scenes/Level04.unity
Assets/Scripts/Coin.cs 2 additions, 4 deletions

Assets/Scripts/Coin.cs
Assets/Scripts/Global/StatisticsManager.cs 9 additions, 3 deletions

Assets/Scripts/Global/StatisticsManager.cs

with 398 additions and 294 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