CuriousJorge fac8f269e7 Merge remote-tracking branch 'origin/ioncannon/quest_system' into Jorge/quest_system ... # Conflicts: # Data/scripts/player.lua - Resolved. Using theirs.		2022-02-20 22:57:01 -05:00
..
dft	Commiting more work before merging in another branch.	2022-02-20 22:54:31 -05:00
etc	Commit work on DftFst before merging in some fixes unrelated issues.	2022-02-20 21:32:43 -05:00
man	Fixed bugs and edited scripts causing the limsa intro to fail.	2022-02-20 22:40:35 -05:00
trl1	Commiting more work before merging in another branch.	2022-02-20 22:54:31 -05:00
quest_template.lua	Started mass overhaul of quests and related components like small talk. Fixed some scripts. More fixes required.	2022-01-24 23:49:10 -05:00