Merge branch 'master' into averrous/feat/gameover (4270e771) · Commits · Malik Rafsanjani / IF3210-2023-Unity-JTD · GitLab

Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

I

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

Malik Rafsanjani
IF3210-2023-Unity-JTD
Commits
4270e771

Commit 4270e771 authored 2 years ago by

averrous

Downloads
- Plain Diff

Merge branch 'master' into averrous/feat/gameover

parents b76ba48d 61369775

1 merge request!19Averrous/feat/gameover

Changes 11

Hide whitespace changes

Inline Side-by-side

Showing

Assets/Scenes/Quest.unity 162 additions, 292 deletions

Assets/Scenes/Quest.unity
Assets/Scripts/Enemy/EnemyAttack.cs 4 additions, 1 deletion

Assets/Scripts/Enemy/EnemyAttack.cs
Assets/Scripts/Managers/DialogueManager.cs 1 addition, 1 deletion

Assets/Scripts/Managers/DialogueManager.cs
Assets/Scripts/Managers/TimerManager.cs 2 additions, 2 deletions

Assets/Scripts/Managers/TimerManager.cs
Assets/Scripts/Managers/ToastManager.cs 2 additions, 2 deletions

Assets/Scripts/Managers/ToastManager.cs
Assets/Scripts/Player/PlayerWeapons.cs 1 addition, 1 deletion

Assets/Scripts/Player/PlayerWeapons.cs
Assets/Scripts/Quest/Temple/Temple.cs 6 additions, 7 deletions

Assets/Scripts/Quest/Temple/Temple.cs
Assets/Scripts/SaveLoad/SavePlace.cs 1 addition, 1 deletion

Assets/Scripts/SaveLoad/SavePlace.cs
Assets/Scripts/Shops/ItemShopDatabase.cs 1 addition, 1 deletion

Assets/Scripts/Shops/ItemShopDatabase.cs
Assets/Scripts/Shops/ItemShopUI.cs 28 additions, 4 deletions

Assets/Scripts/Shops/ItemShopUI.cs
Assets/Scripts/States/GlobalStateManager.cs 2 additions, 2 deletions

Assets/Scripts/States/GlobalStateManager.cs

with 210 additions and 314 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