Skip to content
Snippets Groups Projects
Commit 2b52f253 authored by Robin Halseth Sandvik's avatar Robin Halseth Sandvik
Browse files

Merge branch 'main' into 'master' 

# Conflicts:
#   MrBigsock/Assets/Code/PlayerController.cs
#   MrBigsock/Assets/Code/orc/EnemyController.cs
#   MrBigsock/ProjectSettings/TagManager.asset
parents e7d05c47 a79a960d
No related branches found
No related tags found
1 merge request!12Made attacks damage the enemy.
Hide whitespace changes
Inline Side-by-side
Showing
with 811 additions and 10 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment