Tahir Akhlaq 5fc0e0eeca Merge branch 'master' of https://bitbucket.org/Ioncannon/ffxiv-classic-server into lua_commands ...

# Conflicts:
#	FFXIVClassic Map Server/dataobjects/ConnectedPlayer.cs
#	FFXIVClassic Map Server/lua/LuaEngine.cs
#	data/scripts/global.lua

2016-06-24 22:13:17 +01:00

..

Area.cs

Merge branch 'master' of https://bitbucket.org/Ioncannon/ffxiv-classic-server into lua_commands

2016-06-24 22:13:17 +01:00

PrivateArea.cs

Merge branch 'master' of https://bitbucket.org/Ioncannon/ffxiv-classic-server into method_casing

2016-06-14 22:54:02 +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

Merge branch 'master' of https://bitbucket.org/Ioncannon/ffxiv-classic-server into method_casing

2016-06-14 22:54:02 +01:00