Skip to content
Snippets Groups Projects
Commit 7c2a8b5e authored by Frederik Alexander Keens's avatar Frederik Alexander Keens
Browse files

Merge branch 'main' into 'implement-effect-on-death'

# Conflicts:
#   src/game/combat/CombatEngine.cpp
parents a22343b9 de5f358c
Branches
No related tags found
1 merge request!59Implement Explosion on unit death
Showing
with 796 additions and 468 deletions
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment