Merge branch 'ai-open' into develop

# Conflicts:
#	FFXIVClassic Lobby Server/Database.cs
#	FFXIVClassic Map Server/Database.cs
#	FFXIVClassic Map Server/FFXIVClassic Map Server.csproj
#	FFXIVClassic Map Server/actors/chara/player/Inventory.cs
#	FFXIVClassic Map Server/actors/chara/player/Player.cs
#	FFXIVClassic Map Server/dataobjects/Session.cs
#	FFXIVClassic World Server/Server.cs
This commit is contained in:
Filip Maj 2019-05-04 20:13:29 -04:00
commit 1e4a1cf263
402 changed files with 20078 additions and 1348 deletions

View file

@ -8,6 +8,7 @@ Date: 9/9/2017 2:32:38 PM
*/
SET FOREIGN_KEY_CHECKS=0;
SET autocommit=0;
-- ----------------------------
-- Table structure for gamedata_actor_class
-- ----------------------------
@ -8007,3 +8008,5 @@ INSERT INTO `gamedata_actor_class` VALUES ('9220405', '', '2', '0', null);
INSERT INTO `gamedata_actor_class` VALUES ('9220406', '', '2', '0', null);
INSERT INTO `gamedata_actor_class` VALUES ('9220407', '', '2', '0', null);
INSERT INTO `gamedata_actor_class` VALUES ('9220408', '', '2', '0', null);
COMMIT;