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
|
54af893570
|
add some more locks, fixed typo in AddHP, add missing ability
|
2017-08-23 03:22:17 +01:00 |
|
Filip Maj
|
69f7fb5e47
|
Ported over all the opening directors and improved the director code a bit more. Also implemented content instances for Grid/Uld.
|
2017-07-09 18:38:01 -04:00 |
|
Filip Maj
|
8c9ecebae6
|
Added a "silent" option for LuaEngine calls. More content instance work. Full classpath now used for zones.
|
2017-04-29 20:30:54 -04:00 |
|
Filip Maj
|
2de4934c41
|
Fixed battle npcs appearing strangely (no nameplate, wrong colour, etc), and implemented content groups!
|
2017-04-15 16:33:56 -04:00 |
|