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
..
npc	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
player	Merge branch 'develop'	2016-04-18 13:31:55 -04:00
AetheryteWork.cs	NPCs now spawn and load template from the db.	2016-01-20 23:18:10 -05:00
BattleSave.cs	NPCs now spawn and load template from the db.	2016-01-20 23:18:10 -05:00
BattleTemp.cs	NPCs now spawn and load template from the db.	2016-01-20 23:18:10 -05:00
Character.cs	-Fixed up the quest flag functions.	2016-04-07 22:34:10 -04:00
CharaWork.cs	NPCs now spawn and load template from the db.	2016-01-20 23:18:10 -05:00
EventSave.cs	NPCs now spawn and load template from the db.	2016-01-20 23:18:10 -05:00
EventTemp.cs	NPCs now spawn and load template from the db.	2016-01-20 23:18:10 -05:00
ParameterSave.cs	Levels are now loaded in from the database, and "mainSkillLevel" properties are also correctly set.	2016-03-19 19:21:16 -04:00
ParameterTemp.cs	NPCs now spawn and load template from the db.	2016-01-20 23:18:10 -05:00
Work.cs	NPCs now spawn and load template from the db.	2016-01-20 23:18:10 -05:00