Merge branch 'develop' into 'feature/atm-system'

# Conflicts:
#   ReallifeGamemode.Server/Migrations/DatabaseContextModelSnapshot.cs
This commit is contained in:
VegaZ
2019-04-02 18:50:17 +02:00
parent bed35f8f08
commit 63838e133a
20 changed files with 1226 additions and 42 deletions

View File

@@ -36,6 +36,7 @@ namespace ReallifeGamemode.Server.Entities
public AdminLevel AdminLevel { get; set; }
public bool Dead { get; set; }
public int Handmoney { get; set; }
public float PositionX { get; set; }
public float PositionY { get; set; }