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

Merge branch 'development' into 'sound' 

# Conflicts:
#   src/main/java/de/hdm_stuttgart/battlearena/Controller/SettingsController.java
#   src/main/resources/player/appSettings.json
parents a93d8d14 3d20f669
No related branches found
No related tags found
5 merge requests!74V1,!73Initial commit,!71Merge DataBase into Development,!54Update: coreMaps.json (added new maps),!45Soundeffects finally ready :) 🔊 #22
Hide whitespace changes
Inline Side-by-side
Showing
with 44 additions and 55 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