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
..
base/chara/npc	Merge branch 'inventory_refactor' into develop	2019-05-06 15:59:09 -04:00
commands	Merge branch 'inventory_refactor' into develop	2019-05-06 15:59:09 -04:00
content	Combat changes and bug fixes	2018-02-15 13:20:46 -06:00
directors	Combat additions	2018-04-18 16:06:41 -05:00
effects	Fixed a typo in blind's effect script	2018-06-25 23:44:04 -05:00
quests	"Seeing the Seers" quest etc3g0 scripted, no reward handling currently. Requires actor "Nellaure" (http://ffxiv.gamerescape.com/w/index.php?title=Nellaure) to be added in. Hangs out in back-right corner of Carpenter's Guild.	2017-04-05 18:39:04 -04:00
unique	Merge branch 'ai-open' into develop	2019-05-04 20:13:29 -04:00
ability.lua	Combat additions	2018-04-18 16:06:41 -05:00
aetheryte.lua	Added things for testing mapobjs.	2017-05-05 02:37:01 -04:00
ally.lua	Combat changes and bug fixes	2018-02-15 13:20:46 -06:00
battlenpc.lua	Combat changes and bug fixes	2018-02-15 13:20:46 -06:00
battleutils.lua	Combat additions	2018-04-18 16:06:41 -05:00
gcseals.lua	Actor script fixes, documented populace classes and misc things	2017-12-13 15:09:10 -05:00
global.lua	Merge branch 'ai-open' into develop	2019-05-04 20:13:29 -04:00
guildleve.lua	Add equip ability functions	2017-07-11 09:08:50 -05:00
hiteffect.lua	Combat additions	2018-04-18 16:06:41 -05:00
magic.lua	Combat additions	2018-04-18 16:06:41 -05:00
modifiers.lua	AoE rewrite and bug fixes	2018-07-02 00:45:06 -05:00
player.lua	Small fixes	2018-06-25 18:20:20 -05:00
retainer.lua	Fixed retainer script.	2018-04-07 18:19:56 -04:00
shop.lua	Inventory.cs - GetItemQuantity() added	2017-10-09 23:40:38 -04:00
statuseffectids.lua	Combat changes and bug fixes	2018-02-15 13:20:46 -06:00
tutorial.lua	Changed "SendRequestedInfo" to "SendDataPacket" as that's the actual name of the packet. Copied all the progress with the Limsa Opening director to Gridania and Uldah.	2017-03-19 12:35:21 -04:00
utils.lua	AoE rewrite and bug fixes	2018-07-02 00:45:06 -05:00
weaponskill.lua	Combat additions	2018-04-18 16:06:41 -05:00