Merge branch 'dev'

# Conflicts: # assets/scene/Login.fire # assets/scripts/Player.js
matchvs · Sep 28, 2018 · c111898 · c111898
2 parents bbb1b0f + 36c9123
commit c111898
Show file tree

Hide file tree

Showing 91 changed files with 30,836 additions and 34,631 deletions.
diff --git a/assets/lobby.fire b/assets/lobby.fire
diff --git a/assets/login.fire.meta b/assets/login.fire.meta
diff --git a/assets/match.fire.meta b/assets/match.fire.meta
diff --git a/assets/mikado_outline_shadow.fnt b/assets/mikado_outline_shadow.fnt
diff --git a/assets/mikado_outline_shadow.fnt.meta b/assets/mikado_outline_shadow.fnt.meta
diff --git a/assets/mikado_outline_shadow.png b/assets/mikado_outline_shadow.png
diff --git a/assets/mikado_outline_shadow.png.meta b/assets/mikado_outline_shadow.png.meta