Merge branch 'master' into 3.2

This commit is contained in:
Rémi Verschelde
2020-05-27 13:45:21 +02:00
36 changed files with 517 additions and 287 deletions

View File

@@ -592,6 +592,8 @@ variables, in that order.
::
signal spawn_player(position)
enum Jobs {KNIGHT, WIZARD, ROGUE, HEALER, SHAMAN}
const MAX_LIVES = 3