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
..
dataobjects	Merge branch 'ai-open' into develop	2019-05-04 20:13:29 -04:00
packets	Fixed the retainer database error. Loading code now matches the new retainer db schema.	2017-09-03 16:37:05 -04:00
Properties	servers now log (almost) everything to file	2016-06-09 19:48:06 +01:00
utils	servers now log (almost) everything to file	2016-06-09 19:48:06 +01: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
ClientConnection.cs	Cleaned up some warnings.	2019-05-04 20:53:08 -04: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	Merge branch 'inventory_refactor' into develop	2019-05-06 15:59:09 -04:00
FFXIVClassic Lobby Server.csproj	Cleaned up unused nuget packages. Downgraded JSON lib as the latest one has dependencies. Cleaned up some DB code using dapper (since it's deleted).	2018-10-08 15:31:41 -04:00
NLog.config	Changed folder from Proxy to World. Did some nlog configing.	2016-08-28 14:25:37 -04:00
NLog.xsd	accidentally mass replaced "target", fixed now	2016-06-15 04:27:25 +01:00
packages.config	Cleaned up unused nuget packages. Downgraded JSON lib as the latest one has dependencies. Cleaned up some DB code using dapper (since it's deleted).	2018-10-08 15:31:41 -04:00
PacketProcessor.cs	Updated lobby code for new Subpacket type.	2017-06-29 11:38:28 -04:00
Program.cs	Cleanup the messy imports.	2019-05-06 13:39:24 -04:00
Server.cs	Cleanup the messy imports.	2019-05-06 13:39:24 -04:00