Merge branch 'ai-open' into develop

Browse Source

# 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

parent f361ee61cd 080f9ea23d

commit 1e4a1cf263

402 changed files with 20078 additions and 1348 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

931

FFXIVClassic Map Server/actors/chara/player/Player.cs

File diff suppressed because it is too large Load Diff