1
Fork 0
mirror of https://bitbucket.org/Ioncannon/project-meteor-server.git synced 2025-05-10 04:57:45 +00:00
project-meteor-server/FFXIVClassic Map Server/actors/chara/player
Filip Maj 1e4a1cf263 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
2019-05-04 20:13:29 -04:00
..
Equipment.cs Merge branch 'ai-open' into develop 2019-05-04 20:13:29 -04:00
Inventory.cs Merge branch 'ai-open' into develop 2019-05-04 20:13:29 -04:00
Player.cs Merge branch 'ai-open' into develop 2019-05-04 20:13:29 -04:00
PlayerWork.cs Added casting bar functions. 2017-08-26 12:33:37 -04:00