Merge remote-tracking branch 'origin/main' into save&load (a12eee82) · Commits · Fahrian Afdholi / IF3210-2024-Unity-BDM

Snippets Groups Projects

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.

Commit a12eee82 authored 11 months ago by

Zidane Firzatullah

Browse files

Merge remote-tracking branch 'origin/main' into save&load

# Conflicts:
#	Assets/Level04Controller.cs
#	Assets/LevelManager.cs
#	Assets/Scripts/PlayerR/PlayerManager.cs
#	Assets/Scripts/Scene/ShopSceneHelper.cs

parents 56d2e5a0 2b9b04b6

Branches

Admin message

Merge remote-tracking branch 'origin/main' into save&load