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
..
actors	Merge branch 'inventory_refactor' into develop	2019-05-06 15:59:09 -04:00
dataobjects	Merge branch 'inventory_refactor' into develop	2019-05-06 15:59:09 -04:00
lua	Merge branch 'inventory_refactor' into develop	2019-05-06 15:59:09 -04:00
navmesh	moved vector3 to common	2017-06-29 19:14:03 +01:00
packets	Merge branch 'inventory_refactor' into develop	2019-05-06 15:59:09 -04:00
Properties	initial navmesh stuff	2017-06-29 18:45:39 +01:00
utils	Cleaned up some warnings.	2019-05-04 20:53:08 -04:00
App.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
CommandProcessor.cs	Merge branch 'inventory_refactor' into develop	2019-05-06 15:59:09 -04:00
ConfigConstants.cs	Cleanup the messy imports.	2019-05-06 13:39:24 -04:00
Database.cs	Merge branch 'inventory_refactor' into develop	2019-05-06 15:59:09 -04:00
FFXIVClassic Map Server.csproj	Merge branch 'inventory_refactor' into develop	2019-05-06 15:59:09 -04:00
inventorys_packets.txt	New debug packets.	2015-10-04 22:42:20 -04:00
NLog.config	Fixed NLog config for map server. Added some debug printouts while testing.	2016-08-29 09:03:48 -04:00
NLog.xsd	accidentally mass replaced "target", fixed now	2016-06-15 04:27:25 +01:00
packages.config	Fixed JSON lib being broken from downgrade.	2018-10-20 12:16:34 -04:00
PacketProcessor.cs	Merge branch 'inventory_refactor' into develop	2019-05-06 15:59:09 -04:00
Program.cs	Merge branch 'inventory_refactor' into develop	2019-05-06 15:59:09 -04:00
Server.cs	Merge branch 'inventory_refactor' into develop	2019-05-06 15:59:09 -04:00
SharpNav.dll	initial navmesh stuff	2017-06-29 18:45:39 +01:00
WorldManager.cs	Merge branch 'inventory_refactor' into develop	2019-05-06 15:59:09 -04:00