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
..
battle	Merge branch 'inventory_refactor' into develop	2019-05-06 15:59:09 -04:00
events	Cleanup the messy imports.	2019-05-06 13:39:24 -04:00
inventory	Cleanup the messy imports.	2019-05-06 13:39:24 -04:00
_0x132Packet.cs	Merge branch 'inventory_refactor' into develop	2019-05-06 15:59:09 -04:00
_0xFPacket.cs	Started removing all target actor id references.	2017-06-27 13:23:05 -04:00
ActorDoEmotePacket.cs	Started removing all target actor id references.	2017-06-27 13:23:05 -04:00
ActorInstantiatePacket.cs	Started removing all target actor id references.	2017-06-27 13:23:05 -04:00
ActorSpecialGraphicPacket.cs	Started removing all target actor id references.	2017-06-27 13:23:05 -04:00
AddActorPacket.cs	Cleanup the messy imports.	2019-05-06 13:39:24 -04:00
DeleteAllActorsPacket.cs	Cleanup the messy imports.	2019-05-06 13:39:24 -04:00
MoveActorToPositionPacket.cs	Started removing all target actor id references.	2017-06-27 13:23:05 -04:00
PlayAnimationOnActorPacket.cs	Cleanup the messy imports.	2019-05-06 13:39:24 -04:00
PlayBGAnimation.cs	Cleanup the messy imports.	2019-05-06 13:39:24 -04:00
RemoveActorPacket.cs	Started removing all target actor id references.	2017-06-27 13:23:05 -04:00
SetActorAppearancePacket.cs	Started removing all target actor id references.	2017-06-27 13:23:05 -04:00
SetActorBGPropertiesPacket.cs	Removed duplicate 0xD9 packet. Renamed 0xD8 to SetActorBGPropertiesPacket.	2017-06-27 17:37:13 -04:00
SetActorIconPacket.cs	Started removing all target actor id references.	2017-06-27 13:23:05 -04:00
SetActorIsZoningPacket.cs	Started removing all target actor id references.	2017-06-27 13:23:05 -04:00
SetActorNamePacket.cs	Started removing all target actor id references.	2017-06-27 13:23:05 -04:00
SetActorPositionPacket.cs	Started removing all target actor id references.	2017-06-27 13:23:05 -04:00
SetActorPropetyPacket.cs	Cleanup the messy imports.	2019-05-06 13:39:24 -04:00
SetActorSpeedPacket.cs	Started removing all target actor id references.	2017-06-27 13:23:05 -04:00
SetActorStatePacket.cs	Cleanup the messy imports.	2019-05-06 13:39:24 -04:00
SetActorStatusAllPacket.cs	Cleanup the messy imports.	2019-05-06 13:39:24 -04:00
SetActorStatusPacket.cs	Cleanup the messy imports.	2019-05-06 13:39:24 -04:00
SetActorSubStatePacket.cs	Added substate modifications to characters.	2018-10-20 13:02:14 -04:00
SetActorTargetAnimatedPacket.cs	Started removing all target actor id references.	2017-06-27 13:23:05 -04:00
SetActorTargetPacket.cs	Started removing all target actor id references.	2017-06-27 13:23:05 -04:00
StartCountdownPacket.cs	Implemented countdowns.	2017-10-01 12:39:46 -04:00