Filip Maj 74ce5a2fe1 Merge branch 'master' into develop ... # Conflicts: # FFXIVClassic Lobby Server/FFXIVClassic Lobby Server.csproj # FFXIVClassic Map Server/Database.cs # FFXIVClassic Map Server/FFXIVClassic Map Server.csproj # FFXIVClassic Map Server/PacketProcessor.cs # FFXIVClassic Map Server/WorldManager.cs # FFXIVClassic Map Server/actors/Actor.cs # FFXIVClassic Map Server/actors/area/Area.cs # FFXIVClassic Map Server/actors/chara/player/Player.cs # FFXIVClassic Map Server/lua/LuaPlayer.cs # data/scripts/base/chara/npc/populace/PopulaceChocoboLender.lua # data/scripts/commands/gm/speed.lua # data/scripts/commands/gm/warp.lua # data/scripts/global.lua # data/scripts/player.lua # data/scripts/unique/fst0Town01a/PopulaceStandard/khuma_moshroca.lua # data/scripts/unique/sea0Town01a/PopulaceStandard/ahldskyf.lua # data/scripts/unique/sea0Town01a/PopulaceStandard/angry_river.lua # data/scripts/unique/sea0Town01a/PopulaceStandard/ansgor.lua # data/scripts/unique/sea0Town01a/PopulaceStandard/arnegis.lua # data/scripts/unique/sea0Town01a/PopulaceStandard/arthurioux.lua # data/scripts/unique/sea0Town01a/PopulaceStandard/astrid.lua # data/scripts/unique/sea0Town01a/PopulaceStandard/audaine.lua # data/scripts/unique/sea0Town01a/PopulaceStandard/bango_zango.lua # data/scripts/unique/sea0Town01a/PopulaceStandard/bayard.lua # data/scripts/unique/sea0Town01a/PopulaceStandard/bloemerl.lua # data/scripts/unique/sea0Town01a/PopulaceStandard/bmallpa.lua # data/scripts/unique/sea0Town01a/PopulaceStandard/bnhapla.lua # data/scripts/unique/sea0Town01a/PopulaceStandard/chichiroon.lua # data/scripts/unique/sea0Town01a/PopulaceStandard/drowsy-eyed_adventurer.lua # data/scripts/unique/sea0Town01a/PopulaceStandard/eugennoix.lua # data/scripts/unique/sea0Town01a/PopulaceStandard/fickle_beggar.lua # data/scripts/unique/sea0Town01a/PopulaceStandard/hob.lua # data/scripts/unique/sea0Town01a/PopulaceStandard/ivan.lua # data/scripts/unique/sea0Town01a/PopulaceStandard/maetistym.lua # data/scripts/unique/sea0Town01a/PopulaceStandard/mharelak.lua # data/scripts/unique/sea0Town01a/PopulaceStandard/muscle-bound_deckhand.lua # data/scripts/unique/sea0Town01a/PopulaceStandard/pasty-faced_adventurer.lua # data/scripts/unique/sea0Town01a/PopulaceStandard/pearly-toothed_porter.lua # data/scripts/unique/sea0Town01a/PopulaceStandard/ptahjha.lua # data/scripts/unique/sea0Town01a/PopulaceStandard/suspicious-looking_traveler.lua # data/scripts/unique/sea0Town01a/PopulaceStandard/syhrdaeg.lua # data/scripts/unique/sea0Town01a/PopulaceStandard/syngsmyd.lua # data/scripts/unique/sea0Town01a/PopulaceStandard/tatasako.lua # data/scripts/unique/sea0Town01a/PopulaceStandard/tefh_moshroca.lua # data/scripts/unique/sea0Town01a/PopulaceStandard/thata_khamazom.lua # data/scripts/unique/sea0Town01a/PopulaceStandard/thosinbaen.lua # data/scripts/unique/sea0Town01a/PopulaceStandard/tittering_traveler.lua # data/scripts/unique/sea0Town01a/PopulaceStandard/totoruto.lua # data/scripts/unique/sea0Town01a/PopulaceStandard/triaine.lua # data/scripts/unique/sea0Town01a/PopulaceStandard/trinne.lua # data/scripts/unique/sea0Town01a/PopulaceStandard/unconscious_adventurer.lua # data/scripts/unique/sea0Town01a/PopulaceStandard/undsatz.lua # data/scripts/unique/sea0Town01a/PopulaceStandard/vhynho.lua # data/scripts/unique/sea0Town01a/PopulaceStandard/waekbyrt.lua # data/scripts/unique/sea0Town01a/PopulaceStandard/whahtoa.lua # data/scripts/unique/sea0Town01a/PopulaceStandard/wyra_khamazom.lua # data/scripts/unique/sea0Town01a/PopulaceStandard/wyrstmann.lua # data/scripts/unique/sea0Town01a/PopulaceStandard/xavalien.lua # data/scripts/unique/sea0Town01a/PopulaceStandard/zonggo.lua # data/scripts/unique/sea0Town01a/PopulaceStandard/zuzule.lua # sql/server_zones_spawnlocations.sql		2017-08-26 13:53:23 -04:00
..
gm	Merge branch 'master' into develop	2017-08-26 13:53:23 -04:00
ActivateCommand.lua	Fixed syntax error in tutorial script. Finished fleshing out the opening script and related scripts for Limsa.	2017-03-19 11:40:41 -04:00
AttackWeaponSkill.lua	Fixed issue where spawn packets were sent on zone out. Added all npcs to Camp Bearded Rock. Rewrote how mapobjs get loaded in, no more hardcodes. Added tons mapobjs to the DB. Added ferry npcs.	2017-06-14 22:24:09 -04:00
BonusPointCommand.lua	Cleaned up the new scripting code. Added a helper function to do the yielding automatically. Modified all the scripts to use the new system and added a few new ones.	2016-06-19 18:52:34 -04:00
CheckCommand.lua	Cleaned up the new scripting code. Added a helper function to do the yielding automatically. Modified all the scripts to use the new system and added a few new ones.	2016-06-19 18:52:34 -04:00
ChocoboRideCommand.lua	Fixed bug with Broadcast Packet. Was adding player to the instance list while it shouldn't have been, and designed BroadcastPacket assuming so. Cleaned it all up and fixed, so now emote work after warp. Fixed Chocobo packets so correct appearance will show when player is spawned while riding gobbue.	2017-07-06 21:59:12 -04:00
CmnAttackWeaponSkill.lua	Fixed issue where spawn packets were sent on zone out. Added all npcs to Camp Bearded Rock. Rewrote how mapobjs get loaded in, no more hardcodes. Added tons mapobjs to the DB. Added ferry npcs.	2017-06-14 22:24:09 -04:00
ConfirmGroupCommand.lua	Required scripts to make it work.	2017-01-02 14:38:56 -05:00
DiceCommand.lua	Cleaned up the new scripting code. Added a helper function to do the yielding automatically. Modified all the scripts to use the new system and added a few new ones.	2016-06-19 18:52:34 -04:00
DummyCommand.lua	Added scripts needed.	2017-01-09 00:17:46 -05:00
EmoteSitCommand.lua	Cleaned up the new scripting code. Added a helper function to do the yielding automatically. Modified all the scripts to use the new system and added a few new ones.	2016-06-19 18:52:34 -04:00
EmoteStandardCommand.lua	Firedance description was being referenced wrong.	2017-06-15 01:21:16 -04:00
EquipCommand.lua	Fixed up how "special" items work (ie: PUG and ARC weapons). No more glitches hopefully.	2017-07-09 11:39:17 -04:00
ItemWasteCommand.lua	Cleaned up the new scripting code. Added a helper function to do the yielding automatically. Modified all the scripts to use the new system and added a few new ones.	2016-06-19 18:52:34 -04:00
JournalCommand.lua	Forgot to add script for quest abandon.	2017-04-15 16:37:14 -04:00
LinkshellAppointCommand.lua	Added scripts needed.	2017-01-09 00:17:46 -05:00
LinkshellChangeCommand.lua	Setting the active linkshell now works.	2017-01-09 23:12:56 -05:00
LinkshellInviteCancelCommand.lua	Added scripts needed.	2017-01-09 00:17:46 -05:00
LinkshellInviteCommand.lua	Added scripts needed.	2017-01-09 00:17:46 -05:00
LinkshellKickCommand.lua	Overhaul of the director system and opening quests. Private Areas further implemented as well.	2017-03-07 00:09:37 -05:00
LinkshellResignCommand.lua	Added scripts needed.	2017-01-09 00:17:46 -05:00
LogoutCommand.lua	Cleaned up the new scripting code. Added a helper function to do the yielding automatically. Modified all the scripts to use the new system and added a few new ones.	2016-06-19 18:52:34 -04:00
NpcLinkshellChatCommand.lua	Forgot a nil in the "send game message" params, otherwise wrong overload is run.	2017-04-09 14:07:34 -04:00
PartyBreakupCommand.lua	Required scripts to make it work.	2017-01-02 14:38:56 -05:00
PartyDisbandCommand.lua	Scripts for party commands.	2016-12-21 21:50:45 -05:00
PartyInviteCommand.lua	Cleaned up the new scripting code. Added a helper function to do the yielding automatically. Modified all the scripts to use the new system and added a few new ones.	2016-06-19 18:52:34 -04:00
PartyKickCommand.lua	Scripts for party commands.	2016-12-21 21:50:45 -05:00
PartyLeaderCommand.lua	Scripts for party commands.	2016-12-21 21:50:45 -05:00
PartyResignCommand.lua	Required scripts to make it work.	2017-01-02 14:38:56 -05:00
PlaceDrivenCommand.lua	New scripts for the opening private areas, as well as db updates.	2017-03-07 08:32:57 -05:00
RequestInformationCommand.lua	callClientFunction now returns ALL results. Fixed some scripts, finished fixing up Gridania opening script.	2017-03-21 00:43:30 -04:00
RequestQuestJournalCommand.lua	Fixed the journal command. Wasn't sending correct phase.	2017-04-04 01:11:18 -04:00
TeleportCommand.lua	Added script for ItemStorage npc. Added scripts for both types of inn exit doors. Added BountyPresenter script (YoshiP).	2017-06-19 22:23:27 -04:00