Filip Maj 3d5fa45730 Merge branch 'develop' ...

# Conflicts:
#	FFXIVClassic Map Server/FFXIVClassic Map Server.csproj
#	FFXIVClassic Map Server/Server.cs
#	data/scripts/player.lua
#	scripts/zones/193/npcs/pplStd_11@0C100.lua

2016-04-18 13:31:55 -04:00

..

QuestDirectorMan0g001.cs

Added more quest functions and completed the scripts for Gridania and most of Ul'dah. Up to the battle part that is.

2016-04-17 19:09:01 -04:00

QuestDirectorMan0l001.cs

Merge branch 'develop'

2016-04-18 13:31:55 -04:00

QuestDirectorMan0u001.cs

Added more quest functions and completed the scripts for Gridania and most of Ul'dah. Up to the battle part that is.

2016-04-17 19:09:01 -04:00