Merge branch 'master' into malik/fix/timer (d32a119e) · 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
d32a119e

Commit d32a119e authored 2 years ago by

Malik Rafsanjani

Downloads
- Plain Diff

Merge branch 'master' into malik/fix/timer

parents e1c4d40d 54b691ee

Branches malik/fix/timer

Tags

No related merge requests found

Changes 5

Expand all Hide whitespace changes

Inline Side-by-side

Showing

Assets/Scenes/MainMenu.unity 1897 additions, 328 deletions

Assets/Scenes/MainMenu.unity
Assets/Scripts/Managers/GlobalManager.cs 9 additions, 0 deletions

Assets/Scripts/Managers/GlobalManager.cs
Assets/Scripts/Managers/MainMenuManager.cs 4 additions, 4 deletions

Assets/Scripts/Managers/MainMenuManager.cs
Assets/Scripts/Managers/SettingManager.cs 50 additions, 0 deletions

Assets/Scripts/Managers/SettingManager.cs
Assets/Scripts/Managers/SettingManager.cs.meta 11 additions, 0 deletions

Assets/Scripts/Managers/SettingManager.cs.meta

with 1971 additions and 332 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