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
..
actors	Merge branch 'master' into develop	2017-08-26 13:53:23 -04:00
dataobjects	Fixed up how "special" items work (ie: PUG and ARC weapons). No more glitches hopefully.	2017-07-09 11:39:17 -04:00
lua	Some fixes and missing scripts.	2017-08-26 10:23:13 -04:00
packets	Merge branch 'master' into develop	2017-08-26 13:53:23 -04:00
Properties	Merge branch 'master' of https://bitbucket.org/Ioncannon/ffxiv-classic-server into method_casing	2016-06-14 22:54:02 +01:00
utils	More subpacket cleanup.	2017-06-27 13:52:47 -04:00
App.config	cleaned up previous commit	2016-06-21 21:47:07 +01:00
CommandProcessor.cs	Finished refactoring Map Server. Clear of syntax errors.	2017-06-27 16:55:14 -04:00
ConfigConstants.cs	added db launch args and improved import time on gamedata_actor_class.sql	2017-03-25 04:36:19 +00:00
Database.cs	Merge branch 'master' into develop	2017-08-26 13:53:23 -04:00
FFXIVClassic Map Server.csproj	Merge branch 'master' into develop	2017-08-26 13:53:23 -04:00
inventorys_packets.txt	New debug packets.	2015-10-04 22:42:20 -04:00
NLog.config	Fixed NLog config for map server. Added some debug printouts while testing.	2016-08-29 09:03:48 -04:00
NLog.xsd	accidentally mass replaced "target", fixed now	2016-06-15 04:27:25 +01:00
packages.config	Added MS Compilers package to let solution compile in VS2013. Added new sql files with Gridania NPCs. Added the new seamless boundry table.	2016-08-14 09:45:06 -04:00
PacketProcessor.cs	Merge branch 'master' into develop	2017-08-26 13:53:23 -04:00
Program.cs	Renamed Item dataobject to ItemData. Added guildleve data.	2017-06-24 14:12:52 -04:00
Server.cs	Renamed Item dataobject to ItemData. Added guildleve data.	2017-06-24 14:12:52 -04:00
WorldManager.cs	Merge branch 'master' into develop	2017-08-26 13:53:23 -04:00