Merge branch 'dev' of... (f04aea8b) · Commits · IF3210-2024-02-04 / IF3210-2024-Unity-SON · GitLab

Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

I

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

IF3210-2024-02-04
IF3210-2024-Unity-SON
Commits
f04aea8b

Commit f04aea8b authored 1 year ago by

maggiezetaa

Downloads
- Plain Diff

Merge branch 'dev' of...

Merge branch 'dev' of https://gitlab.informatika.org/if3210-2024-02-04/if3210-2024-unity-son into feat/dev/game-over

parents 774c2f0d 08137840

Branches

Tags

1 merge request!3Feat/dev/game over

Changes 14

Hide whitespace changes

Inline Side-by-side

Showing

.vscode/extensions.json 5 additions, 0 deletions

.vscode/extensions.json
.vscode/launch.json 10 additions, 0 deletions

.vscode/launch.json
.vscode/settings.json 55 additions, 0 deletions

.vscode/settings.json
Assets/FollowPlayer.cs 21 additions, 0 deletions

Assets/FollowPlayer.cs
Assets/FollowPlayer.cs.meta 11 additions, 0 deletions

Assets/FollowPlayer.cs.meta
Assets/Models/Pet.meta 8 additions, 0 deletions

Assets/Models/Pet.meta
Assets/Models/Pet/Cinnamoroll_low.fbx 0 additions, 0 deletions

Assets/Models/Pet/Cinnamoroll_low.fbx
Assets/Models/Pet/Cinnamoroll_low.fbx.meta 109 additions, 0 deletions

Assets/Models/Pet/Cinnamoroll_low.fbx.meta
Assets/Models/Pet/Starmie.fbx 0 additions, 0 deletions

Assets/Models/Pet/Starmie.fbx
Assets/Models/Pet/Starmie.fbx.meta 109 additions, 0 deletions

Assets/Models/Pet/Starmie.fbx.meta
Assets/Scenes/Cutscene01/Timeline.prefab 51 additions, 0 deletions

Assets/Scenes/Cutscene01/Timeline.prefab
Assets/Scenes/Cutscene01/Timeline.prefab.meta 7 additions, 0 deletions

Assets/Scenes/Cutscene01/Timeline.prefab.meta
Assets/Scenes/Level01.unity 166 additions, 56 deletions

Assets/Scenes/Level01.unity
Assets/Scripts/Pet.meta 8 additions, 0 deletions

Assets/Scripts/Pet.meta

with 560 additions and 56 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