Merge branch 'staging' into 'main' (a537815f) · Commits · Ahmad Nadil / IF3210-2024-Unity-SGK · GitLab

Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

I

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

Ahmad Nadil
IF3210-2024-Unity-SGK
Commits
a537815f

Commit a537815f authored 1 year ago by

Bernardus Willson

Downloads
- Plain Diff

Merge branch 'staging' into 'main'

Staging

See merge request !79

parents dca09d4e 7bcc51b8

Branches

Tags v1.4.6

1 merge request!79Staging

Changes 10

Expand all Hide whitespace changes

Inline Side-by-side

Showing

Assets/Scenes/Ending/Ending.unity 175 additions, 10 deletions

Assets/Scenes/Ending/Ending.unity
Assets/Scenes/FinalStage.unity 382 additions, 312 deletions

Assets/Scenes/FinalStage.unity
Assets/Scenes/InitialStage.unity 1 addition, 1 deletion

Assets/Scenes/InitialStage.unity
Assets/Script/Bot/Enemy/Azathoth/Azathoth.cs 0 additions, 2 deletions

Assets/Script/Bot/Enemy/Azathoth/Azathoth.cs
Assets/Script/CutScene/CutScene1.cs 0 additions, 0 deletions

Assets/Script/CutScene/CutScene1.cs
Assets/Script/CutScene/CutScene1.cs.meta 0 additions, 0 deletions

Assets/Script/CutScene/CutScene1.cs.meta
Assets/Script/Menu/GameOver.cs 6 additions, 0 deletions

Assets/Script/Menu/GameOver.cs
Assets/Script/Stage/Stage.cs 1 addition, 1 deletion

Assets/Script/Stage/Stage.cs
Assets/Script/Stage/StageManager.cs 19 additions, 10 deletions

Assets/Script/Stage/StageManager.cs
Assets/Timeline/SkillActivateTimeline.playable 2 additions, 20 deletions

Assets/Timeline/SkillActivateTimeline.playable

with 586 additions and 356 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