Filip Maj bcb609e4f6 Merge branch 'inventory_refactor' into develop ... # Conflicts: # FFXIVClassic Map Server/Database.cs # FFXIVClassic Map Server/FFXIVClassic Map Server.csproj # FFXIVClassic Map Server/WorldManager.cs # FFXIVClassic Map Server/actors/area/Area.cs # FFXIVClassic Map Server/actors/area/Zone.cs # FFXIVClassic Map Server/actors/chara/Character.cs # FFXIVClassic Map Server/actors/chara/npc/Npc.cs # FFXIVClassic Map Server/actors/chara/player/Inventory.cs # FFXIVClassic Map Server/actors/chara/player/Player.cs # FFXIVClassic Map Server/dataobjects/ZoneConnection.cs # FFXIVClassic Map Server/lua/LuaEngine.cs # FFXIVClassic Map Server/packets/send/Actor/AddActorPacket.cs # FFXIVClassic Map Server/packets/send/Actor/DeleteAllActorsPacket.cs # FFXIVClassic Map Server/packets/send/Actor/SetActorPropetyPacket.cs # FFXIVClassic Map Server/packets/send/Actor/SetActorStatePacket.cs # FFXIVClassic Map Server/packets/send/Actor/SetActorStatusAllPacket.cs # FFXIVClassic Map Server/packets/send/Actor/SetActorStatusPacket.cs # FFXIVClassic Map Server/packets/send/Actor/_0x132Packet.cs # FFXIVClassic Map Server/packets/send/Actor/battle/BattleAction.cs # FFXIVClassic Map Server/packets/send/Actor/battle/BattleActionX10Packet.cs # FFXIVClassic Map Server/packets/send/Actor/battle/BattleActionX18Packet.cs # FFXIVClassic Map Server/packets/send/Actor/battle/CommandResultX00Packet.cs # FFXIVClassic Map Server/packets/send/Actor/events/SetEmoteEventCondition.cs # FFXIVClassic Map Server/packets/send/Actor/inventory/InventoryRemoveX08Packet.cs # data/scripts/commands/gm/giveitem.lua		2019-05-06 15:59:09 -04:00
..
Actor/Group/Work	Cleanup the messy imports.	2019-05-06 13:39:24 -04:00
DataObjects	Merge branch 'inventory_refactor' into develop	2019-05-06 15:59:09 -04:00
Packets	Cleanup the messy imports.	2019-05-06 13:39:24 -04:00
Properties	Cleanup the messy imports.	2019-05-06 13:39:24 -04:00
App.config	Merge branch 'ai-open' of https://bitbucket.org/skeletonhorn/ffxiv-classic-server-ai-fork into ai	2017-12-10 15:07:28 +00:00
ConfigConstants.cs	added db launch args and improved import time on gamedata_actor_class.sql	2017-03-25 04:36:19 +00:00
Database.cs	Got linkshell creation working.	2018-04-10 01:07:11 -04:00
FFXIVClassic World Server.csproj	Merge branch 'inventory_refactor' into develop	2019-05-06 15:59:09 -04:00
LinkshellManager.cs	Cleanup the messy imports.	2019-05-06 13:39:24 -04:00
NLog.config	More work on the world server. Modified map server to communicate with it.	2016-08-29 08:17:14 -04:00
NLog.xsd	Changed folder from Proxy to World. Did some nlog configing.	2016-08-28 14:25:37 -04:00
packages.config	Fixed JSON lib being broken from downgrade.	2018-10-20 12:16:34 -04:00
PacketProcessor.cs	Cleanup the messy imports.	2019-05-06 13:39:24 -04:00
PartyManager.cs	Party leave/disband done.	2016-12-22 14:47:24 -05:00
Program.cs	Cleanup the messy imports.	2019-05-06 13:39:24 -04:00
RelationGroupManager.cs	Linkshell inviting completed.	2017-01-08 21:42:43 -05:00
RetainerGroupManager.cs	Cleanup the messy imports.	2019-05-06 13:39:24 -04:00
Server.cs	Merge branch 'inventory_refactor' into develop	2019-05-06 15:59:09 -04:00
WorldMaster.cs	Cleanup the messy imports.	2019-05-06 13:39:24 -04:00