Filip Maj 1e4a1cf263 Merge branch 'ai-open' into develop ... # Conflicts: # FFXIVClassic Lobby Server/Database.cs # FFXIVClassic Map Server/Database.cs # FFXIVClassic Map Server/FFXIVClassic Map Server.csproj # FFXIVClassic Map Server/actors/chara/player/Inventory.cs # FFXIVClassic Map Server/actors/chara/player/Player.cs # FFXIVClassic Map Server/dataobjects/Session.cs # FFXIVClassic World Server/Server.cs		2019-05-04 20:13:29 -04:00
..
scripts	Merge branch 'ai-open' into develop	2019-05-04 20:13:29 -04:00
lobby_config.ini	added launch args for ip/port and default config loading	2016-12-05 14:26:20 +00:00
map_config.ini	Added all the shop keeper scripts in Ul'dah. Fixed some broken populace scripts. Changed .ini files, wrong default. Fixed a syntax error in CommandProcessor.cs.	2016-07-16 20:12:04 -04:00
world_config.ini	added launch args for ip/port and default config loading	2016-12-05 14:26:20 +00:00