Merge branch 'develop' of... (52eca41e) · Commits · DR / IF3210-2024-Unity-BUG · GitLab

Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

I

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

DR
IF3210-2024-Unity-BUG
Commits
52eca41e

Commit 52eca41e authored 1 year ago by

Jason Rivalino

Downloads
- Plain Diff

Merge branch 'develop' of...

Merge branch 'develop' of https://gitlab.informatika.org/just_loud_stuff/if3210-2024-unity-bug into fix/shotgunEnemy

parents 81f0f39d 9844ad62

Changes 13

Expand all Hide whitespace changes

Inline Side-by-side

Showing

Assets/SaveGame/3/PData.dat 0 additions, 0 deletions

Assets/SaveGame/3/PData.dat
Assets/_CompletedAssets/Prefabs/HUDCanvas.prefab 26 additions, 16 deletions

Assets/_CompletedAssets/Prefabs/HUDCanvas.prefab
Assets/_CompletedAssets/Scenes/AfterMath-Quest.unity 13 additions, 0 deletions

Assets/_CompletedAssets/Scenes/AfterMath-Quest.unity
Assets/_CompletedAssets/Scenes/BeforeTheBoss.unity 13 additions, 0 deletions

Assets/_CompletedAssets/Scenes/BeforeTheBoss.unity
Assets/_CompletedAssets/Scenes/Ending.unity 10 additions, 0 deletions

Assets/_CompletedAssets/Scenes/Ending.unity
Assets/_CompletedAssets/Scenes/Level1.unity 120 additions, 127 deletions

Assets/_CompletedAssets/Scenes/Level1.unity
Assets/_CompletedAssets/Scenes/Level2.unity 35 additions, 0 deletions

Assets/_CompletedAssets/Scenes/Level2.unity
Assets/_CompletedAssets/Scenes/Level3.unity 10 additions, 0 deletions

Assets/_CompletedAssets/Scenes/Level3.unity
Assets/_CompletedAssets/Scenes/LevelBoss.unity 10 additions, 0 deletions

Assets/_CompletedAssets/Scenes/LevelBoss.unity
Assets/_CompletedAssets/Scenes/TalkingToTheKing.unity 13 additions, 0 deletions

Assets/_CompletedAssets/Scenes/TalkingToTheKing.unity
Assets/_CompletedAssets/Scenes/Town1.unity 34 additions, 9 deletions

Assets/_CompletedAssets/Scenes/Town1.unity
Assets/_CompletedAssets/Scenes/Town2.unity 551 additions, 541 deletions

Assets/_CompletedAssets/Scenes/Town2.unity
Assets/_CompletedAssets/Scenes/Town3.unity 407 additions, 397 deletions

Assets/_CompletedAssets/Scenes/Town3.unity

with 1242 additions and 1090 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