Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

M

Mr BigSock
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Terraform modules
- Incidents

Snippets Groups Projects

aff22e2b

Commit aff22e2b authored 2 years ago by Gard Aleksander Furre

Downloads
- Plain Diff

Merge branch 'gardaf' into 'main'

Gardaf

See merge request !61

parents 4563cb94 3c212fdd

No related branches found

No related tags found

2 merge requests!63Main,!61Gardaf

Changes 10

Hide whitespace changes

Inline Side-by-side

Showing

MrBigsock/Assets/Code/Character.cs 6 additions, 4 deletions

MrBigsock/Assets/Code/Character.cs
MrBigsock/Assets/Code/Core/Abilities/BasicProjectile1.cs 3 additions, 2 deletions

MrBigsock/Assets/Code/Core/Abilities/BasicProjectile1.cs
MrBigsock/Assets/Prefabs/Enemy_Slime.prefab 2 additions, 98 deletions

MrBigsock/Assets/Prefabs/Enemy_Slime.prefab
MrBigsock/Assets/Prefabs/backgroundMusic.prefab 130 additions, 0 deletions

MrBigsock/Assets/Prefabs/backgroundMusic.prefab
MrBigsock/Assets/Prefabs/backgroundMusic.prefab.meta 7 additions, 0 deletions

MrBigsock/Assets/Prefabs/backgroundMusic.prefab.meta
MrBigsock/Assets/Prefabs/enemy_orc_range.prefab 0 additions, 98 deletions

MrBigsock/Assets/Prefabs/enemy_orc_range.prefab
MrBigsock/Assets/Prefabs/enemy_orc_warrior.prefab 0 additions, 98 deletions

MrBigsock/Assets/Prefabs/enemy_orc_warrior.prefab
MrBigsock/Assets/Scenes/GenTilemap.unity 97 additions, 0 deletions

MrBigsock/Assets/Scenes/GenTilemap.unity
MrBigsock/Assets/sound/Eggy Toast - The Magician.mp3 0 additions, 0 deletions

MrBigsock/Assets/sound/Eggy Toast - The Magician.mp3
MrBigsock/Assets/sound/Eggy Toast - The Magician.mp3.meta 22 additions, 0 deletions

MrBigsock/Assets/sound/Eggy Toast - The Magician.mp3.meta

with 267 additions and 300 deletions

Loading

0% Loading 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