Merge branch 'master' into singularity

2013-08-31 15:32:10 +04:00
parent 728c9bb046 137f0c8d3c
commit 8014c8d0a5
5 changed files with 100 additions and 42 deletions
--- a/eos/db/saveddata/character.py
+++ b/eos/db/saveddata/character.py
@@ -30,6 +30,8 @@ characters_table = Table("characters", saveddata_meta,
                         Column("name", String, nullable = False),
                         Column("apiID", Integer),
                         Column("apiKey", String),
+                         Column("defaultChar", Integer),
+                         Column("chars", String, nullable = True),
                         Column("defaultLevel", Integer, nullable=True),
                         Column("ownerID", ForeignKey("users.ID"), nullable = True))