Skip to content
Snippets Groups Projects
Commit 28c3458c authored by Gehrung Jonas's avatar Gehrung Jonas
Browse files

Merge branch 'development' into 'sound' 

# Conflicts:
#   src/main/java/de/hdm_stuttgart/battlearena/Model/Entity/Player.java
parents 43f32da9 16f7e413
No related branches found
No related tags found
5 merge requests!74V1,!73Initial commit,!71Merge DataBase into Development,!54Update: coreMaps.json (added new maps),!43UPDATE: new SoundEffects for Bomb, Sword
Hide whitespace changes
Inline Side-by-side
Showing
with 313 additions and 188 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