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
Filip Maj
d918ad3776
New scripts for the opening private areas, as well as db updates.
2017-03-07 08:32:57 -05:00
Drajiel
09705bec4e
Updated Commands.
2016-08-11 20:02:01 -04:00
Tahir Akhlaq
1ad2b5d7d0
more work on commands
...
- moved script object to wrapper class to catch and log exceptions
- added loggers for basepacket/subpacket (todo: colour and use them in NLog.config)
- finished up most commands (todo: !property and !property2)
- todo: create and use mysql wrapper class to log exceptions
2016-06-18 05:42:14 +01:00
