Skip to content
Snippets Groups Projects
Commit 309190e0 authored by Schuh Martin's avatar Schuh Martin
Browse files

Merge branch 'DataBase' into 'development' 

Update: coreMaps.json (added final mapdata to Arena1)

See merge request !23
parents 19035aee 85ebe122
No related branches found
No related tags found
6 merge requests!74V1,!73Initial commit,!71Merge DataBase into Development,!27Player can now place bombs that have a explosion radius that dont go through the wall.,!24Player can now place bombs that have a explosion radius that dont go through the wall.,!23Update: coreMaps.json (added final mapdata to Arena1)
Hide whitespace changes
Inline Side-by-side
Showing
with 42 additions and 45 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