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

c3df9608

Commit c3df9608 authored 2 years ago by Gard Aleksander Furre

Downloads
- Plain Diff

Merge branch 'gardaf' into 'main'

Gardaf

See merge request !83

parents e2cd6ffb fa9cf82f

No related branches found

No related tags found

1 merge request!83Gardaf

Changes 5

Hide whitespace changes

Inline Side-by-side

Showing

MrBigsock/Assets/Code/Slime/SlimeController.cs 7 additions, 7 deletions

MrBigsock/Assets/Code/Slime/SlimeController.cs
MrBigsock/Assets/Resources/Prefabs/Enemy_Slime.prefab 5 additions, 5 deletions

MrBigsock/Assets/Resources/Prefabs/Enemy_Slime.prefab
MrBigsock/Assets/Resources/Sprites/Enemy/Animations/slime/jumpingEnemy.anim 53 additions, 0 deletions

...esources/Sprites/Enemy/Animations/slime/jumpingEnemy.anim
MrBigsock/Assets/Resources/Sprites/Enemy/Animations/slime/jumpingEnemy.anim.meta 8 additions, 0 deletions

...ces/Sprites/Enemy/Animations/slime/jumpingEnemy.anim.meta
MrBigsock/Assets/Resources/Sprites/Enemy/Animations/small_demon/small_demon.controller 65 additions, 59 deletions

...rites/Enemy/Animations/small_demon/small_demon.controller

with 138 additions and 71 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