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 |
|