freeso/TSOClient/FSO.Server.Database/DatabaseScripts
ddfczm ca63c3d520 Merge remote-tracking branch 'upstream/feature/server-rebuild' into feature/display-racks
Conflicts:
	TSOClient/FSO.Server.Database/DA/SqlDA.cs
	TSOClient/FSO.Server.Database/FSO.Server.Database.csproj
	TSOClient/tso.client/UI/Panels/UILiveMode.cs
	TSOClient/tso.client/packages.config
	TSOClient/tso.simantics/FSO.SimAntics.csproj
	TSOClient/tso.simantics/Marshals/VMMarshal.cs
	TSOClient/tso.simantics/NetPlay/Model/VMNetCommand.cs
	TSOClient/tso.simantics/entities/VMAvatar.cs
2016-11-29 14:43:59 +00:00
..
changes Merge remote-tracking branch 'upstream/feature/server-rebuild' into feature/display-racks 2016-11-29 14:43:59 +00:00
fso_auth_tickets.sql Auth controller implemented 2015-08-15 17:17:54 +01:00
fso_avatars.sql Updated existing database migrations to conform to latest schema 2016-11-11 16:36:38 +00:00
fso_db_changes.sql Auth controller implemented 2015-08-15 17:17:54 +01:00
fso_lots.sql Updated existing database migrations to conform to latest schema 2016-11-11 16:36:38 +00:00
fso_objects.sql Updated existing database migrations to conform to latest schema 2016-11-11 16:36:38 +00:00
fso_shards.sql Updated existing database migrations to conform to latest schema 2016-11-11 16:36:38 +00:00
fso_transactions.sql Added migrations for triggers. Also added better error reporting in the migration tool and fixed a column mismatch in the user schema. 2016-11-11 17:03:21 +00:00
fso_users.sql Added migrations for triggers. Also added better error reporting in the migration tool and fixed a column mismatch in the user schema. 2016-11-11 17:03:21 +00:00
manifest.json Merge remote-tracking branch 'upstream/feature/server-rebuild' into feature/display-racks 2016-11-29 14:43:59 +00:00