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

dea583dd

Commit dea583dd authored 2 years ago by Gard Aleksander Furre

Downloads
- Plain Diff

Merge branch 'gardaf' into 'main'

Gardaf

See merge request !87

parents fcff0f1e 32eb2753

No related branches found

No related tags found

1 merge request!87Gardaf

Changes 7

Hide whitespace changes

Inline Side-by-side

Showing

MrBigsock/Assets/Code/Character.cs 28 additions, 7 deletions

MrBigsock/Assets/Code/Character.cs
MrBigsock/Assets/Code/Core/Abilities/AbilityDodge.cs 1 addition, 1 deletion

MrBigsock/Assets/Code/Core/Abilities/AbilityDodge.cs
MrBigsock/Assets/Code/PlayerController.cs 4 additions, 0 deletions

MrBigsock/Assets/Code/PlayerController.cs
MrBigsock/Assets/Code/orc/Enemy_orc_range.cs 3 additions, 3 deletions

MrBigsock/Assets/Code/orc/Enemy_orc_range.cs
MrBigsock/Assets/Resources/Prefabs/Enemy_Slime.prefab 2 additions, 2 deletions

MrBigsock/Assets/Resources/Prefabs/Enemy_Slime.prefab
MrBigsock/Assets/Resources/Prefabs/enemy_orc_range.prefab 1 addition, 1 deletion

MrBigsock/Assets/Resources/Prefabs/enemy_orc_range.prefab
MrBigsock/Assets/Resources/Sprites/Enemy/Animations/slime/jumpingEnemy.anim 38 additions, 5 deletions

...esources/Sprites/Enemy/Animations/slime/jumpingEnemy.anim

with 77 additions and 19 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