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	Merge branch 'inventory_refactor' into develop	2019-05-06 15:59:09 -04:00
events	Implemented mode trade methods. Figured out the modifiers portion of the item packet and rewrote how they are stored.	2017-10-08 12:26:22 -04:00
groups	Merge branch 'inventory_refactor' into develop	2019-05-06 15:59:09 -04:00
login	Cleaned up the code and fixed a bunch of bugs. Map server will no longer worry about base packets.	2017-06-27 21:08:30 -04:00
player	Cleanup the messy imports.	2019-05-06 13:39:24 -04:00
recruitment	Finished refactoring Map Server. Clear of syntax errors.	2017-06-27 16:55:14 -04:00
search	Merge branch 'inventory_refactor' into develop	2019-05-06 15:59:09 -04:00
social	Started removing all target actor id references.	2017-06-27 13:23:05 -04:00
supportdesk	Cleanup the messy imports.	2019-05-06 13:39:24 -04:00
_0x02Packet.cs	Finished refactoring Map Server. Clear of syntax errors.	2017-06-27 16:55:14 -04:00
_0xE2Packet.cs	Finished refactoring Map Server. Clear of syntax errors.	2017-06-27 16:55:14 -04:00
GameMessagePacket.cs	More subpacket cleanup.	2017-06-27 13:52:47 -04:00
LogoutPacket.cs	Finished refactoring Map Server. Clear of syntax errors.	2017-06-27 16:55:14 -04:00
PongPacket.cs	Finished refactoring Map Server. Clear of syntax errors.	2017-06-27 16:55:14 -04:00
QuitPacket.cs	Finished refactoring Map Server. Clear of syntax errors.	2017-06-27 16:55:14 -04:00
SendMessagePacket.cs	More subpacket cleanup.	2017-06-27 13:52:47 -04:00
SetDalamudPacket.cs	Implemented newly discovered packets (Dalamud, Countdown).	2017-10-01 12:31:45 -04:00
SetMapPacket.cs	Finished refactoring Map Server. Clear of syntax errors.	2017-06-27 16:55:14 -04:00
SetMusicPacket.cs	Started removing all target actor id references.	2017-06-27 13:23:05 -04:00
SetWeatherPacket.cs	Started removing all target actor id references.	2017-06-27 13:23:05 -04:00