Tahir Akhlaq 6f5a480cbd Merge branch 'develop' of https://bitbucket.org/Ioncannon/ffxiv-classic-server into ai ... # Conflicts: # FFXIVClassic Map Server/Database.cs # FFXIVClassic Map Server/WorldManager.cs # FFXIVClassic Map Server/actors/area/Area.cs # FFXIVClassic Map Server/actors/chara/player/Player.cs		2017-08-26 20:17:16 +01:00
..
Area.cs	Merge branch 'develop' of https://bitbucket.org/Ioncannon/ffxiv-classic-server into ai	2017-08-26 20:17:16 +01:00
PrivateArea.cs	Add equip ability functions	2017-07-11 09:08:50 -05:00
PrivateAreaContent.cs	add some more locks, fixed typo in AddHP, add missing ability	2017-08-23 03:22:17 +01:00
SpawnLocation.cs	Child scripts now loaded by a uniqueId in the spawn table.	2016-06-09 22:58:03 -04:00
Zone.cs	add some more locks, fixed typo in AddHP, add missing ability	2017-08-23 03:22:17 +01:00