Skip to content
Snippets Groups Projects
Commit 19c54a2a authored by Robin Ruud Kristensen's avatar Robin Ruud Kristensen
Browse files

Merge branch 'main' into 'ruud' 

# Conflicts:
#   MrBigsock/Assets/Prefabs/attack.prefab
#   MrBigsock/ProjectSettings/Physics2DSettings.asset
#   MrBigsock/ProjectSettings/TagManager.asset
parents 8bb217ab e6058de3
No related branches found
No related tags found
2 merge requests!21Updating master to have the new stuff from main.,!11Ruud
Hide whitespace changes
Inline Side-by-side
Showing
with 694 additions and 89 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