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 |
|
Filip Maj
|
3066efeebb
|
Cleanup the messy imports.
|
2019-05-06 13:39:24 -04:00 |
|
Tahir Akhlaq
|
cd60c571ac
|
Merge branch 'ai-open' of https://bitbucket.org/skeletonhorn/ffxiv-classic-server-ai-fork into ai
# Conflicts:
# data/scripts/modifiers.lua
|
2017-12-10 15:07:28 +00:00 |
|
Filip Maj
|
40deaf3075
|
Fixed accidental hardcode.
|
2017-01-27 10:04:24 -05:00 |
|
Filip Maj
|
031dae2c84
|
Added inputs, launcher editor more or less works.
|
2017-01-26 19:41:10 -05:00 |
|
Filip Maj
|
ab3ca412b3
|
Finished writing most of this exe patcher.
|
2017-01-26 19:07:47 -05:00 |
|
Filip Maj
|
8499eeff39
|
Started work on the launcher/patcher editor.
|
2017-01-04 17:30:36 -05:00 |
|